优化统计

sp-core/sp-api/src/main/java/com/pj/api/dto/PeopleDto.java

@@ -101,58 +101,6 @@ public class PeopleDto {
         this.idCardImg = idCardImg;
     }
 
-
-    public PeopleDto(Long id, Long tradeAreaId, String tradeAreaName, String name, String code, Integer sex, Integer age, String idCard, String idCardImg, String phone, String bankNo, String bankCode, String bankName, Long groupId, String groupName, Integer status, Integer role, Double lng, Double lat, String lastLocation, String address, String addressIds, String detailAddress, Integer isLock, Double leftPrice, Integer judgeStatus, String judgeContent, Date registerTime, Date judgeTime, String personId, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, String platSeqNo, Date startDate, Date endDate, String idcdGcertPgoffNm, String birplAddr, String customsCode, Date expiry, String putrecNo, String localGovernmentNo, String filingStatus, String fieldCode) {
-        this.id = id;
-        this.tradeAreaId = tradeAreaId;
-        this.tradeAreaName = tradeAreaName;
-        this.name = name;
-        this.code = code;
-        this.sex = sex;
-        this.age = age;
-        this.idCard = idCard;
-        this.idCardImg = idCardImg;
-        this.phone = phone;
-        this.bankNo = bankNo;
-        this.bankCode = bankCode;
-        this.bankName = bankName;
-        this.groupId = groupId;
-        this.groupName = groupName;
-        this.status = status;
-        this.role = role;
-        this.lng = lng;
-        this.lat = lat;
-        this.lastLocation = lastLocation;
-        this.address = address;
-        this.addressIds = addressIds;
-        this.detailAddress = detailAddress;
-        this.isLock = isLock;
-        this.leftPrice = leftPrice;
-        this.judgeStatus = judgeStatus;
-        this.judgeContent = judgeContent;
-        this.registerTime = registerTime;
-        this.judgeTime = judgeTime;
-        this.personId = personId;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.createName = createName;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.updateName = updateName;
-        this.deleteStatus = deleteStatus;
-        this.platSeqNo = platSeqNo;
-        this.startDate = startDate;
-        this.endDate = endDate;
-        this.idcdGcertPgoffNm = idcdGcertPgoffNm;
-        this.birplAddr = birplAddr;
-        this.customsCode = customsCode;
-        this.expiry = expiry;
-        this.putrecNo = putrecNo;
-        this.localGovernmentNo = localGovernmentNo;
-        this.filingStatus = filingStatus;
-        this.fieldCode = fieldCode;
-    }
-
     public String getBankNo() {
         return bankNo;
     }
@@ -722,6 +670,22 @@ public class PeopleDto {
     //国籍
     private String nationality;
 
+    private String leaderName;
+    private String leaderPhone;
+
+    public String getLeaderName() {
+        return leaderName;
+    }
 
+    public void setLeaderName(String leaderName) {
+        this.leaderName = leaderName;
+    }
 
+    public String getLeaderPhone() {
+        return leaderPhone;
+    }
+
+    public void setLeaderPhone(String leaderPhone) {
+        this.leaderPhone = leaderPhone;
+    }
 }

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementApi.java

@@ -2,6 +2,7 @@ package com.pj.ht_trade_settlement;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.pj.api.dto.TradeSettlementDto;
+import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.project4sp.SP;
 import com.pj.utils.sg.AjaxJson;
@@ -45,14 +46,17 @@ public class HtTradeSettlementApi {
      */
     @RequestMapping("getList")
     public AjaxJson getList() {
+        if (!StpAPPUserUtil.isLogin()) {
+            return AjaxJson.getError("未登录");
+        }
         SoMap so = SoMap.getRequestSoMap();
-        so.put("enterpriseId", StpAPPUserUtil.getAPPLoginInfo().getFk());
         List<HtTradeSettlement> list = htTradeSettlementService.getList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);
     }
 
     /**
      * 获取整车在售列表
+     *
      * @return
      */
     @RequestMapping("getOnSaleList")
@@ -66,5 +70,4 @@ public class HtTradeSettlementApi {
     }
 
 
-
 }

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementMapper.xml

@@ -46,7 +46,7 @@
 			<if test=' this.has("trafMode") '> and traf_mode = #{trafMode} </if>
 			<if test=' this.has("currCode") '> and curr_code = #{currCode} </if>
 			<if test=' this.has("packNo") '> and pack_no = #{packNo} </if>
-			<if test=' this.has("declTime") '> and decl_time = #{declTime} </if>
+			<if test=' this.has("declTime") '> and date_format(decl_time,'%Y-%m-%d') = #{declTime} </if>
 			<if test=' this.has("billNo") '> and bill_no = #{billNo} </if>
 			<if test=' this.has("voyageNo") '> and voyage_no = #{voyageNo} </if>
 			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementService.java

@@ -122,7 +122,7 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
 
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(tradeSettlementDto.getFieldCode(), tradeSettlementDto.getFieldName(), "");
         Date applyTime = new Date(Long.parseLong(tradeSettlementDto.getDeclTime()));
-        htTradeSettlement.setDeclTime(DateUtil.format(applyTime, "yyyy-MM-dd HH:mm:ss"));
+        htTradeSettlement.setDeclTime(DateUtil.format(applyTime, "yyyy-MM-dd HH:mm:ss")).setFinishStatus(0);
         BigDecimal totalPrice = BigDecimal.ZERO;
         for (BordersListDto item : bordersListDtoList) {//开始创建边民订单
             totalPrice = totalPrice.add(BigDecimal.valueOf(item.getBuyAmount()));

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupAPPController.java

@@ -44,4 +44,5 @@ public class TbGroupAPPController {
     }
 
 
+
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -559,4 +559,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 */
 	private Date chargebacksTime;
 
+	@TableField(exist = false)
+	private String phone;
+
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderAppController.java

@@ -48,6 +48,18 @@ public class TbOrderAppController {
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @return
+	 */
+	@RequestMapping("getListBySaleMainId")
+	public AjaxJson getListBySaleMainId() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbOrder> list = tbOrderService.getList(so.startPage());
+		if(list.size() == 0)return AjaxJson.getSuccess("暂无更多的订单消息!");
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
 	/** 查 转售列表：边民查看已完结订单，包括已转售/未转售 */
 	@RequestMapping("getResaleOrders")
 	public AjaxJson getResaleOrders() {

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderController.java

@@ -3,6 +3,7 @@ package com.pj.tb_order;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import cn.hutool.core.convert.Convert;
 import com.pj.api.dto.HtDeclareChargebackDto;
@@ -20,131 +21,168 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 
 /**
  * Controller: tb_order -- 订单表
+ *
  * @author loovi
  */
 @RestController
 @RequestMapping("/TbOrder/")
 public class TbOrderController {
 
-	/** 底层 Service 对象 */
-	@Autowired
-	TbOrderService tbOrderService;
-
-
-	/** 删 */
-	@RequestMapping("delete")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_DEL)
-	public AjaxJson delete(Long id){
-		 tbOrderService.delete(id);
-		return AjaxJson.getSuccess();
-	}
-
-	/** 删 - 根据id列表 */
-	@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_DEL)
-	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
-		int line = SP.publicMapper.deleteByIds(TbOrder.TABLE_NAME, ids);
-		return AjaxJson.getByLine(line);
-	}
-
-	/** 改 */
-	@RequestMapping("update")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT)
-	public AjaxJson update(TbOrder t){
-		tbOrderService.update(t);
-		return AjaxJson.getSuccess();
-	}
-
-	/** 查 - 根据id */
-	@RequestMapping("getById")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE)
-	public AjaxJson getById(Long id){
-		TbOrder t = tbOrderService.getById(id);
-		return AjaxJson.getSuccessData(t);
-	}
-
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
-	@RequestMapping("getList")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE)
-	public AjaxJson getList() {
-		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrder> list = tbOrderService.getList(so.startPage());
-		return AjaxJson.getPageData(so.getDataCount(), list);
-	}
-
-
-	/** 改 - 删除状态(0=禁用,1=启用) */
-	@RequestMapping("updateDeleteStatus")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT)
-	public AjaxJson updateDeleteStatus(Long id, Integer value){
-		int line = SP.publicMapper.updateColumnById(TbOrder.TABLE_NAME, "delete_status", value, id);
-		return AjaxJson.getByLine(line);
-	}
-
-
-	/** 改 - 删除状态(0=禁用,1=启用) */
-	@RequestMapping("editUpPrice")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT_PRICE)
-	public AjaxJson editUpPrice(Long id, double price){
-		int line = SP.publicMapper.updateColumnById(TbOrder.TABLE_NAME, "up_price", price, id);
-		return AjaxJson.getByLine(line);
-	}
-
-	/** 批量修改总价 */
-	@RequestMapping("editUpPriceByIds")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT_PRICE)
-	public AjaxJson editUpPriceByIds(String ids, double price){
-		Long[] idArr = Convert.toLongArray(ids);
-
-		List<TbOrder> tbOrders = new ArrayList<>();
-		for (Long id: idArr) {
-			TbOrder order = new TbOrder();
-			order.setUpPrice(BigDecimal.valueOf(price));
-			order.setId(id);
-			tbOrders.add(order);
-		}
-		boolean batch = tbOrderService.updateBatchById(tbOrders);
-		return AjaxJson.toAjax(batch);
-	}
-
-	/** 订单补扣款 */
-	@RequestMapping("deduction")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_DEDUCTION)
-	public AjaxJson deduction(Long id){
-		tbOrderService.deduction(id);
-		return AjaxJson.getSuccess();
-	}
-
-	/** 订单补发送009信息到航通 */
-	@RequestMapping("send009ToHt")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_SEND009)
-	public AjaxJson send009ToHt(Long id){
-		TbOrder order = tbOrderService.getById(id);
-		if (order == null) {
-			throw new AjaxError("订单不存在");
-		}
-		tbOrderService.sendConfirmMsgToHt(order);
-		return AjaxJson.getSuccess();
-	}
-
-	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
-
-
-	/** 系统接收到航通接口信息：进出口申报单退单 **/
-	@RequestMapping("rpc/chargeback")
-	public boolean chargeback(@RequestBody HtDeclareChargebackDto htDeclareChargebackDto) {
-		return tbOrderService.chargeback(htDeclareChargebackDto);
-	}
-	@RequestMapping("rpc/getOrderListByMainIds")
-	public List<OrderDto> getOrderListByMainIds(String mainIds) {
-		return tbOrderService.getOrderListByMainIds(mainIds);
-	}
-
-	/** 系统接收到航通接口信息：车辆已出一级市场 ,相对应的一级市场订单状态修改 **/
-	@RequestMapping("rpc/orderFinish")
-	public boolean orderFinish(@RequestBody HtPassCardDTO htPassCardDTO) {
-		return tbOrderService.orderFinish(htPassCardDTO);
-	}
+    /**
+     * 底层 Service 对象
+     */
+    @Autowired
+    TbOrderService tbOrderService;
+
+
+    /**
+     * 删
+     */
+    @RequestMapping("delete")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_DEL)
+    public AjaxJson delete(Long id) {
+        tbOrderService.delete(id);
+        return AjaxJson.getSuccess();
+    }
+
+    /**
+     * 删 - 根据id列表
+     */
+    @RequestMapping("deleteByIds")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_DEL)
+    public AjaxJson deleteByIds() {
+        List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+        int line = SP.publicMapper.deleteByIds(TbOrder.TABLE_NAME, ids);
+        return AjaxJson.getByLine(line);
+    }
+
+    /**
+     * 改
+     */
+    @RequestMapping("update")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT)
+    public AjaxJson update(TbOrder t) {
+        tbOrderService.update(t);
+        return AjaxJson.getSuccess();
+    }
+
+    /**
+     * 查 - 根据id
+     */
+    @RequestMapping("getById")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE)
+    public AjaxJson getById(Long id) {
+        TbOrder t = tbOrderService.getById(id);
+        return AjaxJson.getSuccessData(t);
+    }
+
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    @RequestMapping("getList")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE)
+    public AjaxJson getList() {
+        SoMap so = SoMap.getRequestSoMap();
+        List<TbOrder> list = tbOrderService.getList(so.startPage());
+        return AjaxJson.getPageData(so.getDataCount(), list);
+    }
+
+
+    /**
+     * 改 - 删除状态(0=禁用,1=启用)
+     */
+    @RequestMapping("updateDeleteStatus")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT)
+    public AjaxJson updateDeleteStatus(Long id, Integer value) {
+        int line = SP.publicMapper.updateColumnById(TbOrder.TABLE_NAME, "delete_status", value, id);
+        return AjaxJson.getByLine(line);
+    }
+
+
+    /**
+     * 改 - 删除状态(0=禁用,1=启用)
+     */
+    @RequestMapping("editUpPrice")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT_PRICE)
+    public AjaxJson editUpPrice(Long id, double price) {
+        int line = SP.publicMapper.updateColumnById(TbOrder.TABLE_NAME, "up_price", price, id);
+        return AjaxJson.getByLine(line);
+    }
+
+    /**
+     * 批量修改总价
+     */
+    @RequestMapping("editUpPriceByIds")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT_PRICE)
+    public AjaxJson editUpPriceByIds(String ids, double price) {
+        Long[] idArr = Convert.toLongArray(ids);
+
+        List<TbOrder> tbOrders = new ArrayList<>();
+        for (Long id : idArr) {
+            TbOrder order = new TbOrder();
+            order.setUpPrice(BigDecimal.valueOf(price));
+            order.setId(id);
+            tbOrders.add(order);
+        }
+        boolean batch = tbOrderService.updateBatchById(tbOrders);
+        return AjaxJson.toAjax(batch);
+    }
+
+    /**
+     * 订单补扣款
+     */
+    @RequestMapping("deduction")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_DEDUCTION)
+    public AjaxJson deduction(Long id) {
+        tbOrderService.deduction(id);
+        return AjaxJson.getSuccess();
+    }
+
+    /**
+     * 订单补扣款
+     */
+    @RequestMapping("staticsStatus")
+    public AjaxJson staticsStatus(Long saleMainId) {
+        Map<String, Object> result = tbOrderService.staticsStatus(saleMainId);
+        return AjaxJson.getSuccessData(result);
+    }
+
+    /**
+     * 订单补发送009信息到航通
+     */
+    @RequestMapping("send009ToHt")
+    @SaCheckPermission(TbOrder.PERMISSION_CODE_SEND009)
+    public AjaxJson send009ToHt(Long id) {
+        TbOrder order = tbOrderService.getById(id);
+        if (order == null) {
+            throw new AjaxError("订单不存在");
+        }
+        tbOrderService.sendConfirmMsgToHt(order);
+        return AjaxJson.getSuccess();
+    }
+
+    /*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
+
+
+    /**
+     * 系统接收到航通接口信息：进出口申报单退单
+     **/
+    @RequestMapping("rpc/chargeback")
+    public boolean chargeback(@RequestBody HtDeclareChargebackDto htDeclareChargebackDto) {
+        return tbOrderService.chargeback(htDeclareChargebackDto);
+    }
+
+    @RequestMapping("rpc/getOrderListByMainIds")
+    public List<OrderDto> getOrderListByMainIds(String mainIds) {
+        return tbOrderService.getOrderListByMainIds(mainIds);
+    }
+
+    /**
+     * 系统接收到航通接口信息：车辆已出一级市场 ,相对应的一级市场订单状态修改
+     **/
+    @RequestMapping("rpc/orderFinish")
+    public boolean orderFinish(@RequestBody HtPassCardDTO htPassCardDTO) {
+        return tbOrderService.orderFinish(htPassCardDTO);
+    }
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.xml

@@ -18,7 +18,7 @@
 
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select *
+		select *,(select phone from tb_people where id=tb_order.buy_user_id) as phone
 		from tb_order
 	</sql>
 

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -810,14 +810,13 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         List<TbOrder> tbOrders = tbOrderMapper.selectList(wrapper);
         if (!tbOrders.isEmpty()) {
             TbTradeArea area = tbTradeAreaService.getById(tbOrders.get(0).getTradeAreaId());
-            String tradeNos = "";
+            StringBuilder tradeNos = new StringBuilder();
             PaymentDto paymentDto = new PaymentDto();
             for (TbOrder tbOrder : tbOrders) {
-                tradeNos += tbOrder.getTradeNo() + ",";
+                tradeNos.append(tbOrder.getTradeNo()).append(",");
                 //收到007结关信息后边民即可上架订单，不需等收到打款给外籍商户的成功回执SXB017才能完成订单
                 tbOrder.setFinishTime(new Date());
                 tbOrder.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode());
-
                 //todo: 收到航通007报文即收到海关结关信息，转发结关信息给到银行
                 paymentDto.setTradeNo(tbOrder.getTradeNo());
                 paymentDto.setDeclTime(htPassCardDTO.getCheckTime());
@@ -827,10 +826,10 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
             }
             this.updateBatchById(tbOrders);
 
-            tradeNos = StringUtils.removeEnd(tradeNos, ",");
+            tradeNos = new StringBuilder(StringUtils.removeEnd(tradeNos.toString(), ","));
             //todo: 调用银行接口发起划扣：将边民划扣至银行第三方账户的货款，支付至外籍商户的账户
             PaymentDto paymentDto2 = new PaymentDto();
-            paymentDto2.setTradeNos(tradeNos);
+            paymentDto2.setTradeNos(tradeNos.toString());
             paymentDto2.setVoyageNo(htPassCardDTO.getManifestId());
             paymentDto2.setVeNo(tbOrders.get(0).getVeNo());
             paymentDto2.setFieldCode(area.getCode());
@@ -1011,4 +1010,24 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
     public List<TbOrder> getOnSaleList(SoMap so) {
         return tbOrderMapper.getOnSaleList(so);
     }
+
+
+    public Map<String, Object> staticsStatus(Long saleMainId) {
+        SoMap soMap = new SoMap();
+        soMap.put("saleMainId", saleMainId);
+        List<TbOrder> list = tbOrderMapper.getList(soMap);
+        int total=list.size();
+        List<TbOrder>upList=list.stream().filter(tbOrder -> !Objects.isNull(tbOrder.getUpPrice())).collect(Collectors.toList());
+        int upSize=upList.size();
+        double upTotalPrice = upList.stream().collect(Collectors.summarizingDouble(order -> order.getUpPrice().doubleValue())).getSum();
+        List<TbOrder>saleList=list.stream().filter(tbOrder -> tbOrder.getResaleStatus()==1).collect(Collectors.toList());
+        int saleSize=saleList.size();
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("upTotalPrice", upTotalPrice);
+        resultMap.put("upSize", upSize);
+        resultMap.put("notUpSize", total-upSize);
+        resultMap.put("saleSize", saleSize);
+        resultMap.put("notSaleSize", total-saleSize);
+        return resultMap;
+    }
 }

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleAppController.java

@@ -2,15 +2,21 @@ package com.pj.tb_people;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.pj.api.dto.BankInfoDto;
+import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.tb_group.TbGroup;
+import com.pj.tb_group.TbGroupService;
 import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * Controller: tb_people -- 边民(app接口)
+ *
  * @Author Mechrevo
  * @Date 2023 07 24 14 56
  **/
@@ -20,23 +26,49 @@ public class TbPeopleAppController {
 
     @Autowired
     private TbPeopleService tbPeopleService;
+    @Resource
+    private TbGroupService tbGroupService;
 
-    /** 查个人信息 - 根据id */
+    /**
+     * 查个人信息 - 根据id
+     */
     @RequestMapping("getById")
-    public AjaxJson getById(String id){
+    public AjaxJson getById(String id) {
         TbPeople t = tbPeopleService.getById(id);
         return AjaxJson.getSuccessData(t);
     }
 
-    /** 改个人信息 */
+    /**
+     * 改个人信息
+     */
     @RequestMapping("update")
-    public AjaxJson update(TbPeople t){
+    public AjaxJson update(TbPeople t) {
+        if (!StpAPPUserUtil.isLogin()) {
+            return AjaxJson.getError("未登录");
+        }
         tbPeopleService.update(t);
         return AjaxJson.getSuccess();
     }
-        /** 加入互助组 */
+
+    @RequestMapping("getGroupPeople")
+    public AjaxJson getGroupPeople() {
+        APPLoginUserInfo loginUserInfo = StpAPPUserUtil.getAPPLoginInfo();
+        Long fkId = loginUserInfo.getFk();
+        if (loginUserInfo.getUserType() != 2) {
+            return AjaxJson.getSuccess();
+        }
+        TbPeople t = tbPeopleService.getById(fkId);
+        SoMap soMap = SoMap.getRequestSoMap();
+        soMap.put("groupId", t.getGroupId());
+        List<TbPeople> list = tbPeopleService.getList(soMap.startPage());
+        return AjaxJson.getPageData(soMap.getDataCount(), list);
+    }
+
+    /**
+     * 加入互助组
+     */
     @RequestMapping("joinGroup")
-    public AjaxJson joinGroup(@RequestParam Long groupId,@RequestParam String groupName){
+    public AjaxJson joinGroup(@RequestParam Long groupId, @RequestParam String groupName) {
         if (!StpAPPUserUtil.isLogin()) {
             return AjaxJson.getError("未登录");
         }
@@ -47,21 +79,48 @@ public class TbPeopleAppController {
     }
 
 
+    /**
+     * 互助组信息查询
+     */
+    @RequestMapping("getGroupInfo")
+    public AjaxJson getGroupInfo() {
+        if (!StpAPPUserUtil.isLogin()) {
+            return AjaxJson.getError("未登录");
+        }
+        APPLoginUserInfo loginUserInfo = StpAPPUserUtil.getAPPLoginInfo();
+        Long fkId = loginUserInfo.getFk();
+        if (loginUserInfo.getUserType() != 1) {
+            return AjaxJson.getSuccess();
+        }
+        TbPeople t = tbPeopleService.getById(fkId);
+        Long groupId = t.getGroupId();
+        TbGroup tbGroup = tbGroupService.getById(groupId);
+        if (tbGroup != null) {
+            return AjaxJson.getSuccessData(tbGroup);
+        }
+        return AjaxJson.getSuccess();
+    }
 
 
-    /** 边民保存银行卡信息 */
+    /**
+     * 边民保存银行卡信息
+     */
     @RequestMapping("rpc/saveBankInfo")
-    public boolean saveBankByPeople(@RequestParam("id")Long id, @RequestParam("bankName")String bankName, @RequestParam("bankAccount")String bankAccount) {
+    public boolean saveBankByPeople(@RequestParam("id") Long id, @RequestParam("bankName") String bankName, @RequestParam("bankAccount") String bankAccount) {
         return tbPeopleService.saveBankByPeople(id, bankName, bankAccount);
     }
 
-    /** 根据边民姓名与身份证号查询边民是否存在 */
+    /**
+     * 根据边民姓名与身份证号查询边民是否存在
+     */
     @PostMapping("rpc/getByidCard")
-    public boolean getByidCard(@RequestParam("name")String name, @RequestParam("idCard")String idCard) {
+    public boolean getByidCard(@RequestParam("name") String name, @RequestParam("idCard") String idCard) {
         return tbPeopleService.getByidCard(name, idCard);
     }
 
-    /** 边民备案验证查询-银行回复新开户或变更数据 */
+    /**
+     * 边民备案验证查询-银行回复新开户或变更数据
+     */
     @PostMapping("rpc/updateBySXB005")
     public boolean updateBySXB005(@RequestBody BankInfoDto bankInfoDto) {
         return tbPeopleService.updateBySXB005(bankInfoDto);

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -627,6 +627,11 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
     PeopleDto getRpcById(Long id) {
         TbPeople byId = super.getById(id);
         PeopleDto peopleDto = new PeopleDto();
+        TbGroup tbGroup = tbGroupMapper.selectById(byId.getGroupId());
+        if (tbGroup!=null) {
+            peopleDto.setLeaderName(tbGroup.getLeaderName());
+            peopleDto.setLeaderPhone(tbGroup.getLeaderPhone());
+        }
         BeanUtils.copyProperties(byId, peopleDto);
         return peopleDto;
     }
@@ -770,14 +775,14 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
     }
 
     public void editPhone(EditPhoneVO editPhoneVO) {
-        String phone=editPhoneVO.getPhone();
+        String phone = editPhoneVO.getPhone();
         TbPeople tbPeople = getById(editPhoneVO.getId());
         if (tbPeople == null) {
             throw new ServiceException("该边民不存在");
         }
-        AppUserDto oldUser  = FeignFactory.adminInterface.findUserByPhone(tbPeople.getPhone());
+        AppUserDto oldUser = FeignFactory.adminInterface.findUserByPhone(tbPeople.getPhone());
         //账号不存在或者存在但不是自己的，则新增
-        if (oldUser == null||!StrUtil.equals(oldUser.getName(),tbPeople.getName())) {
+        if (oldUser == null || !StrUtil.equals(oldUser.getName(), tbPeople.getName())) {
             AppUserCreateDTO appUserCreateDTO = new AppUserCreateDTO();
             appUserCreateDTO.setAuth("1");
             appUserCreateDTO.setPhone(phone);
@@ -786,11 +791,11 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
             appUserCreateDTO.setUserType(UserType.USER_TYPE_PEOPLE.getCode() + "");
             log.info("create user :{}", JSONUtil.toJsonStr(appUserCreateDTO));
             FeignFactory.adminInterface.createAccount(appUserCreateDTO);
-        }else{
+        } else {
             //存在，检查下是否冲突
-            AppUserDto checkUser  = FeignFactory.adminInterface.findUserByPhone(editPhoneVO.getPhone());
-            if (checkUser!= null&&!Objects.equals(checkUser.getFkId(),tbPeople.getId()) ){
-                throw new AjaxError("手机已被【"+checkUser.getName()+"】占用");
+            AppUserDto checkUser = FeignFactory.adminInterface.findUserByPhone(editPhoneVO.getPhone());
+            if (checkUser != null && !Objects.equals(checkUser.getFkId(), tbPeople.getId())) {
+                throw new AjaxError("手机已被【" + checkUser.getName() + "】占用");
             }
             UpdateAccountDTO updateAccountDTO = new UpdateAccountDTO();
             updateAccountDTO.setPhone(phone);
@@ -801,7 +806,5 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
         this.updateById(tbPeople);
 
 
-
-
     }
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -88,9 +88,14 @@ public class AppUserApiController {
             PeopleDto peopleDto = FeignFactory.levelOneServerInterface.getRpcById(user.getFkId());
             so.put("groupId", peopleDto.getGroupId());
             so.put("groupName", peopleDto.getGroupName());
+            so.put("leaderName", peopleDto.getLeaderName());
+            so.put("leaderPhone",peopleDto.getLeaderPhone());
         }
         so.put("auth", user.getAuth());
         so.put("face", user.getFace());
+        so.put("name", user.getName());
+        so.put("phone", user.getPhone());
+
         return AjaxJson.getSuccessData(so);
     }