8.31 对接航通[商品基础信息,交易结算信息,放行记录（过卡记录）,进口申报单边民确认] 还有部分未完成

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

@@ -96,4 +96,12 @@ public interface LevelOneServerInterface {
     /** 远程调用: 根据电话查询商铺 */
     @RequestMapping("/TbShop/rpc/getShopDtoListByPhone")
     public List<ShopDto> getShopDtoListByPhone(@RequestParam("phone") String phone);
+
+    /** 远程调用: 同步航通海关监管商品信息 */
+    @RequestMapping("/TbGoods/rpc/goodsDto")
+    public boolean goodsDto(@RequestBody GoodsDto goodsDto);
+
+    /** 根据航通主键查询appUser */
+    @RequestMapping("/TbPeople/rpc/getAppUserByBorderPutrecNo")
+    public AppUserDto getAppUserByBorderPutrecNo(@RequestParam("borderPutrecNo") String borderPutrecNo);
 }

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

@@ -149,6 +149,20 @@ public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOne
                 log.error("查询一级市场商铺错误,当前电话:{},错误信息是:{}",phone,throwable.getMessage());
                 return new ArrayList<>();
             }
+
+            @Override
+            public boolean goodsDto(GoodsDto goodsDto) {
+                System.out.println(throwable.getMessage());
+                log.error("海关监管商品错误,当前对象:{},错误信息是:{}",goodsDto,throwable.getMessage());
+                return false;
+            }
+
+            @Override
+            public AppUserDto getAppUserByBorderPutrecNo(String borderPutrecNo) {
+                System.out.println(throwable.getMessage());
+                log.error("根据航通主键查询appUser错误,当前对象:{},错误信息是:{}",borderPutrecNo,throwable.getMessage());
+                return null;
+            }
         };
     }
 }

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

@@ -1,116 +0,0 @@
-package com.pj.api.dto;
-
-
-/**
- * 互助组边民信息字段
- * @Author Mechrevo
- * @Date 2023 08 27 10 46
- **/
-
-public class BorderList {
-
-    /**
-     * 互助组中边民的序号
-     */
-    private String borderNo;
-
-    /**
-     * 边民备案编号
-     */
-    private String borderPutrecNo;
-
-    /**
-     * 边民姓名
-     */
-    private String borderName;
-
-    /**
-     * 边民身份证号码
-     */
-    private String idCardNo;
-
-    /**
-     * 户籍地址
-     */
-    private String borderAddr;
-
-    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 getIdCardNo() {
-        return idCardNo;
-    }
-
-    public void setIdCardNo(String idCardNo) {
-        this.idCardNo = idCardNo;
-    }
-
-    public String getBorderAddr() {
-        return borderAddr;
-    }
-
-    public void setBorderAddr(String borderAddr) {
-        this.borderAddr = borderAddr;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getBorderTel() {
-        return borderTel;
-    }
-
-    public void setBorderTel(String borderTel) {
-        this.borderTel = borderTel;
-    }
-
-    public BorderList(String borderNo, String borderPutrecNo, String borderName, String idCardNo, String borderAddr, String groupId, String borderTel) {
-        this.borderNo = borderNo;
-        this.borderPutrecNo = borderPutrecNo;
-        this.borderName = borderName;
-        this.idCardNo = idCardNo;
-        this.borderAddr = borderAddr;
-        this.groupId = groupId;
-        this.borderTel = borderTel;
-    }
-
-    public BorderList() {
-    }
-
-    /**
-     * 本系统中互助组 id
-     */
-    private String groupId;
-
-    /**
-     * 手机号码
-     */
-    private String borderTel;
-
-}

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

@@ -16,7 +16,7 @@ public class GoodsDto {
     /**
      * 名称
      */
-    private String name;
+    private String gName;
 
     /**
      * 主图
@@ -36,7 +36,7 @@ public class GoodsDto {
     /**
      * 编号
      */
-    private String code;
+    private String hsCode;
 
     /**
      * 备注
@@ -58,7 +58,7 @@ public class GoodsDto {
     /**
      *
      */
-    private String unit;
+    private String gUnit;
 
     /**
      *
@@ -108,50 +108,50 @@ public class GoodsDto {
      */
     private Integer deleteStatus;
 
-    public GoodsDto(String name, String avatar, String typeIds, String typeNames, String code, String remark, String source, int status, String unit, Double singlePrice, String taxNo, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus) {
-        this.name = name;
-        this.avatar = avatar;
-        this.typeIds = typeIds;
-        this.typeNames = typeNames;
-        this.code = code;
-        this.remark = remark;
-        this.source = source;
-        this.status = status;
-        this.unit = unit;
-        this.singlePrice = singlePrice;
-        this.taxNo = taxNo;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.createName = createName;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.updateName = updateName;
-        this.deleteStatus = deleteStatus;
-    }
-
-    public GoodsDto(Long id, String name, String avatar, String typeIds, String typeNames, String code, String remark, String source, int status, String unit, Double singlePrice, String taxNo, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus) {
-        this.id = id;
-        this.name = name;
-        this.avatar = avatar;
-        this.typeIds = typeIds;
-        this.typeNames = typeNames;
-        this.code = code;
-        this.remark = remark;
-        this.source = source;
-        this.status = status;
-        this.unit = unit;
-        this.singlePrice = singlePrice;
-        this.taxNo = taxNo;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.createName = createName;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.updateName = updateName;
-        this.deleteStatus = deleteStatus;
-    }
-
-    public GoodsDto() {
+    /**
+     * 第一计量单位
+     */
+    private String unit1;
+    /**
+     * 第二计量单位
+     */
+    private String unit2;
+    /**
+     * 用途
+     */
+    private String useTo;
+    /**
+     * 存储条件
+     */
+    private String storageEnvm;
+
+    @Override
+    public String toString() {
+        return "GoodsDto{" +
+                "id=" + id +
+                ", gName='" + gName + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", typeIds='" + typeIds + '\'' +
+                ", typeNames='" + typeNames + '\'' +
+                ", hsCode='" + hsCode + '\'' +
+                ", remark='" + remark + '\'' +
+                ", source='" + source + '\'' +
+                ", status=" + status +
+                ", gUnit='" + gUnit + '\'' +
+                ", singlePrice=" + singlePrice +
+                ", taxNo='" + taxNo + '\'' +
+                ", createTime=" + createTime +
+                ", createBy='" + createBy + '\'' +
+                ", createName='" + createName + '\'' +
+                ", updateTime=" + updateTime +
+                ", updateBy='" + updateBy + '\'' +
+                ", updateName='" + updateName + '\'' +
+                ", deleteStatus=" + deleteStatus +
+                ", unit1='" + unit1 + '\'' +
+                ", unit2='" + unit2 + '\'' +
+                ", useTo='" + useTo + '\'' +
+                ", storageEnvm='" + storageEnvm + '\'' +
+                '}';
     }
 
     public Long getId() {
@@ -162,12 +162,12 @@ public class GoodsDto {
         this.id = id;
     }
 
-    public String getName() {
-        return name;
+    public String getgName() {
+        return gName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setgName(String gName) {
+        this.gName = gName;
     }
 
     public String getAvatar() {
@@ -194,12 +194,12 @@ public class GoodsDto {
         this.typeNames = typeNames;
     }
 
-    public String getCode() {
-        return code;
+    public String getHsCode() {
+        return hsCode;
     }
 
-    public void setCode(String code) {
-        this.code = code;
+    public void setHsCode(String hsCode) {
+        this.hsCode = hsCode;
     }
 
     public String getRemark() {
@@ -226,12 +226,12 @@ public class GoodsDto {
         this.status = status;
     }
 
-    public String getUnit() {
-        return unit;
+    public String getgUnit() {
+        return gUnit;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit;
+    public void setgUnit(String gUnit) {
+        this.gUnit = gUnit;
     }
 
     public Double getSinglePrice() {
@@ -305,4 +305,65 @@ public class GoodsDto {
     public void setDeleteStatus(Integer deleteStatus) {
         this.deleteStatus = deleteStatus;
     }
+
+    public String getUnit1() {
+        return unit1;
+    }
+
+    public void setUnit1(String unit1) {
+        this.unit1 = unit1;
+    }
+
+    public String getUnit2() {
+        return unit2;
+    }
+
+    public void setUnit2(String unit2) {
+        this.unit2 = unit2;
+    }
+
+    public String getUseTo() {
+        return useTo;
+    }
+
+    public void setUseTo(String useTo) {
+        this.useTo = useTo;
+    }
+
+    public String getStorageEnvm() {
+        return storageEnvm;
+    }
+
+    public void setStorageEnvm(String storageEnvm) {
+        this.storageEnvm = storageEnvm;
+    }
+
+    public GoodsDto(Long id, String gName, String avatar, String typeIds, String typeNames, String hsCode, String remark, String source, int status, String gUnit, Double singlePrice, String taxNo, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, String unit1, String unit2, String useTo, String storageEnvm) {
+        this.id = id;
+        this.gName = gName;
+        this.avatar = avatar;
+        this.typeIds = typeIds;
+        this.typeNames = typeNames;
+        this.hsCode = hsCode;
+        this.remark = remark;
+        this.source = source;
+        this.status = status;
+        this.gUnit = gUnit;
+        this.singlePrice = singlePrice;
+        this.taxNo = taxNo;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.deleteStatus = deleteStatus;
+        this.unit1 = unit1;
+        this.unit2 = unit2;
+        this.useTo = useTo;
+        this.storageEnvm = storageEnvm;
+    }
+
+    public GoodsDto() {
+    }
 }

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

@@ -0,0 +1,135 @@
+package com.pj.api.dto;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 31 15 30
+ **/
+public class ImportDeclarePeopleDto {
+    private Integer id;
+
+    /**
+     * 身份证号
+     */
+    private String idno;
+
+    /**
+     * 边民备案编号(可选)
+     */
+    private String borderPutrecNo;
+
+    /**
+     * 边民姓名不能为空
+     */
+    private String borderName;
+
+    /**
+     * 结算单号
+     */
+    private String settleBillNo;
+
+    /**
+     * 进出口预申报单号
+     */
+    private String preIeportNo;
+
+    /**
+     * 购买申报确认状态：Y->确认购买申报，N->不购买申报
+     */
+    private String buyConfirmStatus;
+
+    /**
+     * 支付状态：01->未支付，02->已支付
+     */
+    private Integer payStatus;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getIdno() {
+        return idno;
+    }
+
+    public void setIdno(String idno) {
+        this.idno = idno;
+    }
+
+    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 getSettleBillNo() {
+        return settleBillNo;
+    }
+
+    public void setSettleBillNo(String settleBillNo) {
+        this.settleBillNo = settleBillNo;
+    }
+
+    public String getPreIeportNo() {
+        return preIeportNo;
+    }
+
+    public void setPreIeportNo(String preIeportNo) {
+        this.preIeportNo = preIeportNo;
+    }
+
+    public String getBuyConfirmStatus() {
+        return buyConfirmStatus;
+    }
+
+    public void setBuyConfirmStatus(String buyConfirmStatus) {
+        this.buyConfirmStatus = buyConfirmStatus;
+    }
+
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public ImportDeclarePeopleDto(Integer id, String idno, String borderPutrecNo, String borderName, String settleBillNo, String preIeportNo, String buyConfirmStatus, Integer payStatus, Integer finishStatus) {
+        this.id = id;
+        this.idno = idno;
+        this.borderPutrecNo = borderPutrecNo;
+        this.borderName = borderName;
+        this.settleBillNo = settleBillNo;
+        this.preIeportNo = preIeportNo;
+        this.buyConfirmStatus = buyConfirmStatus;
+        this.payStatus = payStatus;
+        this.finishStatus = finishStatus;
+    }
+
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public ImportDeclarePeopleDto() {
+    }
+    /**
+     * 完成情况
+     */
+    private Integer finishStatus;
+}

sp-service/async-server/src/main/java/com/pj/ht_borders_list/HtBordersList.java

@@ -0,0 +1,127 @@
+package com.pj.ht_borders_list;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: ht_borders_list -- 
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(HtBordersList.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class HtBordersList extends Model<HtBordersList> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "ht_borders_list";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "ht-borders-list";
+	public static final String PERMISSION_CODE_ADD = "ht-borders-list-add";
+	public static final String PERMISSION_CODE_EDIT = "ht-borders-list-edit";
+	public static final String PERMISSION_CODE_DEL = "ht-borders-list-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 *  
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	/**
+	 * 预申报编号 
+	 */
+	private String platSeqNo;	
+
+	/**
+	 * 边民姓名 
+	 */
+	private String borderName;	
+
+	/**
+	 * 身份证号 
+	 */
+	private String idno;	
+
+	/**
+	 * 边民备案编号 
+	 */
+	private String borderPutrecNo;	
+
+	/**
+	 * 结算单号 
+	 */
+	private String settleBillNo;	
+
+	/**
+	 * 申报金额 
+	 */
+	private Double buyAmount;	
+
+	/**
+	 * 净重 
+	 */
+	private Double netWt;	
+
+	/**
+	 * 毛重 
+	 */
+	private Double grossWt;	
+
+	/**
+	 * 申报数量 
+	 */
+	private Double buyQty;	
+
+	/**
+	 * 第一数量 
+	 */
+	private Double buyQty1;	
+
+	/**
+	 * 第二数量 
+	 */
+	private Double buyQty2;	
+
+	/**
+	 * 进出口预申报单号 
+	 */
+	private String preIeportNo;	
+
+	/**
+	 * 创建时间 
+	 */
+	private Date createTime;
+
+	/**
+	 * 完成状态 
+	 */
+	private Integer finishStatus;	
+
+
+
+
+
+	
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_borders_list/HtBordersListController.java

@@ -0,0 +1,87 @@
+package com.pj.ht_borders_list;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+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;
+
+
+/**
+ * Controller: ht_borders_list -- 
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/HtBordersList/")
+public class HtBordersListController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	HtBordersListService htBordersListService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(HtBordersList.PERMISSION_CODE_ADD)
+	public AjaxJson add(HtBordersList h){
+		htBordersListService.add(h);
+		h = htBordersListService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(HtBordersList.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 htBordersListService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(HtBordersList.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(HtBordersList.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(HtBordersList.PERMISSION_CODE_EDIT)
+	public AjaxJson update(HtBordersList h){
+		htBordersListService.update(h);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(HtBordersList.PERMISSION_CODE)
+	public AjaxJson getById(Integer id){
+		HtBordersList h = htBordersListService.getById(id);
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(HtBordersList.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<HtBordersList> list = htBordersListService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	
+
+	
+	
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_borders_list/HtBordersListMapper.java

@@ -0,0 +1,30 @@
+package com.pj.ht_borders_list;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: ht_borders_list -- 
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface HtBordersListMapper extends BaseMapper <HtBordersList> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<HtBordersList> getList(SoMap so);
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_borders_list/HtBordersListMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pj.ht_borders_list.HtBordersListMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, plat_seq_no, border_name, idno, border_putrec_no, settle_bill_no, buy_amount, net_wt, gross_wt, buy_qty, buy_qty1, buy_qty2, pre_ieport_no, create_time, finish_status from ht_borders_list  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.ht_borders_list.HtBordersList"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from ht_borders_list 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("platSeqNo") '> and plat_seq_no = #{platSeqNo} </if>
+			<if test=' this.has("borderName") '> and border_name = #{borderName} </if>
+			<if test=' this.has("idno") '> and idno = #{idno} </if>
+			<if test=' this.has("borderPutrecNo") '> and border_putrec_no = #{borderPutrecNo} </if>
+			<if test=' this.has("settleBillNo") '> and settle_bill_no = #{settleBillNo} </if>
+			<if test=' this.has("buyAmount") '> and buy_amount = #{buyAmount} </if>
+			<if test=' this.has("netWt") '> and net_wt = #{netWt} </if>
+			<if test=' this.has("grossWt") '> and gross_wt = #{grossWt} </if>
+			<if test=' this.has("buyQty") '> and buy_qty = #{buyQty} </if>
+			<if test=' this.has("buyQty1") '> and buy_qty1 = #{buyQty1} </if>
+			<if test=' this.has("buyQty2") '> and buy_qty2 = #{buyQty2} </if>
+			<if test=' this.has("preIeportNo") '> and pre_ieport_no = #{preIeportNo} </if>
+			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
+			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> plat_seq_no desc </when>
+			<when test='sortType == 3'> border_name desc </when>
+			<when test='sortType == 4'> idno desc </when>
+			<when test='sortType == 5'> border_putrec_no desc </when>
+			<when test='sortType == 6'> settle_bill_no desc </when>
+			<when test='sortType == 7'> buy_amount desc </when>
+			<when test='sortType == 8'> net_wt desc </when>
+			<when test='sortType == 9'> gross_wt desc </when>
+			<when test='sortType == 10'> buy_qty desc </when>
+			<when test='sortType == 11'> buy_qty1 desc </when>
+			<when test='sortType == 12'> buy_qty2 desc </when>
+			<when test='sortType == 13'> pre_ieport_no desc </when>
+			<when test='sortType == 14'> create_time desc </when>
+			<when test='sortType == 15'> finish_status desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/async-server/src/main/java/com/pj/ht_borders_list/HtBordersListService.java

@@ -0,0 +1,51 @@
+package com.pj.ht_borders_list;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: ht_borders_list -- 
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class HtBordersListService extends ServiceImpl<HtBordersListMapper, HtBordersList> implements IService<HtBordersList>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	HtBordersListMapper htBordersListMapper;
+
+	/** 增 */
+	void add(HtBordersList h){
+		save(h);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(HtBordersList h){
+		updateById(h);
+
+	}
+
+	/** 查 */
+	HtBordersList getById(Integer id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<HtBordersList> getList(SoMap so) { 
+		return htBordersListMapper.getList(so);	
+	}
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_import_declare_people/HtImportDeclarePeople.java

@@ -0,0 +1,92 @@
+package com.pj.ht_import_declare_people;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: ht_import_declare_people -- 进口申报单边民确认表
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(HtImportDeclarePeople.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class HtImportDeclarePeople extends Model<HtImportDeclarePeople> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "ht_import_declare_people";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "ht-import-declare-people";
+	public static final String PERMISSION_CODE_ADD = "ht-import-declare-people-add";
+	public static final String PERMISSION_CODE_EDIT = "ht-import-declare-people-edit";
+	public static final String PERMISSION_CODE_DEL = "ht-import-declare-people-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+	@TableId(type = IdType.AUTO)
+	private Integer id;	
+
+	/**
+	 * 身份证号 
+	 */
+	private String idno;	
+
+	/**
+	 * 边民备案编号(可选) 
+	 */
+	private String borderPutrecNo;	
+
+	/**
+	 * 边民姓名不能为空 
+	 */
+	private String borderName;	
+
+	/**
+	 * 结算单号 
+	 */
+	private String settleBillNo;	
+
+	/**
+	 * 进出口预申报单号 
+	 */
+	private String preIeportNo;	
+
+	/**
+	 * 购买申报确认状态：Y->确认购买申报，N->不购买申报 
+	 */
+	private String buyConfirmStatus;	
+
+	/**
+	 * 支付状态：01->未支付，02->已支付 
+	 */
+	private Integer payStatus;
+
+	/**
+	 * 完成情况
+	 */
+	private Integer finishStatus;
+
+
+	
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_import_declare_people/HtImportDeclarePeopleController.java

@@ -0,0 +1,87 @@
+package com.pj.ht_import_declare_people;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+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;
+
+
+/**
+ * Controller: ht_import_declare_people -- 进口申报单边民确认表
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/HtImportDeclarePeople/")
+public class HtImportDeclarePeopleController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	HtImportDeclarePeopleService htImportDeclarePeopleService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(HtImportDeclarePeople.PERMISSION_CODE_ADD)
+	public AjaxJson add(HtImportDeclarePeople h){
+		htImportDeclarePeopleService.add(h);
+		h = htImportDeclarePeopleService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(HtImportDeclarePeople.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 htImportDeclarePeopleService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(HtImportDeclarePeople.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(HtImportDeclarePeople.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(HtImportDeclarePeople.PERMISSION_CODE_EDIT)
+	public AjaxJson update(HtImportDeclarePeople h){
+		htImportDeclarePeopleService.update(h);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(HtImportDeclarePeople.PERMISSION_CODE)
+	public AjaxJson getById(Integer id){
+		HtImportDeclarePeople h = htImportDeclarePeopleService.getById(id);
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(HtImportDeclarePeople.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<HtImportDeclarePeople> list = htImportDeclarePeopleService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	
+
+	
+	
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_import_declare_people/HtImportDeclarePeopleMapper.java

@@ -0,0 +1,30 @@
+package com.pj.ht_import_declare_people;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: ht_import_declare_people -- 进口申报单边民确认表
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface HtImportDeclarePeopleMapper extends BaseMapper <HtImportDeclarePeople> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<HtImportDeclarePeople> getList(SoMap so);
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_import_declare_people/HtImportDeclarePeopleMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pj.ht_import_declare_people.HtImportDeclarePeopleMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, idno, border_putrec_no, border_name, settle_bill_no, pre_ieport_no, buy_confirm_status, pay_status from ht_import_declare_people  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.ht_import_declare_people.HtImportDeclarePeople"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from ht_import_declare_people 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("idno") '> and idno = #{idno} </if>
+			<if test=' this.has("borderPutrecNo") '> and border_putrec_no = #{borderPutrecNo} </if>
+			<if test=' this.has("borderName") '> and border_name = #{borderName} </if>
+			<if test=' this.has("settleBillNo") '> and settle_bill_no = #{settleBillNo} </if>
+			<if test=' this.has("preIeportNo") '> and pre_ieport_no = #{preIeportNo} </if>
+			<if test=' this.has("buyConfirmStatus") '> and buy_confirm_status = #{buyConfirmStatus} </if>
+			<if test=' this.has("payStatus") '> and pay_status = #{payStatus} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> idno desc </when>
+			<when test='sortType == 3'> border_putrec_no desc </when>
+			<when test='sortType == 4'> border_name desc </when>
+			<when test='sortType == 5'> settle_bill_no desc </when>
+			<when test='sortType == 6'> pre_ieport_no desc </when>
+			<when test='sortType == 7'> buy_confirm_status desc </when>
+			<when test='sortType == 8'> pay_status desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/async-server/src/main/java/com/pj/ht_import_declare_people/HtImportDeclarePeopleService.java

@@ -0,0 +1,51 @@
+package com.pj.ht_import_declare_people;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: ht_import_declare_people -- 进口申报单边民确认表
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class HtImportDeclarePeopleService extends ServiceImpl<HtImportDeclarePeopleMapper, HtImportDeclarePeople> implements IService<HtImportDeclarePeople>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	HtImportDeclarePeopleMapper htImportDeclarePeopleMapper;
+
+	/** 增 */
+	void add(HtImportDeclarePeople h){
+		save(h);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(HtImportDeclarePeople h){
+		updateById(h);
+
+	}
+
+	/** 查 */
+	HtImportDeclarePeople getById(Integer id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<HtImportDeclarePeople> getList(SoMap so) { 
+		return htImportDeclarePeopleMapper.getList(so);	
+	}
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_pass_card_record/HtPassCardRecord.java

@@ -0,0 +1,118 @@
+package com.pj.ht_pass_card_record;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: ht_pass_card_record -- 过卡记录表
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(HtPassCardRecord.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class HtPassCardRecord extends Model<HtPassCardRecord> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "ht_pass_card_record";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "ht-pass-card-record";
+	public static final String PERMISSION_CODE_ADD = "ht-pass-card-record-add";
+	public static final String PERMISSION_CODE_EDIT = "ht-pass-card-record-edit";
+	public static final String PERMISSION_CODE_DEL = "ht-pass-card-record-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;	
+
+	/**
+	 * 场所代码 
+	 */
+	private String areaNo;	
+
+	/**
+	 * 进出口标志 I:进口，E：出口 
+	 */
+	private String iEFlag;	
+
+	/**
+	 * 场所名称 
+	 */
+	private String areaName;	
+
+	/**
+	 * 通道代码 
+	 */
+	private String channelNo;	
+
+	/**
+	 * 通道名称 
+	 */
+	private String channelName;	
+
+	/**
+	 * 车牌号码 
+	 */
+	private String veNo;	
+
+	/**
+	 * 地磅重量 
+	 */
+	private Double crossWeight;	
+
+	/**
+	 * 卡 口 类 型 （ 1卡;2 卡;3 卡） 
+	 */
+	private String channelType;	
+
+	/**
+	 * 验放结果 
+	 */
+	private String checkResult;	
+
+	/**
+	 * 运输批次号 
+	 */
+	private String manifestId;	
+
+	/**
+	 * 单证代码 
+	 */
+	private String billCode;	
+
+	/**
+	 * 处理放行时间 
+	 */
+	private String checkTime;
+
+
+	/**
+	 * 完成情况
+	 */
+	private Integer finishStatus;
+
+
+
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_pass_card_record/HtPassCardRecordController.java

@@ -0,0 +1,87 @@
+package com.pj.ht_pass_card_record;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+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;
+
+
+/**
+ * Controller: ht_pass_card_record -- 过卡记录表
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/HtPassCardRecord/")
+public class HtPassCardRecordController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	HtPassCardRecordService htPassCardRecordService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(HtPassCardRecord.PERMISSION_CODE_ADD)
+	public AjaxJson add(HtPassCardRecord h){
+		htPassCardRecordService.add(h);
+		h = htPassCardRecordService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(HtPassCardRecord.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 htPassCardRecordService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(HtPassCardRecord.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(HtPassCardRecord.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(HtPassCardRecord.PERMISSION_CODE_EDIT)
+	public AjaxJson update(HtPassCardRecord h){
+		htPassCardRecordService.update(h);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(HtPassCardRecord.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		HtPassCardRecord h = htPassCardRecordService.getById(id);
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(HtPassCardRecord.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<HtPassCardRecord> list = htPassCardRecordService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	
+
+	
+	
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_pass_card_record/HtPassCardRecordMapper.java

@@ -0,0 +1,30 @@
+package com.pj.ht_pass_card_record;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: ht_pass_card_record -- 过卡记录表
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface HtPassCardRecordMapper extends BaseMapper <HtPassCardRecord> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<HtPassCardRecord> getList(SoMap so);
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_pass_card_record/HtPassCardRecordMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pj.ht_pass_card_record.HtPassCardRecordMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, area_no, i_e_flag, area_name, channel_no, channel_name, ve_no, cross_weight, channel_type, check_result, manifest_id, bill_code, check_time from ht_pass_card_record  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.ht_pass_card_record.HtPassCardRecord"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from ht_pass_card_record 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("areaNo") '> and area_no = #{areaNo} </if>
+			<if test=' this.has("iEFlag") '> and i_e_flag = #{iEFlag} </if>
+			<if test=' this.has("areaName") '> and area_name = #{areaName} </if>
+			<if test=' this.has("channelNo") '> and channel_no = #{channelNo} </if>
+			<if test=' this.has("channelName") '> and channel_name = #{channelName} </if>
+			<if test=' this.has("veNo") '> and ve_no = #{veNo} </if>
+			<if test=' this.has("crossWeight") '> and cross_weight = #{crossWeight} </if>
+			<if test=' this.has("channelType") '> and channel_type = #{channelType} </if>
+			<if test=' this.has("checkResult") '> and check_result = #{checkResult} </if>
+			<if test=' this.has("manifestId") '> and manifest_id = #{manifestId} </if>
+			<if test=' this.has("billCode") '> and bill_code = #{billCode} </if>
+			<if test=' this.has("checkTime") '> and check_time = #{checkTime} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> area_no desc </when>
+			<when test='sortType == 3'> i_e_flag desc </when>
+			<when test='sortType == 4'> area_name desc </when>
+			<when test='sortType == 5'> channel_no desc </when>
+			<when test='sortType == 6'> channel_name desc </when>
+			<when test='sortType == 7'> ve_no desc </when>
+			<when test='sortType == 8'> cross_weight desc </when>
+			<when test='sortType == 9'> channel_type desc </when>
+			<when test='sortType == 10'> check_result desc </when>
+			<when test='sortType == 11'> manifest_id desc </when>
+			<when test='sortType == 12'> bill_code desc </when>
+			<when test='sortType == 13'> check_time desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/async-server/src/main/java/com/pj/ht_pass_card_record/HtPassCardRecordService.java

@@ -0,0 +1,51 @@
+package com.pj.ht_pass_card_record;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: ht_pass_card_record -- 过卡记录表
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class HtPassCardRecordService extends ServiceImpl<HtPassCardRecordMapper, HtPassCardRecord> implements IService<HtPassCardRecord>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	HtPassCardRecordMapper htPassCardRecordMapper;
+
+	/** 增 */
+	void add(HtPassCardRecord h){
+		save(h);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(HtPassCardRecord h){
+		updateById(h);
+
+	}
+
+	/** 查 */
+	HtPassCardRecord getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<HtPassCardRecord> getList(SoMap so) { 
+		return htPassCardRecordMapper.getList(so);	
+	}
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlement.java

@@ -0,0 +1,213 @@
+package com.pj.ht_trade_settlement;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: ht_trade_settlement -- 航通交易结算表
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(HtTradeSettlement.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class HtTradeSettlement extends Model<HtTradeSettlement> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "ht_trade_settlement";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "ht-trade-settlement";
+	public static final String PERMISSION_CODE_ADD = "ht-trade-settlement-add";
+	public static final String PERMISSION_CODE_EDIT = "ht-trade-settlement-edit";
+	public static final String PERMISSION_CODE_DEL = "ht-trade-settlement-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 预申报编号 
+	 */
+	@TableId(type = IdType.AUTO)
+	private String platSeqNo;	
+
+	/**
+	 * 申报单编号 
+	 */
+	private String declareId;	
+
+	/**
+	 * 1-边民，2-商铺业主或其代理人，3-合作社代表，4-互助组代表 
+	 */
+	private String declareType;	
+
+	/**
+	 * 申报人姓名 
+	 */
+	private String declareName;	
+
+	/**
+	 * 身份证号码 
+	 */
+	private String idno;	
+
+	/**
+	 * 商铺编码 
+	 */
+	private String shopNo;	
+
+	/**
+	 * 商铺名称 
+	 */
+	private String shopName;	
+
+	/**
+	 * 申报人类别为3、4 时互助组/合作社备案编号 
+	 */
+	private String orgPutrecNo;	
+
+	/**
+	 * 申报人类别为3、4 时互助组/合租社名称 
+	 */
+	private String orgName;	
+
+	/**
+	 * 申报人类别为4 时边民合作社社会统一信用代码 
+	 */
+	private String orgScc;	
+
+	/**
+	 *  运输工具名称 
+	 */
+	private String veNo;	
+
+	/**
+	 * 业务模式, 进出口标志为进口时，01 区内交易、02 落地加工、03 原装提离。进出口标 志 为 出 口时，04：直接出口，05：出口销售。 
+	 */
+	private String btrnbBizModecd;	
+
+	/**
+	 * 商品流向, 进出口标志为进口时，必填，01-二次销售；02-生活自用；03-落地加工； 
+	 */
+	private String gFlow;	
+
+	/**
+	 * 进出口标志：I进口 E 出口 
+	 */
+	private String iEFlag;	
+
+	/**
+	 * 监管场所编号 
+	 */
+	private String fieldCode;	
+
+	/**
+	 * 监管场所名称 
+	 */
+	private String fieldName;	
+
+	/**
+	 * 申报口岸代码 
+	 */
+	private String customsCode;	
+
+	/**
+	 * 1-是、0-否 
+	 */
+	private String carPool;	
+
+	/**
+	 * 总金额 
+	 */
+	private Double sumAmt;	
+
+	/**
+	 * 总毛重 
+	 */
+	private Double sumGrossWt;	
+
+	/**
+	 * 总净重 
+	 */
+	private Double sumNetWt;	
+
+	/**
+	 * 运输方式 
+	 */
+	private String trafMode;	
+
+	/**
+	 * 币制 
+	 */
+	private String currCode;	
+
+	/**
+	 * 件数，正整数 
+	 */
+	private Long packNo;	
+
+	/**
+	 * 申 报 时 间 ：yyyy-MM-dd HH:mm:ss 
+	 */
+	private String declTime;	
+
+	/**
+	 * 提运单号 
+	 */
+	private String billNo;	
+
+	/**
+	 * 运输工具航次(班)号 
+	 */
+	private String voyageNo;	
+
+	/**
+	 * 商品名称，多个用英文逗号分割 
+	 */
+	private String goodsNames;	
+
+	/**
+	 * 购买边民列表[     { "platSeqNo": "进出境申报单预申报编号",        "borderName": "边民姓名", "idno": "身份证号",        "borderPutrecNo": "边民备案编号",        "settleBillNo": "结算单号", "buyAmount": "申报金额", "netWt": "净重", "grossWt": "毛重",        "buyQty": "申报数量", "buyQty1": "第一数量",        "buyQty2": "第二数量", "preIeportNo": "进出口预申报单号"     }] 
+	 */
+	private String bordersList;	
+
+	/**
+	 * 边民购买商品列表[     { "platSeqNo": "进出境申报单预申报编号",        "borderName": "边民姓名",        "idno": "身份证号",           "borderPutrecNo": "边民备案编号",        "buyAmount": "申报金额",        "netWt": "净重",          "grossWt": "毛重",        "buyQty": "申报数量",        "buyQty1": "第一数量",        "buyQty2": "第二数量",        "preIeportNo": "进出口预申报单号",        "codeTs": "商品编码",        "goodsName": "商品名称"      }] 
+	 */
+	private String borderBuyGoodsList;	
+
+	/**
+	 * 商铺卖货物列表[       { "platSeqNo": "进出境申报单预申报编号",           "gNo": "预申报编号", "codeTs": "商品编码",           "gName": "商品名称", "gModel": "规格型号",           "storageEnvm": "储存条件：常温 1：冷藏，2：冷冻：3",            "useTo": "用途：01 食用、02 工业用、03 药用、04 种用、05 饲用、06 其他",           "grossWt": "毛重",            "netWt": "净重",            "originCountry": "产销国",            "gQty": "货物数量",            "qty1": "第一数量",            "qty2": "第二数量",            "gUnit": "计量单位",            "unit1": "第一计量单位",            "unit2": "第二计量单位",            "declPrice": "单价",            "declTotal": "总价"       }] 
+	 */
+	private String sellGoodsList;	
+
+	/**
+	 * 主键 
+	 */
+	private Long id;
+
+	/**
+	 * 完成情况
+	 */
+	private Integer finishStatus;
+
+
+
+
+
+
+}

sp-service/async-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementController.java

@@ -0,0 +1,87 @@
+package com.pj.ht_trade_settlement;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+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;
+
+
+/**
+ * Controller: ht_trade_settlement -- 航通交易结算表
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/HtTradeSettlement/")
+public class HtTradeSettlementController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	HtTradeSettlementService htTradeSettlementService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE_ADD)
+	public AjaxJson add(HtTradeSettlement h){
+		htTradeSettlementService.add(h);
+		h = htTradeSettlementService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 htTradeSettlementService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(HtTradeSettlement.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE_EDIT)
+	public AjaxJson update(HtTradeSettlement h){
+		htTradeSettlementService.update(h);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE)
+	public AjaxJson getById(String id){
+		HtTradeSettlement h = htTradeSettlementService.getById(id);
+		return AjaxJson.getSuccessData(h);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<HtTradeSettlement> list = htTradeSettlementService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	
+
+	
+	
+	
+
+}

sp-service/async-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementMapper.java

@@ -0,0 +1,30 @@
+package com.pj.ht_trade_settlement;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: ht_trade_settlement -- 航通交易结算表
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface HtTradeSettlementMapper extends BaseMapper <HtTradeSettlement> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<HtTradeSettlement> getList(SoMap so);
+
+
+}

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pj.ht_trade_settlement.HtTradeSettlementMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select plat_seq_no, declare_id, declare_type, declare_name, idno, shop_no, shop_name, org_putrec_no, org_name, org_scc, ve_no, btrnb_biz_modecd, g_flow, i_e_flag, field_code, field_name, customs_code, car_pool, sum_amt, sum_gross_wt, sum_net_wt, traf_mode, curr_code, pack_no, decl_time, bill_no, voyage_no, goods_names, borders_list, border_buy_goods_list, sell_goods_list, id from ht_trade_settlement  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.ht_trade_settlement.HtTradeSettlement"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from ht_trade_settlement 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("platSeqNo") '> and plat_seq_no = #{platSeqNo} </if>
+			<if test=' this.has("declareId") '> and declare_id = #{declareId} </if>
+			<if test=' this.has("declareType") '> and declare_type = #{declareType} </if>
+			<if test=' this.has("declareName") '> and declare_name = #{declareName} </if>
+			<if test=' this.has("idno") '> and idno = #{idno} </if>
+			<if test=' this.has("shopNo") '> and shop_no = #{shopNo} </if>
+			<if test=' this.has("shopName") '> and shop_name = #{shopName} </if>
+			<if test=' this.has("orgPutrecNo") '> and org_putrec_no = #{orgPutrecNo} </if>
+			<if test=' this.has("orgName") '> and org_name = #{orgName} </if>
+			<if test=' this.has("orgScc") '> and org_scc = #{orgScc} </if>
+			<if test=' this.has("veNo") '> and ve_no = #{veNo} </if>
+			<if test=' this.has("btrnbBizModecd") '> and btrnb_biz_modecd = #{btrnbBizModecd} </if>
+			<if test=' this.has("gFlow") '> and g_flow = #{gFlow} </if>
+			<if test=' this.has("iEFlag") '> and i_e_flag = #{iEFlag} </if>
+			<if test=' this.has("fieldCode") '> and field_code = #{fieldCode} </if>
+			<if test=' this.has("fieldName") '> and field_name = #{fieldName} </if>
+			<if test=' this.has("customsCode") '> and customs_code = #{customsCode} </if>
+			<if test=' this.has("carPool") '> and car_pool = #{carPool} </if>
+			<if test=' this.has("sumAmt") '> and sum_amt = #{sumAmt} </if>
+			<if test=' this.has("sumGrossWt") '> and sum_gross_wt = #{sumGrossWt} </if>
+			<if test=' this.has("sumNetWt") '> and sum_net_wt = #{sumNetWt} </if>
+			<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("billNo") '> and bill_no = #{billNo} </if>
+			<if test=' this.has("voyageNo") '> and voyage_no = #{voyageNo} </if>
+			<if test=' this.has("goodsNames") '> and goods_names = #{goodsNames} </if>
+			<if test=' this.has("bordersList") '> and borders_list = #{bordersList} </if>
+			<if test=' this.has("borderBuyGoodsList") '> and border_buy_goods_list = #{borderBuyGoodsList} </if>
+			<if test=' this.has("sellGoodsList") '> and sell_goods_list = #{sellGoodsList} </if>
+			<if test=' this.has("id") '> and id = #{id} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> plat_seq_no desc </when>
+			<when test='sortType == 2'> declare_id desc </when>
+			<when test='sortType == 3'> declare_type desc </when>
+			<when test='sortType == 4'> declare_name desc </when>
+			<when test='sortType == 5'> idno desc </when>
+			<when test='sortType == 6'> shop_no desc </when>
+			<when test='sortType == 7'> shop_name desc </when>
+			<when test='sortType == 8'> org_putrec_no desc </when>
+			<when test='sortType == 9'> org_name desc </when>
+			<when test='sortType == 10'> org_scc desc </when>
+			<when test='sortType == 11'> ve_no desc </when>
+			<when test='sortType == 12'> btrnb_biz_modecd desc </when>
+			<when test='sortType == 13'> g_flow desc </when>
+			<when test='sortType == 14'> i_e_flag desc </when>
+			<when test='sortType == 15'> field_code desc </when>
+			<when test='sortType == 16'> field_name desc </when>
+			<when test='sortType == 17'> customs_code desc </when>
+			<when test='sortType == 18'> car_pool desc </when>
+			<when test='sortType == 19'> sum_amt desc </when>
+			<when test='sortType == 20'> sum_gross_wt desc </when>
+			<when test='sortType == 21'> sum_net_wt desc </when>
+			<when test='sortType == 22'> traf_mode desc </when>
+			<when test='sortType == 23'> curr_code desc </when>
+			<when test='sortType == 24'> pack_no desc </when>
+			<when test='sortType == 25'> decl_time desc </when>
+			<when test='sortType == 26'> bill_no desc </when>
+			<when test='sortType == 27'> voyage_no desc </when>
+			<when test='sortType == 28'> goods_names desc </when>
+			<when test='sortType == 29'> borders_list desc </when>
+			<when test='sortType == 30'> border_buy_goods_list desc </when>
+			<when test='sortType == 31'> sell_goods_list desc </when>
+			<when test='sortType == 32'> id desc </when>
+			<otherwise> plat_seq_no desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

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

@@ -0,0 +1,51 @@
+package com.pj.ht_trade_settlement;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: ht_trade_settlement -- 航通交易结算表
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMapper, HtTradeSettlement> implements IService<HtTradeSettlement>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	HtTradeSettlementMapper htTradeSettlementMapper;
+
+	/** 增 */
+	void add(HtTradeSettlement h){
+		save(h);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(HtTradeSettlement h){
+		updateById(h);
+
+	}
+
+	/** 查 */
+	HtTradeSettlement getById(String platSeqNo){
+		return super.getById(platSeqNo);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<HtTradeSettlement> getList(SoMap so) { 
+		return htTradeSettlementMapper.getList(so);	
+	}
+	
+
+}

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

@@ -1,5 +1,6 @@
 package com.pj.task;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.async_server.AsyncServerInterface;
@@ -9,8 +10,16 @@ import com.pj.api.dto.*;
 import com.pj.dto.DataDto;
 import com.pj.enummj.DataType;
 import com.pj.enummj.FinishStatus;
+import com.pj.ht_borders_list.HtBordersList;
+import com.pj.ht_borders_list.HtBordersListMapper;
 import com.pj.ht_byte.HtByte;
 import com.pj.ht_byte.HtByteMapper;
+import com.pj.ht_import_declare_people.HtImportDeclarePeople;
+import com.pj.ht_import_declare_people.HtImportDeclarePeopleMapper;
+import com.pj.ht_pass_card_record.HtPassCardRecord;
+import com.pj.ht_pass_card_record.HtPassCardRecordMapper;
+import com.pj.ht_trade_settlement.HtTradeSettlement;
+import com.pj.ht_trade_settlement.HtTradeSettlementMapper;
 import com.pj.rabbitmq.RabbitMQ;
 import com.pj.utils.ht.AESUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +27,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 
@@ -49,6 +60,31 @@ public class HtByteTask {
      */
     @Autowired
     private TransportInterface transportInterface;
+    /**
+     * 交易结算信息
+     */
+    @Autowired
+    private HtImportDeclarePeopleMapper htImportDeclarePeopleMapper;
+    /**
+     * 放行记录（过卡记录）
+     */
+    @Autowired
+    private HtPassCardRecordMapper htPassCardRecordMapper;
+    /**
+     * 方法抽取
+     */
+    @Autowired
+    private MethodHtByteTask methodHtByteTask;
+    /**
+     * 交易结算信息
+     */
+    @Autowired
+    private HtTradeSettlementMapper htTradeSettlementMapper;
+    /**
+     * 边民购买记录
+     */
+    @Autowired
+    private HtBordersListMapper htBordersListMapper;
 
     /**
      * 启动定时任务
@@ -58,9 +94,9 @@ public class HtByteTask {
      *      * 002=商铺备案
      *      * 003=边民互助组备案
      *      * 004=边民合作社备案
-     *      * 005=车辆
-     *      * 006=进境申报单
-     *      * 007=进口申报单
+     *      * 005=商品基础信息
+     *      * 006=交易结算信息
+     *      * 007=放行记录（过卡记录）
      */
     @Scheduled(cron = "*/9 * * * * ?")  // 测试阶段,每9秒扫描一次
     private void htByteTask(){
@@ -71,7 +107,10 @@ public class HtByteTask {
         //扫描表内是否有待处理任务
         List<HtByte> byteList = htByteMapper.selectList(new LambdaQueryWrapper<HtByte>().eq(HtByte::getFinishStatus, FinishStatus.FINISH_STATUS_ZERO.getCode()));
         //判断是否有任务,没有则返回
-        if(byteList.size() == 0)System.out.println("\n  ---  暂无待处理任务。\n");
+        if(byteList.size() == 0){
+            System.out.println("\n  ---  暂无待处理任务。" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n");
+            return;
+        }
         //执行任务处理流程
         byteList.forEach(item -> {
             //对象转换
@@ -175,37 +214,60 @@ public class HtByteTask {
                     System.out.println("\n边民合作社信息处理完成。 messageId = " + item.getMessageId() + "\n");
                     break;
                 case "005":
-                    //车辆
-                    VehicleDto vehicleDto = JSONObject.parseObject(body, VehicleDto.class);
+                    //商品基础信息
+                    GoodsDto goodsDto = JSONObject.parseObject(body, GoodsDto.class);
                     //保存
-                     flag = transportInterface.vehicleDto(vehicleDto);
-                     if(!flag){
-                         //将完成状态设置成 2 , 表示处理失败
-                         item.setFinishStatus(FinishStatus.FINISH_STATUS_TWO.getCode());
-                         item.setMessageId(dataDto.getMsgId());
-                         item.setDataType(dataDto.getDataType());
-                         //保存
-                         htByteMapper.updateById(item);
-                         System.out.println("\n车辆信息处理失败。 messageId = " + item.getMessageId() + "\n");
-                         //todo: 发送失败信息给管理员
+                    flag = levelOneServerInterface.goodsDto(goodsDto);
+                    if(!flag){
+                        //将完成状态设置成 2 , 表示处理失败
+                        item.setFinishStatus(FinishStatus.FINISH_STATUS_TWO.getCode());
+                        item.setMessageId(dataDto.getMsgId());
+                        item.setDataType(dataDto.getDataType());
+                        //保存
+                        htByteMapper.updateById(item);
+                        System.out.println("\n海关监管商品信息处理失败。 messageId = " + item.getMessageId() + "\n");
+                        //todo: 发送失败信息给管理员
 
-                         break;
-                     }
+                        break;
+                    }
                     item.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode());
                     item.setMessageId(dataDto.getMsgId());
                     item.setDataType(dataDto.getDataType());
                     htByteMapper.updateById(item);
-                    System.out.println("\n车辆信息处理完成。 messageId = " + item.getMessageId() + "\n");
-
+                    System.out.println("\n海关监管商品信息处理完成。 messageId = " + item.getMessageId() + "\n");
                     break;
                 case "006":
-                    //进境申报单
-
-
+                    //交易结算信息
+                    HtTradeSettlement importDeclarePeople = JSONObject.parseObject(body, HtTradeSettlement.class);
+                    importDeclarePeople.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode()); // 默认待处理
+                    //保存
+                    int insert = htTradeSettlementMapper.insert(importDeclarePeople);
+                    if(insert == 1){
+                        List<HtBordersList> bordersLists = JSON.parseArray(importDeclarePeople.getBordersList(), HtBordersList.class);
+                        //创建预申报单号
+                        String platSeqNo = null;
+                        //保存
+                        if(bordersLists.size() > 0){
+                            for(HtBordersList t: bordersLists){
+                                platSeqNo = t.getPlatSeqNo();
+                                t.setCreateTime(new Date());
+                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
+                                htBordersListMapper.insert(t);
+                            }
+                        /**
+                         * 接收订单推送消息，边民进行交易确认，支付申请，刷脸认证，系统发起进行交易
+                         */
+                            List<HtBordersList> htBordersLists = htBordersListMapper.selectList(new LambdaQueryWrapper<HtBordersList>().eq(HtBordersList::getPlatSeqNo, platSeqNo));
+                            methodHtByteTask.sendMessageToPeople(htBordersLists);
+                        }
+                    }
                     break;
                 case "007":
-                    //进口申报单
-
+                    //放行记录（过卡记录）
+                    HtPassCardRecord htPassCardRecord = JSONObject.parseObject(body, HtPassCardRecord.class);
+                    htPassCardRecord.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode()); // 默认待处理
+                    //保存
+                    htPassCardRecordMapper.insert(htPassCardRecord);
                     break;
             }
         });

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

@@ -0,0 +1,70 @@
+package com.pj.task;
+
+import com.pj.api.dto.AppUserDto;
+import com.pj.api.dto.MessageDto;
+import com.pj.enummj.FinishStatus;
+import com.pj.ht_borders_list.HtBordersList;
+import com.pj.ht_borders_list.HtBordersListMapper;
+import com.pj.project4sp.SP;
+import com.pj.retry.SmsRetryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+import static com.pj.api.consts.FeignFactory.adminInterface;
+import static com.pj.api.consts.FeignFactory.levelOneServerInterface;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 31 15 59
+ **/
+@Service
+public class MethodHtByteTask {
+
+    @Autowired
+    private SmsRetryService smsRetryService;
+    @Autowired
+    private HtBordersListMapper htBordersListMapper;
+
+    /**
+     *  接收订单推送消息，边民进行交易确认，支付申请，刷脸认证，系统发起进行交易
+     * @param bordersLists
+     */
+    public void sendMessageToPeople(List<HtBordersList> bordersLists){
+        if(bordersLists.size() == 0)return;
+        //遍历
+        bordersLists.forEach(item -> {
+            try {
+                //获取边民appUser
+                AppUserDto appUser = levelOneServerInterface.getAppUserByBorderPutrecNo(item.getBorderPutrecNo());
+                //todo: 1. 发送系统message
+                MessageDto dto = new MessageDto();
+                dto.setUrl("/pages/market/one/merchant/order/list");
+                dto.setUserId(appUser.getId());
+                dto.setContents("你有一笔新订单,请前往app内进行查看。");
+                //执行message发送
+                adminInterface.messageSave(dto);
+                //todo: 2. 发送短信???
+//                smsRetryService.sendSmsRegisteMsg(appUser.getPhone(),"你有一笔新订单,请前往app内进行查看。");
+
+                //todo: 3. 调用刷脸组件
+
+                //todo: 4. 在第3步刷脸通过后获取其返回值,判断其是否刷脸通过调用支付申请
+
+                //todo: 5. 获取刷脸结果,修改完成状态
+
+                item.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode());
+                item.setCreateTime(new Date());
+                htBordersListMapper.updateById(item);
+            } catch (Exception e) {
+                item.setFinishStatus(FinishStatus.FINISH_STATUS_TWO.getCode());
+                htBordersListMapper.updateById(item);
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods/MethodGoodsService.java

@@ -1,6 +1,5 @@
 package com.pj.tb_goods;
 
-import com.pj.tb_enterprise.TbEnterprise;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -47,7 +46,7 @@ public class MethodGoodsService {
             TbGoods tbGoods = new TbGoods();
             //解析数据
             if(row.getCell(1) != null)
-                tbGoods.setName(row.getCell(1).getStringCellValue());
+                tbGoods.setGName(row.getCell(1).getStringCellValue());
             if(row.getCell(2) != null)
                 tbGoods.setAvatar(row.getCell(2).getStringCellValue());
             if(row.getCell(3) != null)
@@ -55,7 +54,7 @@ public class MethodGoodsService {
             if(row.getCell(4) != null)
                 tbGoods.setTypeNames(row.getCell(4).getStringCellValue());
             if(row.getCell(5) != null)
-                tbGoods.setCode(row.getCell(5).getStringCellValue());
+                tbGoods.setHsCode(row.getCell(5).getStringCellValue());
             if(row.getCell(6) != null)
                 tbGoods.setRemark(row.getCell(6).getStringCellValue());
             if(row.getCell(7) != null)
@@ -66,7 +65,7 @@ public class MethodGoodsService {
                 tbGoods.setStatus((int)row.getCell(9).getNumericCellValue());
 
             if(row.getCell(9) != null)
-                tbGoods.setUnit(row.getCell(9).getStringCellValue());
+                tbGoods.setGUnit(row.getCell(9).getStringCellValue());
 
             HSSFCell cell11 = row.createCell(10);
             if (cell11 != null && (cell11.getCellType() == CellType.NUMERIC || cell11.getCellType() == CellType.FORMULA))

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoods.java

@@ -54,7 +54,7 @@ public class TbGoods extends Model<TbGoods> implements Serializable {
 	/**
 	 * 名称 
 	 */
-	private String name;	
+	private String gName;
 
 	/**
 	 * 主图 
@@ -74,7 +74,7 @@ public class TbGoods extends Model<TbGoods> implements Serializable {
 	/**
 	 * 编号 
 	 */
-	private String code;	
+	private String hsCode;
 
 	/**
 	 * 备注 
@@ -96,7 +96,7 @@ public class TbGoods extends Model<TbGoods> implements Serializable {
 	/**
 	 *  
 	 */
-	private String unit;	
+	private String gUnit;
 
 	/**
 	 *  
@@ -146,6 +146,22 @@ public class TbGoods extends Model<TbGoods> implements Serializable {
 	 */
 	private Integer deleteStatus;
 
+	/**
+	 * 第一计量单位
+	 */
+	private String unit1;
+	/**
+	 * 第二计量单位
+	 */
+	private String unit2;
+	/**
+	 * 用途
+	 */
+	private String useTo;
+	/**
+	 * 存储条件
+	 */
+	private String storageEnvm;
 
 
 

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsController.java

@@ -132,7 +132,12 @@ public class TbGoodsController {
 		return t;
 	}
 
-
+	/** 远程调用: 同步航通海关监管商品信息 */
+	@RequestMapping("rpc/goodsDto")
+	public boolean goodsDto(@RequestBody GoodsDto goodsDto){
+		boolean b = tbGoodsService.goodsDto(goodsDto);
+		return b;
+	}
 
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsService.java

@@ -4,10 +4,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.dto.GoodsDto;
+import com.pj.enummj.DeleteStatus;
+import com.pj.enummj.Status;
 import com.pj.tb_enterprise.TbEnterprise;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -72,6 +77,30 @@ public class TbGoodsService extends ServiceImpl<TbGoodsMapper, TbGoods> implemen
 		return tbGoodsMapper.getByTradeArea(so);
 	}
 
+
+	/** 远程调用: 同步航通海关监管商品信息 */
+	public boolean goodsDto(GoodsDto goodsDto){
+		TbGoods tbGoods = new TbGoods();
+		List<TbGoods> tbGoodsList = tbGoodsMapper.selectList(new LambdaQueryWrapper<TbGoods>().eq(TbGoods::getHsCode, goodsDto.getHsCode()));
+		//数据库没有就是新增
+		if(tbGoodsList.size() == 0){
+			BeanUtils.copyProperties(goodsDto,tbGoods);
+			//设计基本信息
+			tbGoods.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认未删除
+			tbGoods.setStatus(Status.STATUS_ONE.getCode()); // 默认可用
+			tbGoods.setCreateTime(new Date());
+			tbGoods.setCreateName("航通");
+			int insert = tbGoodsMapper.insert(tbGoods);
+			return insert == 1;
+		}
+		//修改
+		TbGoods goods = tbGoodsList.stream().sorted(Comparator.comparing(TbGoods::getId).reversed()).collect(Collectors.toList()).get(0);
+		BeanUtils.copyProperties(goods,tbGoods);
+		BeanUtils.copyProperties(goodsDto,tbGoods);
+		int i = tbGoodsMapper.updateById(tbGoods);
+		return i == 1;
+	}
+
 	/**
 	 * 导入
 	 * @param file excel文件
@@ -113,7 +142,7 @@ public class TbGoodsService extends ServiceImpl<TbGoodsMapper, TbGoods> implemen
 		}
 		filepath = filepath + "\\商品数据表_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx";
 		//根据需求查询数据
-		List<TbGoods> selectedList = tbGoodsMapper.selectList(new LambdaQueryWrapper<TbGoods>().eq(StringUtils.isNoneBlank(keyword), TbGoods::getName, keyword));
+		List<TbGoods> selectedList = tbGoodsMapper.selectList(new LambdaQueryWrapper<TbGoods>().eq(StringUtils.isNoneBlank(keyword), TbGoods::getGName, keyword));
 		if(selectedList.size() == 0)return "没有可导出的数据。";
 		//建立excel对象封装数据
 		HSSFWorkbook workbook = new HSSFWorkbook();
@@ -147,15 +176,15 @@ public class TbGoodsService extends ServiceImpl<TbGoodsMapper, TbGoods> implemen
 		for (int i = 0; i < selectedList.size(); i++) {
 			HSSFRow sheetRow = sheet.createRow(sheet.getLastRowNum() + 1);
 			sheetRow.createCell(0).setCellValue(i + 1);
-			sheetRow.createCell(1).setCellValue((selectedList.get(i).getName() + "").equals("null")? "": selectedList.get(i).getName() + "");
+			sheetRow.createCell(1).setCellValue((selectedList.get(i).getGName() + "").equals("null")? "": selectedList.get(i).getGName() + "");
 			sheetRow.createCell(2).setCellValue((selectedList.get(i).getAvatar() + "").equals("null")? "": selectedList.get(i).getAvatar() + "");
 			sheetRow.createCell(3).setCellValue((selectedList.get(i).getTypeIds() + "").equals("null")? "": selectedList.get(i).getTypeIds() + "");
 			sheetRow.createCell(4).setCellValue((selectedList.get(i).getTypeNames() + "").equals("null")? "": selectedList.get(i).getTypeNames() + "");
-			sheetRow.createCell(5).setCellValue((selectedList.get(i).getCode() + "").equals("null")? "": selectedList.get(i).getCode() + "");
+			sheetRow.createCell(5).setCellValue((selectedList.get(i).getHsCode() + "").equals("null")? "": selectedList.get(i).getHsCode() + "");
 			sheetRow.createCell(6).setCellValue((selectedList.get(i).getRemark() + "").equals("null")? "": selectedList.get(i).getRemark() + "");
 			sheetRow.createCell(7).setCellValue((selectedList.get(i).getSource() + "").equals("null")? "": selectedList.get(i).getSource() + "");
 			sheetRow.createCell(8).setCellValue((selectedList.get(i).getStatus() + "" ).equals("null")? "": selectedList.get(i).getStatus() + "");
-			sheetRow.createCell(9).setCellValue((selectedList.get(i).getUnit() + "").equals("null")? "": selectedList.get(i).getUnit() + "");
+			sheetRow.createCell(9).setCellValue((selectedList.get(i).getGUnit() + "").equals("null")? "": selectedList.get(i).getGUnit() + "");
 			sheetRow.createCell(10).setCellValue((selectedList.get(i).getSinglePrice() + "").equals("null")? "": selectedList.get(i).getSinglePrice() + "");
 			sheetRow.createCell(11).setCellValue((selectedList.get(i).getTaxNo() + "").equals("null")? "": selectedList.get(i).getTaxNo() + "");
 			sheetRow.createCell(22).setCellValue((selectedList.get(i).getCreateTime() + "").equals("null")? "": selectedList.get(i).getCreateTime() + "");

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -214,10 +214,10 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		BeanUtils.copyProperties(transactionGoodsParam,tbGoodsTransit);
 		//获取并保存当前商品基本信息
 		tbGoodsTransit.setTradeAreaName(tbTradeArea.getName());  // 交易地区(互市区)
-		tbGoodsTransit.setGoodsName(tbGoods.getName());  // 商品名称
+		tbGoodsTransit.setGoodsName(tbGoods.getGName());  // 商品名称
 		tbGoodsTransit.setDescription(tbGoods.getRemark());  // 商品描述
 		tbGoodsTransit.setPlaceOrigin(tbGoods.getSource()); // 商品产地
-		tbGoodsTransit.setGoodsUnits(tbGoods.getUnit());  // 商品单位
+		tbGoodsTransit.setGoodsUnits(tbGoods.getGUnit());  // 商品单位
 		tbGoodsTransit.setGoodsType(tbGoods.getTypeNames()); // 商品类型名称
 		tbGoodsTransit.setGoodsImg(tbGoods.getAvatar());  // 商品图片
 		tbGoodsTransit.setGoodsId(tbGoods.getId());//保存监管商品表id

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

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.PeopleDto;
 import com.pj.tb_people.dto.LeaveGroupDto;
 import com.pj.tb_people.dto.StartStopDto;
@@ -285,5 +286,10 @@ public class TbPeopleController {
         return list;
     }
 
-
+    /** 根据航通主键查询appUser */
+    @RequestMapping("rpc/getAppUserByBorderPutrecNo")
+    public AppUserDto getAppUserByPlatSeqNo(@RequestParam("borderPutrecNo") String borderPutrecNo){
+        AppUserDto appUserByPlatSeqNo = tbPeopleService.getAppUserByBorderPutrecNo(borderPutrecNo);
+        return appUserByPlatSeqNo;
+    }
 }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.PeopleDto;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.PCLoginUserInfo;
@@ -533,7 +534,11 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		tbPeople.setStatus(Status.STATUS_ONE.getCode());  // 可用状态
 		tbPeople.setIsLock(IsLock.IS_LOCK_ON.getCode());  // 为被锁定状态
 		tbPeople.setJudgeStatus(JudgeStatus.JUDGE_STATUS_ONE.getCode()); // 默认审核通过
-		List<TbPeople> peopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getPlatSeqNo, peopleDto.getPlatSeqNo()));
+		/**备案编号，如果为
+		 新增备案，传空值；
+		 如果为变更备案，
+		 必须传值；*/
+		List<TbPeople> peopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getPutrecNo, peopleDto.getPutrecNo()));
 		if(peopleList.size() == 0){
 			//新增
 			boolean save = this.save(tbPeople);
@@ -592,4 +597,18 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 				.eq(role!=null&&role>0,TbPeople::getRole,role);
 		return list(ew);
 	}
+
+	/** 根据航通边民备案编号 */
+	public AppUserDto getAppUserByBorderPutrecNo(String borderPutrecNo){
+		//todo: 此接口为航通间接调用,当我们手动禁用appUser或people时能进行获取使用?  查询条件当前仅使用航通主键
+		List<TbPeople> peopleList = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getPutrecNo, borderPutrecNo));
+		if(peopleList.size() == 1){
+			AppUserDto appUserById = adminInterface.getAppUserById(peopleList.get(0).getId());
+			//返回
+			return appUserById;
+		}
+		//返回
+		return null;
+	}
+
 }

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

@@ -527,4 +527,5 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		throw new RuntimeException("同步航通信息时,边民注册app信息失败,边民手机号为: " + enterpriseDto.getOwnerTel() + "。 时间: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 	}
 
+
 }