Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-server into feature/asyncOrder

sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterface.java

@@ -29,7 +29,7 @@ public interface LevelOneServerInterface {
 
     /** 远程调用: 对合作社信息进行事务处理 */
     @RequestMapping("/TbCooperative/rpc/cooperativeDto")
-    public boolean cooperativeDto(@RequestBody CooperativeDto cooperativeDto);
+    public boolean cooperativeDto(@RequestBody HtCooperativeDto cooperativeDto);
 
     /** 商铺信息处理 */
     @RequestMapping("/TbShop/rpc/shopDto")
@@ -76,7 +76,7 @@ public interface LevelOneServerInterface {
 
     /** 添加组长信息 */
     @RequestMapping("/TbGroup/rpc/groupDto")
-    public boolean groupDto(@RequestBody GroupDto groupDto);
+    public boolean groupDto(@RequestBody HtGroupDto groupDto);
 
     /** 添加普通边民信息 */
     @RequestMapping("/TbPeople/rpc/peopleDto")

sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterfaceFallback.java

@@ -30,7 +30,7 @@ public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOne
             }
 
             @Override
-            public boolean cooperativeDto(CooperativeDto cooperativeDto) {
+            public boolean cooperativeDto(HtCooperativeDto cooperativeDto) {
                 log.error("查询一级市场商户错误,当前对象:{},错误信息是:{}",cooperativeDto.toString(),throwable.getMessage());
                 return false;
             }
@@ -112,7 +112,7 @@ public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOne
             }
 
             @Override
-            public boolean groupDto(GroupDto groupDto) {
+            public boolean groupDto(HtGroupDto groupDto) {
                 System.out.println(throwable.getMessage());
                 log.error("互市区组长信息添加错误:{},错误信息是:{}",groupDto,throwable.getMessage());
                 return false;

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

@@ -1,12 +1,11 @@
 package com.pj.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  { "borderNo":"序号",
  "borderPutrecNo":"边民备案编号",
  "borderName":"边民姓名",
- "ciphertextIdno":"边民身份证号",
+ "idCardNo":"边民身份证号",
  "borderAddr":"户籍地址",
  "borderTel":"手机号码",
  "groupId":"本系统中互助组 id"
@@ -18,7 +17,7 @@ public class BorderDTO {
     private String borderNo;
     private String borderPutrecNo;
     private String borderName;
-    private String ciphertextIdno;
+    private String idCardNo;
     private String borderAddr;
     private String borderTel;
     private String groupId;
@@ -47,12 +46,12 @@ public class BorderDTO {
         this.borderName = borderName;
     }
 
-    public String getCiphertextIdno() {
-        return ciphertextIdno;
+    public String getIdCardNo() {
+        return idCardNo;
     }
 
-    public void setCiphertextIdno(String ciphertextIdno) {
-        this.ciphertextIdno = ciphertextIdno;
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
     }
 
     public String getBorderAddr() {

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

@@ -0,0 +1,60 @@
+package com.pj.api.dto;
+
+
+public class CooperativeBordersDto {
+
+    private String borderNo;
+    private String borderPutrecNo;
+    private String borderName;
+    private String ciphertextIdno;
+    private String borderAddr;
+    private String borderTel;
+
+    public String getBorderNo() {
+        return borderNo;
+    }
+
+    public void setBorderNo(String borderNo) {
+        this.borderNo = borderNo;
+    }
+
+    public String getBorderPutrecNo() {
+        return borderPutrecNo;
+    }
+
+    public void setBorderPutrecNo(String borderPutrecNo) {
+        this.borderPutrecNo = borderPutrecNo;
+    }
+
+    public String getBorderName() {
+        return borderName;
+    }
+
+    public void setBorderName(String borderName) {
+        this.borderName = borderName;
+    }
+
+    public String getCiphertextIdno() {
+        return ciphertextIdno;
+    }
+
+    public void setCiphertextIdno(String ciphertextIdno) {
+        this.ciphertextIdno = ciphertextIdno;
+    }
+
+    public String getBorderAddr() {
+        return borderAddr;
+    }
+
+    public void setBorderAddr(String borderAddr) {
+        this.borderAddr = borderAddr;
+    }
+
+    public String getBorderTel() {
+        return borderTel;
+    }
+
+    public void setBorderTel(String borderTel) {
+        this.borderTel = borderTel;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.pj.api.dto;
+
+
+public class CooperativeDclbordersDto {
+
+    private String dclNo;
+    private String borderPutrecNo;
+    private String declareName;
+    private String declareCiphertextIdno;
+    private String borderTel;
+
+    public String getDclNo() {
+        return dclNo;
+    }
+
+    public void setDclNo(String dclNo) {
+        this.dclNo = dclNo;
+    }
+
+    public String getBorderPutrecNo() {
+        return borderPutrecNo;
+    }
+
+    public void setBorderPutrecNo(String borderPutrecNo) {
+        this.borderPutrecNo = borderPutrecNo;
+    }
+
+    public String getDeclareName() {
+        return declareName;
+    }
+
+    public void setDeclareName(String declareName) {
+        this.declareName = declareName;
+    }
+
+    public String getDeclareCiphertextIdno() {
+        return declareCiphertextIdno;
+    }
+
+    public void setDeclareCiphertextIdno(String declareCiphertextIdno) {
+        this.declareCiphertextIdno = declareCiphertextIdno;
+    }
+
+    public String getBorderTel() {
+        return borderTel;
+    }
+
+    public void setBorderTel(String borderTel) {
+        this.borderTel = borderTel;
+    }
+}

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

@@ -0,0 +1,242 @@
+package com.pj.api.dto;
+
+
+import java.util.Date;
+
+
+public class HtCooperativeDto {
+
+	/**
+	 * 地方平台的内部业务编号，每次申请都是新编号
+	 */
+	private String platSeqNo;
+
+	/**
+	 * 关区代码
+	 */
+	private String customsCode;
+
+	/**
+	 *  合作社名称
+	 */
+	private String orgName;
+
+	/**
+	 * 社会统一信用代码 证 （ 业 务 主键，变更时该字段不允许修改）
+	 */
+	private String orgSccd;
+
+	/**
+	 * 成立日期
+	 */
+	private String createDate;
+
+	/**
+	 * 所属边境市（县、区）乡镇村屯名称
+	 */
+	private String address;
+
+	/**
+	 * 法人代表姓名
+	 */
+	private String correpName;
+
+	/**
+	 * 法人代表身份证号码
+	 */
+	private String ciphertextIdno;
+
+	/**
+	 * 法人代表手机号码
+	 */
+	private String correpTel;
+
+	/**
+	 * 启停用状态：1- 启用、2-停用、3-注销
+	 */
+	private String eDStatus;
+
+	/**
+	 * 有效效截止时间yyyy-MM-dd
+	 */
+	private String expiry;
+
+	/**
+	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值；
+	 */
+	private String putrecNo;
+
+	/**
+	 * 地方政府编号
+	 */
+	private String localGovernmentNo;
+
+	/**
+	 * 监管场所编号
+	 */
+	private String fieldCode;
+
+	/**
+	 * 监管场所名称
+	 */
+	private String fieldName;
+
+	/**
+	 * 申报状态 D0，暂存，D1 发往海关,D2-发往海关成功， D3-发往海关失败，Y-海关入库成功，N- 海关入库失败，04 退单， 03 通过
+	 */
+	private String declStatus;
+
+	/**
+	 * 边民信息集合List<E> borderList
+	 */
+	private String borderList;
+
+	/**
+	 * 合作社代表信息
+	 */
+	private String dclBorderList;
+
+	public String getPlatSeqNo() {
+		return platSeqNo;
+	}
+
+	public void setPlatSeqNo(String platSeqNo) {
+		this.platSeqNo = platSeqNo;
+	}
+
+	public String getCustomsCode() {
+		return customsCode;
+	}
+
+	public void setCustomsCode(String customsCode) {
+		this.customsCode = customsCode;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getOrgSccd() {
+		return orgSccd;
+	}
+
+	public void setOrgSccd(String orgSccd) {
+		this.orgSccd = orgSccd;
+	}
+
+	public String getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getCorrepName() {
+		return correpName;
+	}
+
+	public void setCorrepName(String correpName) {
+		this.correpName = correpName;
+	}
+
+	public String getCiphertextIdno() {
+		return ciphertextIdno;
+	}
+
+	public void setCiphertextIdno(String ciphertextIdno) {
+		this.ciphertextIdno = ciphertextIdno;
+	}
+
+	public String getCorrepTel() {
+		return correpTel;
+	}
+
+	public void setCorrepTel(String correpTel) {
+		this.correpTel = correpTel;
+	}
+
+	public String geteDStatus() {
+		return eDStatus;
+	}
+
+	public void seteDStatus(String eDStatus) {
+		this.eDStatus = eDStatus;
+	}
+
+	public String getExpiry() {
+		return expiry;
+	}
+
+	public void setExpiry(String expiry) {
+		this.expiry = expiry;
+	}
+
+	public String getPutrecNo() {
+		return putrecNo;
+	}
+
+	public void setPutrecNo(String putrecNo) {
+		this.putrecNo = putrecNo;
+	}
+
+	public String getLocalGovernmentNo() {
+		return localGovernmentNo;
+	}
+
+	public void setLocalGovernmentNo(String localGovernmentNo) {
+		this.localGovernmentNo = localGovernmentNo;
+	}
+
+	public String getFieldCode() {
+		return fieldCode;
+	}
+
+	public void setFieldCode(String fieldCode) {
+		this.fieldCode = fieldCode;
+	}
+
+	public String getFieldName() {
+		return fieldName;
+	}
+
+	public void setFieldName(String fieldName) {
+		this.fieldName = fieldName;
+	}
+
+	public String getDeclStatus() {
+		return declStatus;
+	}
+
+	public void setDeclStatus(String declStatus) {
+		this.declStatus = declStatus;
+	}
+
+	public String getBorderList() {
+		return borderList;
+	}
+
+	public void setBorderList(String borderList) {
+		this.borderList = borderList;
+	}
+
+	public String getDclBorderList() {
+		return dclBorderList;
+	}
+
+	public void setDclBorderList(String dclBorderList) {
+		this.dclBorderList = dclBorderList;
+	}
+}

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

@@ -0,0 +1,141 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+
+public class HtGroupDto implements Serializable {
+
+
+    @JsonProperty("platSeqNo")
+    private String platSeqNo;
+    @JsonProperty("customsCode")
+    private String customsCode;
+    @JsonProperty("orgName")
+    private String orgName;
+    @JsonProperty("address")
+    private String address;
+    @JsonProperty("shopsSccd")
+    private String shopsSccd;
+    @JsonProperty("eDStatus")
+    private String eDStatus;
+    @JsonProperty("expiry")
+    private String expiry;
+    @JsonProperty("putrecNo")
+    private String putrecNo;
+    @JsonProperty("localGovernmentNo")
+    private String localGovernmentNo;
+    @JsonProperty("filingStatus")
+    private String filingStatus;
+    @JsonProperty("fieldCode")
+    private String fieldCode;
+    @JsonProperty("borderList")
+    private String borderList;
+    @JsonProperty("dclBorderList")
+    private String dclBorderList;
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getCustomsCode() {
+        return customsCode;
+    }
+
+    public void setCustomsCode(String customsCode) {
+        this.customsCode = customsCode;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getShopsSccd() {
+        return shopsSccd;
+    }
+
+    public void setShopsSccd(String shopsSccd) {
+        this.shopsSccd = shopsSccd;
+    }
+
+    public String geteDStatus() {
+        return eDStatus;
+    }
+
+    public void seteDStatus(String eDStatus) {
+        this.eDStatus = eDStatus;
+    }
+
+    public String getExpiry() {
+        return expiry;
+    }
+
+    public void setExpiry(String expiry) {
+        this.expiry = expiry;
+    }
+
+    public String getPutrecNo() {
+        return putrecNo;
+    }
+
+    public void setPutrecNo(String putrecNo) {
+        this.putrecNo = putrecNo;
+    }
+
+    public String getLocalGovernmentNo() {
+        return localGovernmentNo;
+    }
+
+    public void setLocalGovernmentNo(String localGovernmentNo) {
+        this.localGovernmentNo = localGovernmentNo;
+    }
+
+    public String getFilingStatus() {
+        return filingStatus;
+    }
+
+    public void setFilingStatus(String filingStatus) {
+        this.filingStatus = filingStatus;
+    }
+
+    public String getFieldCode() {
+        return fieldCode;
+    }
+
+    public void setFieldCode(String fieldCode) {
+        this.fieldCode = fieldCode;
+    }
+
+    public String getBorderList() {
+        return borderList;
+    }
+
+    public void setBorderList(String borderList) {
+        this.borderList = borderList;
+    }
+
+    public String getDclBorderList() {
+        return dclBorderList;
+    }
+
+    public void setDclBorderList(String dclBorderList) {
+        this.dclBorderList = dclBorderList;
+    }
+}

sp-service/async-server/src/main/java/com/pj/task/HtByteTask.java

@@ -158,7 +158,7 @@ public class HtByteTask {
                     break;
                 case "003":
                     //边民互助组备案
-                    GroupDto groupDto = JSONObject.parseObject(body, GroupDto.class);
+                    HtGroupDto groupDto = JSONObject.parseObject(body, HtGroupDto.class);
                     //保存
                     flag = FeignFactory.levelOneServerInterface.groupDto(groupDto);
                     methodHtByteTask.updateHtByteInfo(flag, item, dataDto);
@@ -170,7 +170,7 @@ public class HtByteTask {
                     break;
                 case "004":
                     //边民合作社备案
-                    CooperativeDto cooperativeDto = JSONObject.parseObject(body, CooperativeDto.class);
+                    HtCooperativeDto cooperativeDto = JSONObject.parseObject(body, HtCooperativeDto.class);
                     //保存
                     flag = FeignFactory.levelOneServerInterface.cooperativeDto(cooperativeDto);
                     methodHtByteTask.updateHtByteInfo(flag, item, dataDto);

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeController.java

@@ -1,7 +1,7 @@
 package com.pj.tb_cooperative;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.pj.api.dto.CooperativeDto;
+import com.pj.api.dto.HtCooperativeDto;
 import com.pj.project4sp.SP;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * Controller: tb_cooperative -- 合作社
- * @author lsw 
+ * @author lsw
  */
 @RestController
 @RequestMapping("/TbCooperative/")
@@ -25,7 +25,7 @@ public class TbCooperativeController {
 	@Autowired
     TbCooperativeService tbCooperativeService;
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 	@SaCheckPermission(TbCooperative.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbCooperative t){
@@ -34,24 +34,24 @@ public class TbCooperativeController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 	@SaCheckPermission(TbCooperative.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbCooperativeService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(TbCooperative.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbCooperative.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 */  
+
+	/** 改 */
 	@RequestMapping("update")
 	@SaCheckPermission(TbCooperative.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbCooperative t){
@@ -59,7 +59,7 @@ public class TbCooperativeController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(TbCooperative.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
@@ -67,16 +67,16 @@ public class TbCooperativeController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 		@SaCheckPermission(TbCooperative.PERMISSION_CODE)
-	public AjaxJson getList() { 
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbCooperative> list = tbCooperativeService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 
-	/** 改 - 删除状态(0=禁用,1=启用) */  
+	/** 改 - 删除状态(0=禁用,1=启用) */
 	@RequestMapping("updateDeleteStatus")
 	@SaCheckPermission(TbCooperative.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDeleteStatus(Long id, Integer value){
@@ -90,7 +90,7 @@ public class TbCooperativeController {
 
 	/** 远程调用: 对合作社信息进行事务处理 */
 	@RequestMapping("rpc/cooperativeDto")
-	public boolean cooperativeDto(@RequestBody CooperativeDto cooperativeDto){
+	public boolean cooperativeDto(@RequestBody HtCooperativeDto cooperativeDto){
 		boolean b = tbCooperativeService.cooperativeDto(cooperativeDto);
 		return b;
 	}

sp-service/level-one-server/src/main/java/com/pj/tb_cooperative/TbCooperativeService.java

@@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.dto.CooperativeDto;
+import com.pj.api.dto.HtCooperativeDto;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.DeleteStatus;
+import com.pj.tb_trade_area.TbTradeArea;
+import com.pj.tb_trade_area.TbTradeAreaService;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
@@ -26,6 +30,8 @@ public class TbCooperativeService extends ServiceImpl<TbCooperativeMapper,TbCoop
 	/** 底层 Mapper 对象 */
 	@Autowired
     TbCooperativeMapper tbCooperativeMapper;
+	@Resource
+	private TbTradeAreaService tbTradeAreaService;
 
 	/** 增 */
 	void add(TbCooperative t){
@@ -68,11 +74,14 @@ public class TbCooperativeService extends ServiceImpl<TbCooperativeMapper,TbCoop
 	}
 
 	/** 远程调用: 对合作社信息进行事务处理 */
-	public boolean cooperativeDto(CooperativeDto cooperativeDto){
+	public boolean cooperativeDto(HtCooperativeDto cooperativeDto){
 		TbCooperative tbCooperative = new TbCooperative();
 		BeanUtils.copyProperties(cooperativeDto,tbCooperative);
 		tbCooperative.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 		tbCooperative.setCreateTime(new Date());
+
+		TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(cooperativeDto.getFieldCode(), "");
+		tbCooperative.setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
 		//查询是否有数据
 		List<TbCooperative> tbCooperativeList = tbCooperativeMapper.selectList(new LambdaQueryWrapper<TbCooperative>().eq(TbCooperative::getPlatSeqNo, cooperativeDto.getPlatSeqNo()));
 		if(tbCooperativeList.size() == 0){

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

@@ -1,34 +1,23 @@
 package com.pj.tb_group;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
-
-import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pj.api.dto.GroupDto;
-import com.pj.tb_enterprise.TbEnterprise;
-import com.pj.tb_people.TbPeople;
-import com.pj.tb_people.TbPeopleService;
+import com.pj.api.dto.HtGroupDto;
 import com.pj.utils.so.SoMap;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import com.pj.utils.sg.*;
 import com.pj.project4sp.SP;
 
-import com.pj.current.satoken.StpUserUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.multipart.MultipartFile;
 
 
 /**
  * Controller: tb_group -- 互助组
- * @author qzy 
+ * @author qzy
  */
 @RestController
 @RequestMapping("/TbGroup/")
@@ -39,7 +28,7 @@ public class TbGroupController {
 	TbGroupService tbGroupService;
 
 
-	/** 增 */  
+	/** 增 */
 	@RequestMapping("add")
 	@SaCheckPermission(TbGroup.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbGroup t){
@@ -48,24 +37,24 @@ public class TbGroupController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 	@SaCheckPermission(TbGroup.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbGroupService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(TbGroup.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbGroup.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 */  
+
+	/** 改 */
 	@RequestMapping("update")
 	@SaCheckPermission(TbGroup.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbGroup t){
@@ -73,7 +62,7 @@ public class TbGroupController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(TbGroup.PERMISSION_CODE)
 	public AjaxJson getById(String id){
@@ -81,18 +70,18 @@ public class TbGroupController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 		@SaCheckPermission(TbGroup.PERMISSION_CODE)
-	public AjaxJson getList() { 
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbGroup> list = tbGroupService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
-	
-	
-	/** 改 - 删除状态(0=禁用,1=启用) */  
+
+
+
+	/** 改 - 删除状态(0=禁用,1=启用) */
 	@RequestMapping("updateDeleteStatus")
 	@SaCheckPermission(TbGroup.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDeleteStatus(String id, Integer value){
@@ -217,7 +206,7 @@ public class TbGroupController {
 
 	/** 用户在APP注册时选择身份则创建一个对应身份的实体 */
 	@RequestMapping("rpc/groupDto")
-	public boolean groupDto(@RequestBody GroupDto groupDto){
+	public boolean groupDto(@RequestBody HtGroupDto groupDto){
 		return tbGroupService.groupDto(groupDto);
 	}
 

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

@@ -8,16 +8,17 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pj.api.dto.BorderDTO;
+import com.pj.api.dto.DclBorderList;
 import com.pj.api.dto.GroupDto;
+import com.pj.api.dto.HtGroupDto;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.IsLock;
-import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleMapper;
 import com.pj.tb_people.TbPeopleService;
@@ -365,7 +366,7 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
     /**
      * 远程调用方法
      */
-    public boolean groupDto(GroupDto groupDto) {
+    public boolean groupDto(HtGroupDto groupDto) {
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(groupDto.getFieldCode(), "");
         TbGroup tbGroup = new TbGroup();
         BeanUtils.copyProperties(groupDto, tbGroup);
@@ -377,12 +378,26 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             tbGroup.setCreateTime(new Date()).setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
          this.save(tbGroup);
         }
+
+        // 边民信息表体信息
         List<BorderDTO> borderDTOList = JSONUtil.toList(groupDto.getBorderList(), BorderDTO.class);
+        //互助组边民代表(组长)表体信息
+		List<DclBorderList> dclBorderList = JSONUtil.toList(groupDto.getDclBorderList(), DclBorderList.class);
+
         borderDTOList.forEach(borderDTO -> {
-            TbPeople tbPeople = tbPeopleService.findByIdCarNo(borderDTO.getCiphertextIdno());
+			TbPeople tbPeople = tbPeopleService.findByIdCarNo(borderDTO.getIdCardNo());
             if (tbPeople==null){
                 tbPeople=new TbPeople();
             }
+
+            //判断当前边民是否是组长
+			List<DclBorderList> dclBorderList1 = dclBorderList.stream().filter(dclBorder -> dclBorder.getIdCardNo().equals(borderDTO.getIdCardNo())).collect(Collectors.toList());
+			if(dclBorderList1.size() > 0) {
+				tbPeople.setRole(2);//组长
+			} else {
+				tbPeople.setRole(1);//普通边民
+			}
+
             tbPeople.setGroupName(tbGroup.getOrgName()).setGroupId(tbGroup.getId()).setTradeAreaId(tbTradeArea.getId())
                     .setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
             tbPeopleService.saveOrUpdate(tbPeople);

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

@@ -564,6 +564,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
         tbPeople.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ONE.getCode()); // 默认审核通过
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(peopleDto.getFieldCode(), "");
         tbPeople.setTradeAreaId(tbTradeArea.getId());
+        tbPeople.setTradeAreaName(tbTradeArea.getName());
         /**备案编号，如果为
          新增备案，传空值；
          如果为变更备案，

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopService.java

@@ -219,8 +219,7 @@ public class TbShopService extends ServiceImpl<TbShopMapper, TbShop> implements
      * 远程调用方法
      */
     public boolean shopDto(HtShopDTO shopDto) throws Exception {
-        String tradeCode = shopDto.getFieldCode();
-        TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(tradeCode, shopDto.getFieldName());
+        TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(shopDto.getFieldCode(), shopDto.getFieldName());
         TbShop tbShop = this.findByCode(shopDto.getShopNo());
         if (tbShop == null) {
             tbShop = new TbShop();
@@ -229,11 +228,11 @@ public class TbShopService extends ServiceImpl<TbShopMapper, TbShop> implements
         BeanUtils.copyProperties(shopDto, tbShop, "id");
         //无则新增商铺
         tbShop.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认可用
-        tbShop.setTradeAreaId(tbTradeArea.getId())
-                .setTradeAreaName(tbTradeArea.getName()); // 创建时间
-        tbShop.setCreateName("航通"); // 创建人
+        tbShop.setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
+        tbShop.setCreateName("航通").setCreateTime(new Date()); // 创建人 // 创建时间
         tbShop.setStatus(Status.STATUS_ONE.getCode()); // 可用状态
         this.saveOrUpdate(tbShop);
+
         TbEnterprise enterprise = tbEnterpriseService.findBydutyParagraph(shopDto.getShopSccd());
         boolean isNew = false;
         if (enterprise == null) {