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

@@ -22,6 +22,11 @@ import java.util.List;
 )
 public interface LevelOneServerInterface {
 
+
+    /** 远程调用: 添加大订单时同事生成小定单 */
+    @RequestMapping("/HtTradeSettlement/rpc/tradeSettlementDto")
+    public boolean tradeSettlementDto(@RequestBody TradeSettlementDto tradeSettlementDto);
+
     /** 远程调用: 对合作社信息进行事务处理 */
     @RequestMapping("/TbCooperative/rpc/cooperativeDto")
     public boolean cooperativeDto(@RequestBody CooperativeDto cooperativeDto);

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

@@ -24,6 +24,12 @@ public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOne
     public LevelOneServerInterface create(Throwable throwable) {
         return new LevelOneServerInterface() {
             @Override
+            public boolean tradeSettlementDto(TradeSettlementDto tradeSettlementDto) {
+                log.error("接收航通订单表信息时,生成大订单和小定单时错误,当前对象:{},错误信息是:{}",tradeSettlementDto.toString(),throwable.getMessage());
+                return false;
+            }
+
+            @Override
             public boolean cooperativeDto(CooperativeDto cooperativeDto) {
                 log.error("查询一级市场商户错误,当前对象:{},错误信息是:{}",cooperativeDto.toString(),throwable.getMessage());
                 return false;

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

@@ -0,0 +1,208 @@
+package com.pj.api.dto;
+
+import java.util.Date;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 19 08
+ **/
+public class BorderBuyGoodsListDto {
+    private Long id;
+
+    /**
+     * 预申报编号(航通主键)
+     */
+    private String platSeqNo;
+
+    /**
+     * 身份证号
+     */
+    private String idno;
+
+    /**
+     * 购买金额
+     */
+    private Double buyAmount;
+
+    /**
+     * 净重
+     */
+    private Double netWt;
+
+    /**
+     * 毛重
+     */
+    private Double grossWt;
+
+    /**
+     * 购买数量
+     */
+    private Double buyQty;
+
+    /**
+     * 第一数量
+     */
+    private Double buyQty1;
+
+    /**
+     * 第二数量
+     */
+    private Double buyQty2;
+
+    /**
+     * 商品编码
+     */
+    private String codeTs;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 边民备案号
+     */
+    private String borderPutrecNo;
+
+    /**
+     * 完成状态
+     */
+    private Integer finishStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getIdno() {
+        return idno;
+    }
+
+    public void setIdno(String idno) {
+        this.idno = idno;
+    }
+
+    public Double getBuyAmount() {
+        return buyAmount;
+    }
+
+    public void setBuyAmount(Double buyAmount) {
+        this.buyAmount = buyAmount;
+    }
+
+    public Double getNetWt() {
+        return netWt;
+    }
+
+    public void setNetWt(Double netWt) {
+        this.netWt = netWt;
+    }
+
+    public Double getGrossWt() {
+        return grossWt;
+    }
+
+    public void setGrossWt(Double grossWt) {
+        this.grossWt = grossWt;
+    }
+
+    public Double getBuyQty() {
+        return buyQty;
+    }
+
+    public void setBuyQty(Double buyQty) {
+        this.buyQty = buyQty;
+    }
+
+    public Double getBuyQty1() {
+        return buyQty1;
+    }
+
+    public void setBuyQty1(Double buyQty1) {
+        this.buyQty1 = buyQty1;
+    }
+
+    public Double getBuyQty2() {
+        return buyQty2;
+    }
+
+    public void setBuyQty2(Double buyQty2) {
+        this.buyQty2 = buyQty2;
+    }
+
+    public String getCodeTs() {
+        return codeTs;
+    }
+
+    public void setCodeTs(String codeTs) {
+        this.codeTs = codeTs;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getBorderPutrecNo() {
+        return borderPutrecNo;
+    }
+
+    public void setBorderPutrecNo(String borderPutrecNo) {
+        this.borderPutrecNo = borderPutrecNo;
+    }
+
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public BorderBuyGoodsListDto(Long id, String platSeqNo, String idno, Double buyAmount, Double netWt, Double grossWt, Double buyQty, Double buyQty1, Double buyQty2, String codeTs, String goodsName, String borderPutrecNo, Integer finishStatus, Date createTime) {
+        this.id = id;
+        this.platSeqNo = platSeqNo;
+        this.idno = idno;
+        this.buyAmount = buyAmount;
+        this.netWt = netWt;
+        this.grossWt = grossWt;
+        this.buyQty = buyQty;
+        this.buyQty1 = buyQty1;
+        this.buyQty2 = buyQty2;
+        this.codeTs = codeTs;
+        this.goodsName = goodsName;
+        this.borderPutrecNo = borderPutrecNo;
+        this.finishStatus = finishStatus;
+        this.createTime = createTime;
+    }
+
+    public BorderBuyGoodsListDto() {
+    }
+}

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

@@ -0,0 +1,251 @@
+package com.pj.api.dto;
+
+import java.util.Date;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 19 09
+ **/
+public class BordersListDto {
+    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;
+
+    private String preNo;
+
+    public String getPreNo() {
+        return preNo;
+    }
+
+    public void setPreNo(String preNo) {
+        this.preNo = preNo;
+    }
+
+    public BordersListDto(Long id, String platSeqNo, String borderName, String idno, String borderPutrecNo, String settleBillNo, Double buyAmount, Double netWt, Double grossWt, Double buyQty, Double buyQty1, Double buyQty2, String preIeportNo, Date createTime, Integer finishStatus, String preNo) {
+        this.id = id;
+        this.platSeqNo = platSeqNo;
+        this.borderName = borderName;
+        this.idno = idno;
+        this.borderPutrecNo = borderPutrecNo;
+        this.settleBillNo = settleBillNo;
+        this.buyAmount = buyAmount;
+        this.netWt = netWt;
+        this.grossWt = grossWt;
+        this.buyQty = buyQty;
+        this.buyQty1 = buyQty1;
+        this.buyQty2 = buyQty2;
+        this.preIeportNo = preIeportNo;
+        this.createTime = createTime;
+        this.finishStatus = finishStatus;
+        this.preNo = preNo;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getBorderName() {
+        return borderName;
+    }
+
+    public void setBorderName(String borderName) {
+        this.borderName = borderName;
+    }
+
+    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 getSettleBillNo() {
+        return settleBillNo;
+    }
+
+    public void setSettleBillNo(String settleBillNo) {
+        this.settleBillNo = settleBillNo;
+    }
+
+    public Double getBuyAmount() {
+        return buyAmount;
+    }
+
+    public void setBuyAmount(Double buyAmount) {
+        this.buyAmount = buyAmount;
+    }
+
+    public Double getNetWt() {
+        return netWt;
+    }
+
+    public void setNetWt(Double netWt) {
+        this.netWt = netWt;
+    }
+
+    public Double getGrossWt() {
+        return grossWt;
+    }
+
+    public void setGrossWt(Double grossWt) {
+        this.grossWt = grossWt;
+    }
+
+    public Double getBuyQty() {
+        return buyQty;
+    }
+
+    public void setBuyQty(Double buyQty) {
+        this.buyQty = buyQty;
+    }
+
+    public Double getBuyQty1() {
+        return buyQty1;
+    }
+
+    public void setBuyQty1(Double buyQty1) {
+        this.buyQty1 = buyQty1;
+    }
+
+    public Double getBuyQty2() {
+        return buyQty2;
+    }
+
+    public void setBuyQty2(Double buyQty2) {
+        this.buyQty2 = buyQty2;
+    }
+
+    public String getPreIeportNo() {
+        return preIeportNo;
+    }
+
+    public void setPreIeportNo(String preIeportNo) {
+        this.preIeportNo = preIeportNo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public BordersListDto(Long id, String platSeqNo, String borderName, String idno, String borderPutrecNo, String settleBillNo, Double buyAmount, Double netWt, Double grossWt, Double buyQty, Double buyQty1, Double buyQty2, String preIeportNo, Date createTime, Integer finishStatus) {
+        this.id = id;
+        this.platSeqNo = platSeqNo;
+        this.borderName = borderName;
+        this.idno = idno;
+        this.borderPutrecNo = borderPutrecNo;
+        this.settleBillNo = settleBillNo;
+        this.buyAmount = buyAmount;
+        this.netWt = netWt;
+        this.grossWt = grossWt;
+        this.buyQty = buyQty;
+        this.buyQty1 = buyQty1;
+        this.buyQty2 = buyQty2;
+        this.preIeportNo = preIeportNo;
+        this.createTime = createTime;
+        this.finishStatus = finishStatus;
+    }
+
+    public BordersListDto() {
+    }
+}

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

@@ -0,0 +1,1006 @@
+package com.pj.api.dto;
+
+import java.util.Date;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 19 50
+ **/
+public class CollageOrdersDto {
+    private Long id;
+
+    /**
+     * 贸易区域id
+     */
+    private Long tradeAreaId;
+
+    /**
+     * 贸易区域名称
+     */
+    private String tradeAreaName;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 合作社ID
+     */
+    private String cooperativeId;
+
+    /**
+     * 合作社名称
+     */
+    private String cooperativeName;
+
+    /**
+     * 总金额
+     */
+    private Double totalPrice;
+
+    /**
+     * 进境边民确认
+     */
+    private String entryPeopleStatus;
+
+    /**
+     * 进境组长确认
+     */
+    private String entryLeaderStatus;
+
+    /**
+     * 进境报关企业确认
+     */
+    private String entryCustomsStatus;
+
+    /**
+     * 进境申报单号
+     */
+    private String entryNo;
+
+    /**
+     * 进境申报时间
+     */
+    private Date entryTime;
+
+    /**
+     * 进境申报结果
+     */
+    private String entryResult;
+
+    /**
+     * 进境申报失败理由
+     */
+    private String entryFailReason;
+
+    /**
+     * 订单边民确认
+     */
+    private String peopleConfirmStatus;
+
+    /**
+     * 订单边民确认时间
+     */
+    private Date peopleConfirmTime;
+
+    /**
+     * 进口组长确认时间
+     */
+    private Date importLeaderTime;
+
+    /**
+     * 进口边民确认时间
+     */
+    private Date importPeopleTime;
+
+    /**
+     * 进口组长确认
+     */
+    private String importLeaderStatus;
+
+    /**
+     * 进口边民确认
+     */
+    private String importPeopleStatus;
+
+    /**
+     * 进口申报单号
+     */
+    private String importNo;
+
+    /**
+     * 进口申报时间
+     */
+    private Date importTime;
+
+    /**
+     * 是否收货
+     */
+    private String isDelivery;
+
+    /**
+     * 订单完成状态(0=未完成,1=已完成)
+     */
+    private String orderFinish;
+
+    /**
+     * 司机ID
+     */
+    private Long driverId;
+
+    /**
+     * 司机名称
+     */
+    private String driverName;
+
+    /**
+     * 司机电话
+     */
+    private String driverPhone;
+
+    /**
+     * 车ID
+     */
+    private Long carId;
+
+    /**
+     * 车名称
+     */
+    private String carType;
+
+    /**
+     * 车牌号
+     */
+    private String vehiclePlate;
+
+    /**
+     * 装货地址
+     */
+    private String loadingAddress;
+
+    /**
+     * 卸货地址
+     */
+    private String unloadingAddress;
+
+    /**
+     * 创建人编号
+     */
+    private Long createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人编号
+     */
+    private Long updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+    /**
+     * 预申报编号
+     */
+    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 Date 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 Integer finishStatus;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTradeAreaId() {
+        return tradeAreaId;
+    }
+
+    public void setTradeAreaId(Long tradeAreaId) {
+        this.tradeAreaId = tradeAreaId;
+    }
+
+    public String getTradeAreaName() {
+        return tradeAreaName;
+    }
+
+    public void setTradeAreaName(String tradeAreaName) {
+        this.tradeAreaName = tradeAreaName;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getCooperativeId() {
+        return cooperativeId;
+    }
+
+    public void setCooperativeId(String cooperativeId) {
+        this.cooperativeId = cooperativeId;
+    }
+
+    public String getCooperativeName() {
+        return cooperativeName;
+    }
+
+    public void setCooperativeName(String cooperativeName) {
+        this.cooperativeName = cooperativeName;
+    }
+
+    public Double getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(Double totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public String getEntryPeopleStatus() {
+        return entryPeopleStatus;
+    }
+
+    public void setEntryPeopleStatus(String entryPeopleStatus) {
+        this.entryPeopleStatus = entryPeopleStatus;
+    }
+
+    public String getEntryLeaderStatus() {
+        return entryLeaderStatus;
+    }
+
+    public void setEntryLeaderStatus(String entryLeaderStatus) {
+        this.entryLeaderStatus = entryLeaderStatus;
+    }
+
+    public String getEntryCustomsStatus() {
+        return entryCustomsStatus;
+    }
+
+    public void setEntryCustomsStatus(String entryCustomsStatus) {
+        this.entryCustomsStatus = entryCustomsStatus;
+    }
+
+    public String getEntryNo() {
+        return entryNo;
+    }
+
+    public void setEntryNo(String entryNo) {
+        this.entryNo = entryNo;
+    }
+
+    public Date getEntryTime() {
+        return entryTime;
+    }
+
+    public void setEntryTime(Date entryTime) {
+        this.entryTime = entryTime;
+    }
+
+    public String getEntryResult() {
+        return entryResult;
+    }
+
+    public void setEntryResult(String entryResult) {
+        this.entryResult = entryResult;
+    }
+
+    public String getEntryFailReason() {
+        return entryFailReason;
+    }
+
+    public void setEntryFailReason(String entryFailReason) {
+        this.entryFailReason = entryFailReason;
+    }
+
+    public String getPeopleConfirmStatus() {
+        return peopleConfirmStatus;
+    }
+
+    public void setPeopleConfirmStatus(String peopleConfirmStatus) {
+        this.peopleConfirmStatus = peopleConfirmStatus;
+    }
+
+    public Date getPeopleConfirmTime() {
+        return peopleConfirmTime;
+    }
+
+    public void setPeopleConfirmTime(Date peopleConfirmTime) {
+        this.peopleConfirmTime = peopleConfirmTime;
+    }
+
+    public Date getImportLeaderTime() {
+        return importLeaderTime;
+    }
+
+    public void setImportLeaderTime(Date importLeaderTime) {
+        this.importLeaderTime = importLeaderTime;
+    }
+
+    public Date getImportPeopleTime() {
+        return importPeopleTime;
+    }
+
+    public void setImportPeopleTime(Date importPeopleTime) {
+        this.importPeopleTime = importPeopleTime;
+    }
+
+    public String getImportLeaderStatus() {
+        return importLeaderStatus;
+    }
+
+    public void setImportLeaderStatus(String importLeaderStatus) {
+        this.importLeaderStatus = importLeaderStatus;
+    }
+
+    public String getImportPeopleStatus() {
+        return importPeopleStatus;
+    }
+
+    public void setImportPeopleStatus(String importPeopleStatus) {
+        this.importPeopleStatus = importPeopleStatus;
+    }
+
+    public String getImportNo() {
+        return importNo;
+    }
+
+    public void setImportNo(String importNo) {
+        this.importNo = importNo;
+    }
+
+    public Date getImportTime() {
+        return importTime;
+    }
+
+    public void setImportTime(Date importTime) {
+        this.importTime = importTime;
+    }
+
+    public String getIsDelivery() {
+        return isDelivery;
+    }
+
+    public void setIsDelivery(String isDelivery) {
+        this.isDelivery = isDelivery;
+    }
+
+    public String getOrderFinish() {
+        return orderFinish;
+    }
+
+    public void setOrderFinish(String orderFinish) {
+        this.orderFinish = orderFinish;
+    }
+
+    public Long getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverId(Long driverId) {
+        this.driverId = driverId;
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName;
+    }
+
+    public String getDriverPhone() {
+        return driverPhone;
+    }
+
+    public void setDriverPhone(String driverPhone) {
+        this.driverPhone = driverPhone;
+    }
+
+    public Long getCarId() {
+        return carId;
+    }
+
+    public void setCarId(Long carId) {
+        this.carId = carId;
+    }
+
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public String getVehiclePlate() {
+        return vehiclePlate;
+    }
+
+    public void setVehiclePlate(String vehiclePlate) {
+        this.vehiclePlate = vehiclePlate;
+    }
+
+    public String getLoadingAddress() {
+        return loadingAddress;
+    }
+
+    public void setLoadingAddress(String loadingAddress) {
+        this.loadingAddress = loadingAddress;
+    }
+
+    public String getUnloadingAddress() {
+        return unloadingAddress;
+    }
+
+    public void setUnloadingAddress(String unloadingAddress) {
+        this.unloadingAddress = unloadingAddress;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getDeclareId() {
+        return declareId;
+    }
+
+    public void setDeclareId(String declareId) {
+        this.declareId = declareId;
+    }
+
+    public String getDeclareType() {
+        return declareType;
+    }
+
+    public void setDeclareType(String declareType) {
+        this.declareType = declareType;
+    }
+
+    public String getDeclareName() {
+        return declareName;
+    }
+
+    public void setDeclareName(String declareName) {
+        this.declareName = declareName;
+    }
+
+    public String getIdno() {
+        return idno;
+    }
+
+    public void setIdno(String idno) {
+        this.idno = idno;
+    }
+
+    public String getShopNo() {
+        return shopNo;
+    }
+
+    public void setShopNo(String shopNo) {
+        this.shopNo = shopNo;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getOrgPutrecNo() {
+        return orgPutrecNo;
+    }
+
+    public void setOrgPutrecNo(String orgPutrecNo) {
+        this.orgPutrecNo = orgPutrecNo;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getOrgScc() {
+        return orgScc;
+    }
+
+    public void setOrgScc(String orgScc) {
+        this.orgScc = orgScc;
+    }
+
+    public String getVeNo() {
+        return veNo;
+    }
+
+    public void setVeNo(String veNo) {
+        this.veNo = veNo;
+    }
+
+    public String getBtrnbBizModecd() {
+        return btrnbBizModecd;
+    }
+
+    public void setBtrnbBizModecd(String btrnbBizModecd) {
+        this.btrnbBizModecd = btrnbBizModecd;
+    }
+
+    public String getgFlow() {
+        return gFlow;
+    }
+
+    public void setgFlow(String gFlow) {
+        this.gFlow = gFlow;
+    }
+
+    public String getiEFlag() {
+        return iEFlag;
+    }
+
+    public void setiEFlag(String iEFlag) {
+        this.iEFlag = iEFlag;
+    }
+
+    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 getCustomsCode() {
+        return customsCode;
+    }
+
+    public void setCustomsCode(String customsCode) {
+        this.customsCode = customsCode;
+    }
+
+    public String getCarPool() {
+        return carPool;
+    }
+
+    public void setCarPool(String carPool) {
+        this.carPool = carPool;
+    }
+
+    public Double getSumAmt() {
+        return sumAmt;
+    }
+
+    public void setSumAmt(Double sumAmt) {
+        this.sumAmt = sumAmt;
+    }
+
+    public Double getSumGrossWt() {
+        return sumGrossWt;
+    }
+
+    public void setSumGrossWt(Double sumGrossWt) {
+        this.sumGrossWt = sumGrossWt;
+    }
+
+    public Double getSumNetWt() {
+        return sumNetWt;
+    }
+
+    public void setSumNetWt(Double sumNetWt) {
+        this.sumNetWt = sumNetWt;
+    }
+
+    public String getTrafMode() {
+        return trafMode;
+    }
+
+    public void setTrafMode(String trafMode) {
+        this.trafMode = trafMode;
+    }
+
+    public String getCurrCode() {
+        return currCode;
+    }
+
+    public void setCurrCode(String currCode) {
+        this.currCode = currCode;
+    }
+
+    public Long getPackNo() {
+        return packNo;
+    }
+
+    public void setPackNo(Long packNo) {
+        this.packNo = packNo;
+    }
+
+    public Date getDeclTime() {
+        return declTime;
+    }
+
+    public void setDeclTime(Date declTime) {
+        this.declTime = declTime;
+    }
+
+    public String getBillNo() {
+        return billNo;
+    }
+
+    public void setBillNo(String billNo) {
+        this.billNo = billNo;
+    }
+
+    public String getVoyageNo() {
+        return voyageNo;
+    }
+
+    public void setVoyageNo(String voyageNo) {
+        this.voyageNo = voyageNo;
+    }
+
+    public String getGoodsNames() {
+        return goodsNames;
+    }
+
+    public void setGoodsNames(String goodsNames) {
+        this.goodsNames = goodsNames;
+    }
+
+    public String getBordersList() {
+        return bordersList;
+    }
+
+    public void setBordersList(String bordersList) {
+        this.bordersList = bordersList;
+    }
+
+    public String getBorderBuyGoodsList() {
+        return borderBuyGoodsList;
+    }
+
+    public void setBorderBuyGoodsList(String borderBuyGoodsList) {
+        this.borderBuyGoodsList = borderBuyGoodsList;
+    }
+
+    public String getSellGoodsList() {
+        return sellGoodsList;
+    }
+
+    public void setSellGoodsList(String sellGoodsList) {
+        this.sellGoodsList = sellGoodsList;
+    }
+
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public CollageOrdersDto(Long id, Long tradeAreaId, String tradeAreaName, String orderNo, String cooperativeId, String cooperativeName, Double totalPrice, String entryPeopleStatus, String entryLeaderStatus, String entryCustomsStatus, String entryNo, Date entryTime, String entryResult, String entryFailReason, String peopleConfirmStatus, Date peopleConfirmTime, Date importLeaderTime, Date importPeopleTime, String importLeaderStatus, String importPeopleStatus, String importNo, Date importTime, String isDelivery, String orderFinish, Long driverId, String driverName, String driverPhone, Long carId, String carType, String vehiclePlate, String loadingAddress, String unloadingAddress, Long createBy, String createName, Date createTime, Long updateBy, String updateName, Date updateTime, Integer deleteStatus, String platSeqNo, String declareId, String declareType, String declareName, String idno, String shopNo, String shopName, String orgPutrecNo, String orgName, String orgScc, String veNo, String btrnbBizModecd, String gFlow, String iEFlag, String fieldCode, String fieldName, String customsCode, String carPool, Double sumAmt, Double sumGrossWt, Double sumNetWt, String trafMode, String currCode, Long packNo, Date declTime, String billNo, String voyageNo, String goodsNames, String bordersList, String borderBuyGoodsList, String sellGoodsList, Integer finishStatus) {
+        this.id = id;
+        this.tradeAreaId = tradeAreaId;
+        this.tradeAreaName = tradeAreaName;
+        this.orderNo = orderNo;
+        this.cooperativeId = cooperativeId;
+        this.cooperativeName = cooperativeName;
+        this.totalPrice = totalPrice;
+        this.entryPeopleStatus = entryPeopleStatus;
+        this.entryLeaderStatus = entryLeaderStatus;
+        this.entryCustomsStatus = entryCustomsStatus;
+        this.entryNo = entryNo;
+        this.entryTime = entryTime;
+        this.entryResult = entryResult;
+        this.entryFailReason = entryFailReason;
+        this.peopleConfirmStatus = peopleConfirmStatus;
+        this.peopleConfirmTime = peopleConfirmTime;
+        this.importLeaderTime = importLeaderTime;
+        this.importPeopleTime = importPeopleTime;
+        this.importLeaderStatus = importLeaderStatus;
+        this.importPeopleStatus = importPeopleStatus;
+        this.importNo = importNo;
+        this.importTime = importTime;
+        this.isDelivery = isDelivery;
+        this.orderFinish = orderFinish;
+        this.driverId = driverId;
+        this.driverName = driverName;
+        this.driverPhone = driverPhone;
+        this.carId = carId;
+        this.carType = carType;
+        this.vehiclePlate = vehiclePlate;
+        this.loadingAddress = loadingAddress;
+        this.unloadingAddress = unloadingAddress;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.createTime = createTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.updateTime = updateTime;
+        this.deleteStatus = deleteStatus;
+        this.platSeqNo = platSeqNo;
+        this.declareId = declareId;
+        this.declareType = declareType;
+        this.declareName = declareName;
+        this.idno = idno;
+        this.shopNo = shopNo;
+        this.shopName = shopName;
+        this.orgPutrecNo = orgPutrecNo;
+        this.orgName = orgName;
+        this.orgScc = orgScc;
+        this.veNo = veNo;
+        this.btrnbBizModecd = btrnbBizModecd;
+        this.gFlow = gFlow;
+        this.iEFlag = iEFlag;
+        this.fieldCode = fieldCode;
+        this.fieldName = fieldName;
+        this.customsCode = customsCode;
+        this.carPool = carPool;
+        this.sumAmt = sumAmt;
+        this.sumGrossWt = sumGrossWt;
+        this.sumNetWt = sumNetWt;
+        this.trafMode = trafMode;
+        this.currCode = currCode;
+        this.packNo = packNo;
+        this.declTime = declTime;
+        this.billNo = billNo;
+        this.voyageNo = voyageNo;
+        this.goodsNames = goodsNames;
+        this.bordersList = bordersList;
+        this.borderBuyGoodsList = borderBuyGoodsList;
+        this.sellGoodsList = sellGoodsList;
+        this.finishStatus = finishStatus;
+    }
+
+    public CollageOrdersDto() {
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.pj.api.dto;
+
+import java.util.List;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 20 06
+ **/
+public class GenerateOrderDto {
+
+    private CollageOrdersDto collageOrdersDto;
+
+    private List<BordersListDto> bordersListDtoList ;
+    private List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList;
+    private List<SellGoodsListDto> sellGoodsListDtoList;
+
+    public CollageOrdersDto getCollageOrdersDto() {
+        return collageOrdersDto;
+    }
+
+    public void setCollageOrdersDto(CollageOrdersDto collageOrdersDto) {
+        this.collageOrdersDto = collageOrdersDto;
+    }
+
+    public List<BordersListDto> getBordersListDtoList() {
+        return bordersListDtoList;
+    }
+
+    public void setBordersListDtoList(List<BordersListDto> bordersListDtoList) {
+        this.bordersListDtoList = bordersListDtoList;
+    }
+
+    public List<BorderBuyGoodsListDto> getBorderBuyGoodsListDtoList() {
+        return borderBuyGoodsListDtoList;
+    }
+
+    public void setBorderBuyGoodsListDtoList(List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList) {
+        this.borderBuyGoodsListDtoList = borderBuyGoodsListDtoList;
+    }
+
+    public List<SellGoodsListDto> getSellGoodsListDtoList() {
+        return sellGoodsListDtoList;
+    }
+
+    public void setSellGoodsListDtoList(List<SellGoodsListDto> sellGoodsListDtoList) {
+        this.sellGoodsListDtoList = sellGoodsListDtoList;
+    }
+
+    public GenerateOrderDto(CollageOrdersDto collageOrdersDto, List<BordersListDto> bordersListDtoList, List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList, List<SellGoodsListDto> sellGoodsListDtoList) {
+        this.collageOrdersDto = collageOrdersDto;
+        this.bordersListDtoList = bordersListDtoList;
+        this.borderBuyGoodsListDtoList = borderBuyGoodsListDtoList;
+        this.sellGoodsListDtoList = sellGoodsListDtoList;
+    }
+
+    public GenerateOrderDto() {
+    }
+}

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

@@ -12,38 +12,39 @@ public class OrderDto implements Serializable {
     private Long id;
 
     /**
-     *
+     * 订单号
+     */
+    private String tradeNo;
+
+    /**
+     * 交易地区ID
      */
     private Long tradeAreaId;
 
     /**
-     *
+     * 交易地区名称
      */
     private String tradeAreaName;
 
     /**
-     *
+     * 地区ID集合
      */
     private String addressIds;
 
     /**
-     *
-     */
-    private Long saleMainId;
-    /**
-     *
+     * 过审商品id
      */
-    private Long groupId;
+    private Long goodsId;
 
     /**
-     *  过审商品id[goodstransitid]
+     * 卖家ID
      */
-    private Long goodsId;
+    private Long saleMainId;
 
     /**
-     * 订单号
+     * 购买的互市组ID
      */
-    private String tradeNo;
+    private Long groupId;
 
     /**
      * 买家ID
@@ -91,11 +92,6 @@ public class OrderDto implements Serializable {
     private Integer tradeStatus;
 
     /**
-     * 边民或组长取消订单(0=未取消,1=已取消)
-     */
-    private Integer cancelPeople;
-
-    /**
      * 支付方式(0=金融互助,1=现金刷卡)
      */
     private Integer payType;
@@ -103,7 +99,7 @@ public class OrderDto implements Serializable {
     /**
      * 结算时间
      */
-    private String settleTime;
+    private Date settleTime;
 
     /**
      * 当前结算金额
@@ -125,8 +121,6 @@ public class OrderDto implements Serializable {
      */
     private Long recordUserId;
 
-
-
     /**
      * 对账时间
      */
@@ -145,27 +139,27 @@ public class OrderDto implements Serializable {
     /**
      * 退款时间
      */
-    private String refundTime;
+    private Date refundTime;
 
     /**
-     *
+     * 收货人名称
      */
     private String receiveName;
 
     /**
-     *
+     * 收货人电话
      */
     private String receivePhone;
 
     /**
-     *
+     * 收货地址
      */
     private String receiveAddress;
 
     /**
      * 出互市区时间
      */
-    private String outTime;
+    private Date outTime;
 
     /**
      * 商品名称字符串
@@ -173,7 +167,12 @@ public class OrderDto implements Serializable {
     private String goodsNames;
 
     /**
-     * 是否申报
+     * 商品图片
+     */
+    private String goodsImg;
+
+    /**
+     * 申报
      */
     private Integer apply;
 
@@ -188,7 +187,12 @@ public class OrderDto implements Serializable {
     private String applyResult;
 
     /**
-     *
+     * 申报单号
+     */
+    private Long applyNo;
+
+    /**
+     * 申报失败理由
      */
     private String applyFailReason;
 
@@ -198,29 +202,22 @@ public class OrderDto implements Serializable {
     private String distribution;
 
     /**
-     * 一级市场边民确认状态(0=待确认,1=是)
+     * 边民确认
      */
-    private Integer peopleConfirmStatus;
-    /**
-     * 一级市场边民确认类型(1=刷脸,2=指纹)
-     */
-    private Integer peopleConfirmType;
-    /**
-     * 一级市场边民确认时间
-     */
-    private Date peopleConfirmTime;
+    private String peopleConfirmStatus;
 
     /**
-     * 边民进口申报确认状态(0=待确认,1=是)
+     * 边民确认类型
      */
-    private Integer applyConfirmStatus;
+    private String peopleConfirmType;
+
     /**
-     * 边民进口申报确认时间
+     * 边民确认时间
      */
-    private Date applyConfirmTime;
+    private String peopleConfirmTime;
 
     /**
-     * 一级市场商户确认(0=待确认,1=是)[j]
+     * 一级市场商户确认(0=待确认,1=是,2=否)
      */
     private Integer enterpriseConfirm;
 
@@ -235,12 +232,12 @@ public class OrderDto implements Serializable {
     private Date pickTime;
 
     /**
-     *
+     * 商铺ID
      */
     private Long shopId;
 
     /**
-     *
+     * 商铺名称
      */
     private String shopName;
 
@@ -252,7 +249,7 @@ public class OrderDto implements Serializable {
     /**
      * 发货时间
      */
-    private String sendTime;
+    private Date sendTime;
 
     /**
      * 对应合作社的拼单订单ID
@@ -267,7 +264,7 @@ public class OrderDto implements Serializable {
     /**
      * 创建人编号
      */
-    private Long createBy;
+    private String createBy;
 
     /**
      * 创建人名称
@@ -295,30 +292,124 @@ public class OrderDto implements Serializable {
     private Integer deleteStatus;
 
     /**
-     * 订单状态(0=未完成,1=已完成)
+     * 是否转售(0=未转售,1=已转售,2=转售中)
+     */
+    private Integer resaleStatus;
+
+    /**
+     * 订单完成状态(0=未完成,1=已完成)
      */
     private Integer finishStatus;
 
     /**
-     * 申报单号
+     * 边民或组长取消订单(0=未取消,1=已取消)
      */
-    private Long applyNo;
+    private Integer cancelPeople;
 
     /**
-     * 是否转售(0=未转售,1=已转售)
+     * 商品单位
      */
-    private Integer resaleStatus;
+    private String goodsUnit;
 
     /**
-     * 叫车状态[默认是0=待叫车,1=已叫车,2=完成叫车]
+     * 叫车状态
      */
     private Integer callCarStatus;
 
+    /**
+     * 互助委托申报确认状态
+     */
+    private String cooperEntrustStatus;
 
     /**
-     * 商品单位
+     * 互助委托申报确认时间
      */
-    private String goodsUnit;
+    private Date cooperEntrustTime;
+
+    /**
+     * 边民进口申报确认状态
+     */
+    private String applyConfirmStatus;
+
+    /**
+     * 边民进口申报确认时间
+     */
+    private Date applyConfirmTime;
+
+    /**
+     * 车牌号
+     */
+    private String veNo;
+
+    /**
+     * 车航次(班)号
+     */
+    private String voyageNo;
+
+    /**
+     *
+     */
+    private String preNo;
+
+    /**
+     * 预申报编号
+     */
+    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;
 
     public Long getId() {
         return id;
@@ -328,6 +419,14 @@ public class OrderDto implements Serializable {
         this.id = id;
     }
 
+    public String getTradeNo() {
+        return tradeNo;
+    }
+
+    public void setTradeNo(String tradeNo) {
+        this.tradeNo = tradeNo;
+    }
+
     public Long getTradeAreaId() {
         return tradeAreaId;
     }
@@ -352,6 +451,14 @@ public class OrderDto implements Serializable {
         this.addressIds = addressIds;
     }
 
+    public Long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Long goodsId) {
+        this.goodsId = goodsId;
+    }
+
     public Long getSaleMainId() {
         return saleMainId;
     }
@@ -368,22 +475,6 @@ public class OrderDto implements Serializable {
         this.groupId = groupId;
     }
 
-    public Long getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Long goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public String getTradeNo() {
-        return tradeNo;
-    }
-
-    public void setTradeNo(String tradeNo) {
-        this.tradeNo = tradeNo;
-    }
-
     public Long getBuyUserId() {
         return buyUserId;
     }
@@ -456,14 +547,6 @@ public class OrderDto implements Serializable {
         this.tradeStatus = tradeStatus;
     }
 
-    public Integer getCancelPeople() {
-        return cancelPeople;
-    }
-
-    public void setCancelPeople(Integer cancelPeople) {
-        this.cancelPeople = cancelPeople;
-    }
-
     public Integer getPayType() {
         return payType;
     }
@@ -472,11 +555,11 @@ public class OrderDto implements Serializable {
         this.payType = payType;
     }
 
-    public String getSettleTime() {
+    public Date getSettleTime() {
         return settleTime;
     }
 
-    public void setSettleTime(String settleTime) {
+    public void setSettleTime(Date settleTime) {
         this.settleTime = settleTime;
     }
 
@@ -536,11 +619,11 @@ public class OrderDto implements Serializable {
         this.refundReason = refundReason;
     }
 
-    public String getRefundTime() {
+    public Date getRefundTime() {
         return refundTime;
     }
 
-    public void setRefundTime(String refundTime) {
+    public void setRefundTime(Date refundTime) {
         this.refundTime = refundTime;
     }
 
@@ -568,11 +651,11 @@ public class OrderDto implements Serializable {
         this.receiveAddress = receiveAddress;
     }
 
-    public String getOutTime() {
+    public Date getOutTime() {
         return outTime;
     }
 
-    public void setOutTime(String outTime) {
+    public void setOutTime(Date outTime) {
         this.outTime = outTime;
     }
 
@@ -584,6 +667,14 @@ public class OrderDto implements Serializable {
         this.goodsNames = goodsNames;
     }
 
+    public String getGoodsImg() {
+        return goodsImg;
+    }
+
+    public void setGoodsImg(String goodsImg) {
+        this.goodsImg = goodsImg;
+    }
+
     public Integer getApply() {
         return apply;
     }
@@ -608,6 +699,14 @@ public class OrderDto implements Serializable {
         this.applyResult = applyResult;
     }
 
+    public Long getApplyNo() {
+        return applyNo;
+    }
+
+    public void setApplyNo(Long applyNo) {
+        this.applyNo = applyNo;
+    }
+
     public String getApplyFailReason() {
         return applyFailReason;
     }
@@ -624,46 +723,30 @@ public class OrderDto implements Serializable {
         this.distribution = distribution;
     }
 
-    public Integer getPeopleConfirmStatus() {
+    public String getPeopleConfirmStatus() {
         return peopleConfirmStatus;
     }
 
-    public void setPeopleConfirmStatus(Integer peopleConfirmStatus) {
+    public void setPeopleConfirmStatus(String peopleConfirmStatus) {
         this.peopleConfirmStatus = peopleConfirmStatus;
     }
 
-    public Integer getPeopleConfirmType() {
+    public String getPeopleConfirmType() {
         return peopleConfirmType;
     }
 
-    public void setPeopleConfirmType(Integer peopleConfirmType) {
+    public void setPeopleConfirmType(String peopleConfirmType) {
         this.peopleConfirmType = peopleConfirmType;
     }
 
-    public Date getPeopleConfirmTime() {
+    public String getPeopleConfirmTime() {
         return peopleConfirmTime;
     }
 
-    public void setPeopleConfirmTime(Date peopleConfirmTime) {
+    public void setPeopleConfirmTime(String peopleConfirmTime) {
         this.peopleConfirmTime = peopleConfirmTime;
     }
 
-    public Integer getApplyConfirmStatus() {
-        return applyConfirmStatus;
-    }
-
-    public void setApplyConfirmStatus(Integer applyConfirmStatus) {
-        this.applyConfirmStatus = applyConfirmStatus;
-    }
-
-    public Date getApplyConfirmTime() {
-        return applyConfirmTime;
-    }
-
-    public void setApplyConfirmTime(Date applyConfirmTime) {
-        this.applyConfirmTime = applyConfirmTime;
-    }
-
     public Integer getEnterpriseConfirm() {
         return enterpriseConfirm;
     }
@@ -712,11 +795,11 @@ public class OrderDto implements Serializable {
         this.send = send;
     }
 
-    public String getSendTime() {
+    public Date getSendTime() {
         return sendTime;
     }
 
-    public void setSendTime(String sendTime) {
+    public void setSendTime(Date sendTime) {
         this.sendTime = sendTime;
     }
 
@@ -736,11 +819,11 @@ public class OrderDto implements Serializable {
         this.createTime = createTime;
     }
 
-    public Long getCreateBy() {
+    public String getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(Long createBy) {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 
@@ -784,6 +867,14 @@ public class OrderDto implements Serializable {
         this.deleteStatus = deleteStatus;
     }
 
+    public Integer getResaleStatus() {
+        return resaleStatus;
+    }
+
+    public void setResaleStatus(Integer resaleStatus) {
+        this.resaleStatus = resaleStatus;
+    }
+
     public Integer getFinishStatus() {
         return finishStatus;
     }
@@ -792,20 +883,20 @@ public class OrderDto implements Serializable {
         this.finishStatus = finishStatus;
     }
 
-    public Long getApplyNo() {
-        return applyNo;
+    public Integer getCancelPeople() {
+        return cancelPeople;
     }
 
-    public void setApplyNo(Long applyNo) {
-        this.applyNo = applyNo;
+    public void setCancelPeople(Integer cancelPeople) {
+        this.cancelPeople = cancelPeople;
     }
 
-    public Integer getResaleStatus() {
-        return resaleStatus;
+    public String getGoodsUnit() {
+        return goodsUnit;
     }
 
-    public void setResaleStatus(Integer resaleStatus) {
-        this.resaleStatus = resaleStatus;
+    public void setGoodsUnit(String goodsUnit) {
+        this.goodsUnit = goodsUnit;
     }
 
     public Integer getCallCarStatus() {
@@ -816,23 +907,167 @@ public class OrderDto implements Serializable {
         this.callCarStatus = callCarStatus;
     }
 
-    public String getGoodsUnit() {
-        return goodsUnit;
+    public String getCooperEntrustStatus() {
+        return cooperEntrustStatus;
     }
 
-    public void setGoodsUnit(String goodsUnit) {
-        this.goodsUnit = goodsUnit;
+    public void setCooperEntrustStatus(String cooperEntrustStatus) {
+        this.cooperEntrustStatus = cooperEntrustStatus;
+    }
+
+    public Date getCooperEntrustTime() {
+        return cooperEntrustTime;
+    }
+
+    public void setCooperEntrustTime(Date cooperEntrustTime) {
+        this.cooperEntrustTime = cooperEntrustTime;
+    }
+
+    public String getApplyConfirmStatus() {
+        return applyConfirmStatus;
+    }
+
+    public void setApplyConfirmStatus(String applyConfirmStatus) {
+        this.applyConfirmStatus = applyConfirmStatus;
+    }
+
+    public Date getApplyConfirmTime() {
+        return applyConfirmTime;
+    }
+
+    public void setApplyConfirmTime(Date applyConfirmTime) {
+        this.applyConfirmTime = applyConfirmTime;
+    }
+
+    public String getVeNo() {
+        return veNo;
     }
 
-    public OrderDto(Long id, Long tradeAreaId, String tradeAreaName, String addressIds, Long saleMainId, Long groupId, Long goodsId, String tradeNo, Long buyUserId, String buyUserName, String buyUserType, Long enterpriseId, String enterpriseName, Double totalWeight, Double totalPrice, Date tradeTime, Integer tradeStatus, Integer cancelPeople, Integer payType, String settleTime, Double realPrice, Double shouldPrice, Long settleUserId, Long recordUserId, String recordTime, String record, String refundReason, String refundTime, String receiveName, String receivePhone, String receiveAddress, String outTime, String goodsNames, Integer apply, Date applyTime, String applyResult, String applyFailReason, String distribution, Integer peopleConfirmStatus, Integer peopleConfirmType, Date peopleConfirmTime, Integer applyConfirmStatus, Date applyConfirmTime, Integer enterpriseConfirm, String pick, Date pickTime, Long shopId, String shopName, Integer send, String sendTime, Long collageOrdersId, Date createTime, Long createBy, String createName, Date updateTime, Long updateBy, String updateName, Integer deleteStatus, Integer finishStatus, Long applyNo, Integer resaleStatus, Integer callCarStatus, String goodsUnit) {
+    public void setVeNo(String veNo) {
+        this.veNo = veNo;
+    }
+
+    public String getVoyageNo() {
+        return voyageNo;
+    }
+
+    public void setVoyageNo(String voyageNo) {
+        this.voyageNo = voyageNo;
+    }
+
+    public String getPreNo() {
+        return preNo;
+    }
+
+    public void setPreNo(String preNo) {
+        this.preNo = preNo;
+    }
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getBorderName() {
+        return borderName;
+    }
+
+    public void setBorderName(String borderName) {
+        this.borderName = borderName;
+    }
+
+    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 getSettleBillNo() {
+        return settleBillNo;
+    }
+
+    public void setSettleBillNo(String settleBillNo) {
+        this.settleBillNo = settleBillNo;
+    }
+
+    public Double getBuyAmount() {
+        return buyAmount;
+    }
+
+    public void setBuyAmount(Double buyAmount) {
+        this.buyAmount = buyAmount;
+    }
+
+    public Double getNetWt() {
+        return netWt;
+    }
+
+    public void setNetWt(Double netWt) {
+        this.netWt = netWt;
+    }
+
+    public Double getGrossWt() {
+        return grossWt;
+    }
+
+    public void setGrossWt(Double grossWt) {
+        this.grossWt = grossWt;
+    }
+
+    public Double getBuyQty() {
+        return buyQty;
+    }
+
+    public void setBuyQty(Double buyQty) {
+        this.buyQty = buyQty;
+    }
+
+    public Double getBuyQty1() {
+        return buyQty1;
+    }
+
+    public void setBuyQty1(Double buyQty1) {
+        this.buyQty1 = buyQty1;
+    }
+
+    public Double getBuyQty2() {
+        return buyQty2;
+    }
+
+    public void setBuyQty2(Double buyQty2) {
+        this.buyQty2 = buyQty2;
+    }
+
+    public String getPreIeportNo() {
+        return preIeportNo;
+    }
+
+    public void setPreIeportNo(String preIeportNo) {
+        this.preIeportNo = preIeportNo;
+    }
+
+    public OrderDto(Long id, String tradeNo, Long tradeAreaId, String tradeAreaName, String addressIds, Long goodsId, Long saleMainId, Long groupId, Long buyUserId, String buyUserName, String buyUserType, Long enterpriseId, String enterpriseName, Double totalWeight, Double totalPrice, Date tradeTime, Integer tradeStatus, Integer payType, Date settleTime, Double realPrice, Double shouldPrice, Long settleUserId, Long recordUserId, String recordTime, String record, String refundReason, Date refundTime, String receiveName, String receivePhone, String receiveAddress, Date outTime, String goodsNames, String goodsImg, Integer apply, Date applyTime, String applyResult, Long applyNo, String applyFailReason, String distribution, String peopleConfirmStatus, String peopleConfirmType, String peopleConfirmTime, Integer enterpriseConfirm, String pick, Date pickTime, Long shopId, String shopName, Integer send, Date sendTime, Long collageOrdersId, Date createTime, String createBy, String createName, Date updateTime, Long updateBy, String updateName, Integer deleteStatus, Integer resaleStatus, Integer finishStatus, Integer cancelPeople, String goodsUnit, Integer callCarStatus, String cooperEntrustStatus, Date cooperEntrustTime, String applyConfirmStatus, Date applyConfirmTime, String veNo, String voyageNo, String preNo, String platSeqNo, String borderName, String idno, String borderPutrecNo, String settleBillNo, Double buyAmount, Double netWt, Double grossWt, Double buyQty, Double buyQty1, Double buyQty2, String preIeportNo) {
         this.id = id;
+        this.tradeNo = tradeNo;
         this.tradeAreaId = tradeAreaId;
         this.tradeAreaName = tradeAreaName;
         this.addressIds = addressIds;
+        this.goodsId = goodsId;
         this.saleMainId = saleMainId;
         this.groupId = groupId;
-        this.goodsId = goodsId;
-        this.tradeNo = tradeNo;
         this.buyUserId = buyUserId;
         this.buyUserName = buyUserName;
         this.buyUserType = buyUserType;
@@ -842,7 +1077,6 @@ public class OrderDto implements Serializable {
         this.totalPrice = totalPrice;
         this.tradeTime = tradeTime;
         this.tradeStatus = tradeStatus;
-        this.cancelPeople = cancelPeople;
         this.payType = payType;
         this.settleTime = settleTime;
         this.realPrice = realPrice;
@@ -858,16 +1092,16 @@ public class OrderDto implements Serializable {
         this.receiveAddress = receiveAddress;
         this.outTime = outTime;
         this.goodsNames = goodsNames;
+        this.goodsImg = goodsImg;
         this.apply = apply;
         this.applyTime = applyTime;
         this.applyResult = applyResult;
+        this.applyNo = applyNo;
         this.applyFailReason = applyFailReason;
         this.distribution = distribution;
         this.peopleConfirmStatus = peopleConfirmStatus;
         this.peopleConfirmType = peopleConfirmType;
         this.peopleConfirmTime = peopleConfirmTime;
-        this.applyConfirmStatus = applyConfirmStatus;
-        this.applyConfirmTime = applyConfirmTime;
         this.enterpriseConfirm = enterpriseConfirm;
         this.pick = pick;
         this.pickTime = pickTime;
@@ -883,82 +1117,32 @@ public class OrderDto implements Serializable {
         this.updateBy = updateBy;
         this.updateName = updateName;
         this.deleteStatus = deleteStatus;
-        this.finishStatus = finishStatus;
-        this.applyNo = applyNo;
         this.resaleStatus = resaleStatus;
-        this.callCarStatus = callCarStatus;
+        this.finishStatus = finishStatus;
+        this.cancelPeople = cancelPeople;
         this.goodsUnit = goodsUnit;
+        this.callCarStatus = callCarStatus;
+        this.cooperEntrustStatus = cooperEntrustStatus;
+        this.cooperEntrustTime = cooperEntrustTime;
+        this.applyConfirmStatus = applyConfirmStatus;
+        this.applyConfirmTime = applyConfirmTime;
+        this.veNo = veNo;
+        this.voyageNo = voyageNo;
+        this.preNo = preNo;
+        this.platSeqNo = platSeqNo;
+        this.borderName = borderName;
+        this.idno = idno;
+        this.borderPutrecNo = borderPutrecNo;
+        this.settleBillNo = settleBillNo;
+        this.buyAmount = buyAmount;
+        this.netWt = netWt;
+        this.grossWt = grossWt;
+        this.buyQty = buyQty;
+        this.buyQty1 = buyQty1;
+        this.buyQty2 = buyQty2;
+        this.preIeportNo = preIeportNo;
     }
 
     public OrderDto() {
     }
-
-    @Override
-    public String toString() {
-        return "OrderDto{" +
-                "id=" + id +
-                ", tradeAreaId=" + tradeAreaId +
-                ", tradeAreaName='" + tradeAreaName + '\'' +
-                ", addressIds='" + addressIds + '\'' +
-                ", saleMainId=" + saleMainId +
-                ", groupId=" + groupId +
-                ", goodsId=" + goodsId +
-                ", tradeNo='" + tradeNo + '\'' +
-                ", buyUserId=" + buyUserId +
-                ", buyUserName='" + buyUserName + '\'' +
-                ", buyUserType='" + buyUserType + '\'' +
-                ", enterpriseId=" + enterpriseId +
-                ", enterpriseName='" + enterpriseName + '\'' +
-                ", totalWeight=" + totalWeight +
-                ", totalPrice=" + totalPrice +
-                ", tradeTime=" + tradeTime +
-                ", tradeStatus=" + tradeStatus +
-                ", cancelPeople=" + cancelPeople +
-                ", payType=" + payType +
-                ", settleTime='" + settleTime + '\'' +
-                ", realPrice=" + realPrice +
-                ", shouldPrice=" + shouldPrice +
-                ", settleUserId=" + settleUserId +
-                ", recordUserId=" + recordUserId +
-                ", recordTime='" + recordTime + '\'' +
-                ", record='" + record + '\'' +
-                ", refundReason='" + refundReason + '\'' +
-                ", refundTime='" + refundTime + '\'' +
-                ", receiveName='" + receiveName + '\'' +
-                ", receivePhone='" + receivePhone + '\'' +
-                ", receiveAddress='" + receiveAddress + '\'' +
-                ", outTime='" + outTime + '\'' +
-                ", goodsNames='" + goodsNames + '\'' +
-                ", apply=" + apply +
-                ", applyTime=" + applyTime +
-                ", applyResult='" + applyResult + '\'' +
-                ", applyFailReason='" + applyFailReason + '\'' +
-                ", distribution='" + distribution + '\'' +
-                ", peopleConfirmStatus=" + peopleConfirmStatus +
-                ", peopleConfirmType=" + peopleConfirmType +
-                ", peopleConfirmTime=" + peopleConfirmTime +
-                ", applyConfirmStatus=" + applyConfirmStatus +
-                ", applyConfirmTime=" + applyConfirmTime +
-                ", enterpriseConfirm=" + enterpriseConfirm +
-                ", pick='" + pick + '\'' +
-                ", pickTime=" + pickTime +
-                ", shopId=" + shopId +
-                ", shopName='" + shopName + '\'' +
-                ", send=" + send +
-                ", sendTime='" + sendTime + '\'' +
-                ", collageOrdersId=" + collageOrdersId +
-                ", createTime=" + createTime +
-                ", createBy=" + createBy +
-                ", createName='" + createName + '\'' +
-                ", updateTime=" + updateTime +
-                ", updateBy=" + updateBy +
-                ", updateName='" + updateName + '\'' +
-                ", deleteStatus=" + deleteStatus +
-                ", finishStatus=" + finishStatus +
-                ", applyNo=" + applyNo +
-                ", resaleStatus=" + resaleStatus +
-                ", callCarStatus=" + callCarStatus +
-                ", goodsUnit='" + goodsUnit + '\'' +
-                '}';
-    }
 }

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

@@ -0,0 +1,308 @@
+package com.pj.api.dto;
+
+import java.util.Date;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 19 10
+ **/
+public class SellGoodsListDto {
+
+    private Long id;
+
+    /**
+     * 预申报编号
+     */
+    private String platSeqNo;
+
+    /**
+     * 商品序号
+     */
+    private String gNo;
+
+    /**
+     * 商品编码
+     */
+    private String codeTs;
+
+    /**
+     * 商品名称
+     */
+    private String gName;
+
+    /**
+     * 规格型号
+     */
+    private String gModel;
+
+    /**
+     * 储存条件：常温 1：冷藏，2：冷冻：3
+     */
+    private String storageEnvm;
+
+    /**
+     * 用 途 ： 01 食用 、 02 工 业用、03 药用、04 种 用 、 05饲用、06 其他
+     */
+    private String useTo;
+
+    /**
+     * 毛重
+     */
+    private Double grossWt;
+
+    /**
+     * 净重
+     */
+    private Double netWt;
+
+    /**
+     * 产销国
+     */
+    private String originCountry;
+
+    /**
+     * 货物数量
+     */
+    private Double gQty;
+
+    /**
+     * 第一数量
+     */
+    private Double qty1;
+
+    /**
+     * 第二数量
+     */
+    private Double qty2;
+
+    /**
+     * 计量单位
+     */
+    private String gUnit;
+
+    /**
+     * 第一计量单位
+     */
+    private String unit1;
+
+    /**
+     * 第二计量单位
+     */
+    private String unit2;
+
+    /**
+     * 单价
+     */
+    private Double declPrice;
+
+    /**
+     * 总价
+     */
+    private Double declTotal;
+
+    /**
+     * 完成状态
+     */
+    private Integer finishStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    public SellGoodsListDto(Long id, String platSeqNo, String gNo, String codeTs, String gName, String gModel, String storageEnvm, String useTo, Double grossWt, Double netWt, String originCountry, Double gQty, Double qty1, Double qty2, String gUnit, String unit1, String unit2, Double declPrice, Double declTotal, Integer finishStatus, Date createTime) {
+        this.id = id;
+        this.platSeqNo = platSeqNo;
+        this.gNo = gNo;
+        this.codeTs = codeTs;
+        this.gName = gName;
+        this.gModel = gModel;
+        this.storageEnvm = storageEnvm;
+        this.useTo = useTo;
+        this.grossWt = grossWt;
+        this.netWt = netWt;
+        this.originCountry = originCountry;
+        this.gQty = gQty;
+        this.qty1 = qty1;
+        this.qty2 = qty2;
+        this.gUnit = gUnit;
+        this.unit1 = unit1;
+        this.unit2 = unit2;
+        this.declPrice = declPrice;
+        this.declTotal = declTotal;
+        this.finishStatus = finishStatus;
+        this.createTime = createTime;
+    }
+
+    public SellGoodsListDto() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getgNo() {
+        return gNo;
+    }
+
+    public void setgNo(String gNo) {
+        this.gNo = gNo;
+    }
+
+    public String getCodeTs() {
+        return codeTs;
+    }
+
+    public void setCodeTs(String codeTs) {
+        this.codeTs = codeTs;
+    }
+
+    public String getgName() {
+        return gName;
+    }
+
+    public void setgName(String gName) {
+        this.gName = gName;
+    }
+
+    public String getgModel() {
+        return gModel;
+    }
+
+    public void setgModel(String gModel) {
+        this.gModel = gModel;
+    }
+
+    public String getStorageEnvm() {
+        return storageEnvm;
+    }
+
+    public void setStorageEnvm(String storageEnvm) {
+        this.storageEnvm = storageEnvm;
+    }
+
+    public String getUseTo() {
+        return useTo;
+    }
+
+    public void setUseTo(String useTo) {
+        this.useTo = useTo;
+    }
+
+    public Double getGrossWt() {
+        return grossWt;
+    }
+
+    public void setGrossWt(Double grossWt) {
+        this.grossWt = grossWt;
+    }
+
+    public Double getNetWt() {
+        return netWt;
+    }
+
+    public void setNetWt(Double netWt) {
+        this.netWt = netWt;
+    }
+
+    public String getOriginCountry() {
+        return originCountry;
+    }
+
+    public void setOriginCountry(String originCountry) {
+        this.originCountry = originCountry;
+    }
+
+    public Double getgQty() {
+        return gQty;
+    }
+
+    public void setgQty(Double gQty) {
+        this.gQty = gQty;
+    }
+
+    public Double getQty1() {
+        return qty1;
+    }
+
+    public void setQty1(Double qty1) {
+        this.qty1 = qty1;
+    }
+
+    public Double getQty2() {
+        return qty2;
+    }
+
+    public void setQty2(Double qty2) {
+        this.qty2 = qty2;
+    }
+
+    public String getgUnit() {
+        return gUnit;
+    }
+
+    public void setgUnit(String gUnit) {
+        this.gUnit = gUnit;
+    }
+
+    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 Double getDeclPrice() {
+        return declPrice;
+    }
+
+    public void setDeclPrice(Double declPrice) {
+        this.declPrice = declPrice;
+    }
+
+    public Double getDeclTotal() {
+        return declTotal;
+    }
+
+    public void setDeclTotal(Double declTotal) {
+        this.declTotal = declTotal;
+    }
+
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -0,0 +1,567 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 20 31
+ **/
+public class TradeSettlementDto {
+    private Long id;
+
+    /**
+     * 航通主键
+     */
+    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-落地加工；
+     */
+    @JsonProperty("gFlow")
+    private String gFlow;
+
+    /**
+     * 进出口标志：I进口 E 出口
+     */
+    @JsonProperty("iEFlag")
+    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 Integer finishStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private String preNo;
+
+    private List<BordersListDto> bordersListDtoList ;
+    private List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList;
+
+    public TradeSettlementDto(Long id, String platSeqNo, String declareId, String declareType, String declareName, String idno, String shopNo, String shopName, String orgPutrecNo, String orgName, String orgScc, String veNo, String btrnbBizModecd, String gFlow, String iEFlag, String fieldCode, String fieldName, String customsCode, String carPool, Double sumAmt, Double sumGrossWt, Double sumNetWt, String trafMode, String currCode, Long packNo, String declTime, String billNo, String voyageNo, String goodsNames, String bordersList, String borderBuyGoodsList, String sellGoodsList, Integer finishStatus, Date createTime, String preNo, List<BordersListDto> bordersListDtoList, List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList) {
+        this.id = id;
+        this.platSeqNo = platSeqNo;
+        this.declareId = declareId;
+        this.declareType = declareType;
+        this.declareName = declareName;
+        this.idno = idno;
+        this.shopNo = shopNo;
+        this.shopName = shopName;
+        this.orgPutrecNo = orgPutrecNo;
+        this.orgName = orgName;
+        this.orgScc = orgScc;
+        this.veNo = veNo;
+        this.btrnbBizModecd = btrnbBizModecd;
+        this.gFlow = gFlow;
+        this.iEFlag = iEFlag;
+        this.fieldCode = fieldCode;
+        this.fieldName = fieldName;
+        this.customsCode = customsCode;
+        this.carPool = carPool;
+        this.sumAmt = sumAmt;
+        this.sumGrossWt = sumGrossWt;
+        this.sumNetWt = sumNetWt;
+        this.trafMode = trafMode;
+        this.currCode = currCode;
+        this.packNo = packNo;
+        this.declTime = declTime;
+        this.billNo = billNo;
+        this.voyageNo = voyageNo;
+        this.goodsNames = goodsNames;
+        this.bordersList = bordersList;
+        this.borderBuyGoodsList = borderBuyGoodsList;
+        this.sellGoodsList = sellGoodsList;
+        this.finishStatus = finishStatus;
+        this.createTime = createTime;
+        this.preNo = preNo;
+        this.bordersListDtoList = bordersListDtoList;
+        this.borderBuyGoodsListDtoList = borderBuyGoodsListDtoList;
+    }
+
+    public List<BordersListDto> getBordersListDtoList() {
+        return bordersListDtoList;
+    }
+
+    public void setBordersListDtoList(List<BordersListDto> bordersListDtoList) {
+        this.bordersListDtoList = bordersListDtoList;
+    }
+
+    public List<BorderBuyGoodsListDto> getBorderBuyGoodsListDtoList() {
+        return borderBuyGoodsListDtoList;
+    }
+
+    public void setBorderBuyGoodsListDtoList(List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList) {
+        this.borderBuyGoodsListDtoList = borderBuyGoodsListDtoList;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPlatSeqNo() {
+        return platSeqNo;
+    }
+
+    public void setPlatSeqNo(String platSeqNo) {
+        this.platSeqNo = platSeqNo;
+    }
+
+    public String getDeclareId() {
+        return declareId;
+    }
+
+    public void setDeclareId(String declareId) {
+        this.declareId = declareId;
+    }
+
+    public String getDeclareType() {
+        return declareType;
+    }
+
+    public void setDeclareType(String declareType) {
+        this.declareType = declareType;
+    }
+
+    public String getDeclareName() {
+        return declareName;
+    }
+
+    public void setDeclareName(String declareName) {
+        this.declareName = declareName;
+    }
+
+    public String getIdno() {
+        return idno;
+    }
+
+    public void setIdno(String idno) {
+        this.idno = idno;
+    }
+
+    public String getShopNo() {
+        return shopNo;
+    }
+
+    public void setShopNo(String shopNo) {
+        this.shopNo = shopNo;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getOrgPutrecNo() {
+        return orgPutrecNo;
+    }
+
+    public void setOrgPutrecNo(String orgPutrecNo) {
+        this.orgPutrecNo = orgPutrecNo;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getOrgScc() {
+        return orgScc;
+    }
+
+    public void setOrgScc(String orgScc) {
+        this.orgScc = orgScc;
+    }
+
+    public String getVeNo() {
+        return veNo;
+    }
+
+    public void setVeNo(String veNo) {
+        this.veNo = veNo;
+    }
+
+    public String getBtrnbBizModecd() {
+        return btrnbBizModecd;
+    }
+
+    public void setBtrnbBizModecd(String btrnbBizModecd) {
+        this.btrnbBizModecd = btrnbBizModecd;
+    }
+
+    public String getgFlow() {
+        return gFlow;
+    }
+
+    public void setgFlow(String gFlow) {
+        this.gFlow = gFlow;
+    }
+
+    public String getiEFlag() {
+        return iEFlag;
+    }
+
+    public void setiEFlag(String iEFlag) {
+        this.iEFlag = iEFlag;
+    }
+
+    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 getCustomsCode() {
+        return customsCode;
+    }
+
+    public void setCustomsCode(String customsCode) {
+        this.customsCode = customsCode;
+    }
+
+    public String getCarPool() {
+        return carPool;
+    }
+
+    public void setCarPool(String carPool) {
+        this.carPool = carPool;
+    }
+
+    public Double getSumAmt() {
+        return sumAmt;
+    }
+
+    public void setSumAmt(Double sumAmt) {
+        this.sumAmt = sumAmt;
+    }
+
+    public Double getSumGrossWt() {
+        return sumGrossWt;
+    }
+
+    public void setSumGrossWt(Double sumGrossWt) {
+        this.sumGrossWt = sumGrossWt;
+    }
+
+    public Double getSumNetWt() {
+        return sumNetWt;
+    }
+
+    public void setSumNetWt(Double sumNetWt) {
+        this.sumNetWt = sumNetWt;
+    }
+
+    public String getTrafMode() {
+        return trafMode;
+    }
+
+    public void setTrafMode(String trafMode) {
+        this.trafMode = trafMode;
+    }
+
+    public String getCurrCode() {
+        return currCode;
+    }
+
+    public void setCurrCode(String currCode) {
+        this.currCode = currCode;
+    }
+
+    public Long getPackNo() {
+        return packNo;
+    }
+
+    public void setPackNo(Long packNo) {
+        this.packNo = packNo;
+    }
+
+    public String getDeclTime() {
+        return declTime;
+    }
+
+    public void setDeclTime(String declTime) {
+        this.declTime = declTime;
+    }
+
+    public String getBillNo() {
+        return billNo;
+    }
+
+    public void setBillNo(String billNo) {
+        this.billNo = billNo;
+    }
+
+    public String getVoyageNo() {
+        return voyageNo;
+    }
+
+    public void setVoyageNo(String voyageNo) {
+        this.voyageNo = voyageNo;
+    }
+
+    public String getGoodsNames() {
+        return goodsNames;
+    }
+
+    public void setGoodsNames(String goodsNames) {
+        this.goodsNames = goodsNames;
+    }
+
+    public String getBordersList() {
+        return bordersList;
+    }
+
+    public void setBordersList(String bordersList) {
+        this.bordersList = bordersList;
+    }
+
+    public String getBorderBuyGoodsList() {
+        return borderBuyGoodsList;
+    }
+
+    public void setBorderBuyGoodsList(String borderBuyGoodsList) {
+        this.borderBuyGoodsList = borderBuyGoodsList;
+    }
+
+    public String getSellGoodsList() {
+        return sellGoodsList;
+    }
+
+    public void setSellGoodsList(String sellGoodsList) {
+        this.sellGoodsList = sellGoodsList;
+    }
+
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getPreNo() {
+        return preNo;
+    }
+
+    public void setPreNo(String preNo) {
+        this.preNo = preNo;
+    }
+
+    public TradeSettlementDto(Long id, String platSeqNo, String declareId, String declareType, String declareName, String idno, String shopNo, String shopName, String orgPutrecNo, String orgName, String orgScc, String veNo, String btrnbBizModecd, String gFlow, String iEFlag, String fieldCode, String fieldName, String customsCode, String carPool, Double sumAmt, Double sumGrossWt, Double sumNetWt, String trafMode, String currCode, Long packNo, String declTime, String billNo, String voyageNo, String goodsNames, String bordersList, String borderBuyGoodsList, String sellGoodsList, Integer finishStatus, Date createTime, String preNo) {
+        this.id = id;
+        this.platSeqNo = platSeqNo;
+        this.declareId = declareId;
+        this.declareType = declareType;
+        this.declareName = declareName;
+        this.idno = idno;
+        this.shopNo = shopNo;
+        this.shopName = shopName;
+        this.orgPutrecNo = orgPutrecNo;
+        this.orgName = orgName;
+        this.orgScc = orgScc;
+        this.veNo = veNo;
+        this.btrnbBizModecd = btrnbBizModecd;
+        this.gFlow = gFlow;
+        this.iEFlag = iEFlag;
+        this.fieldCode = fieldCode;
+        this.fieldName = fieldName;
+        this.customsCode = customsCode;
+        this.carPool = carPool;
+        this.sumAmt = sumAmt;
+        this.sumGrossWt = sumGrossWt;
+        this.sumNetWt = sumNetWt;
+        this.trafMode = trafMode;
+        this.currCode = currCode;
+        this.packNo = packNo;
+        this.declTime = declTime;
+        this.billNo = billNo;
+        this.voyageNo = voyageNo;
+        this.goodsNames = goodsNames;
+        this.bordersList = bordersList;
+        this.borderBuyGoodsList = borderBuyGoodsList;
+        this.sellGoodsList = sellGoodsList;
+        this.finishStatus = finishStatus;
+        this.createTime = createTime;
+        this.preNo = preNo;
+    }
+
+    public TradeSettlementDto() {
+    }
+}

sp-core/sp-base/src/main/java/com/pj/enummj/CallCarStatus.java

@@ -0,0 +1,21 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 20 48
+ **/
+@Getter
+@AllArgsConstructor
+public enum CallCarStatus {
+
+    CALL_CAR_STATUS_ZERO(0,"待叫车"),
+    CALL_CAR_STATUS_ONE(1,"已叫车"),
+    CALL_CAR_STATUS_TWO(2,"完成叫车");
+
+    private Integer code;
+
+    private String msg;
+}

sp-core/sp-base/src/main/java/com/pj/enummj/PeopleConfirmStatus.java

@@ -0,0 +1,26 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 09 01 19 56
+ **/
+@Getter
+@AllArgsConstructor
+public enum PeopleConfirmStatus {
+    /**
+     * 便民确认情况
+     */
+    PEOPLE_CONFIRM_STATUS_ZERO(0 + "","待确认"),
+    PEOPLE_CONFIRM_STATUS_ONE(1 + "","已确认"),
+    PEOPLE_CONFIRM_STATUS_TWO(2 + "","拒绝");
+
+    private String code;
+
+    private String msg;
+
+
+
+}

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

@@ -118,7 +118,7 @@ public class HtBordersList extends Model<HtBordersList> implements Serializable
 	private Integer finishStatus;	
 
 
-
+	private String preNo;
 
 
 	

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

@@ -25,8 +25,10 @@ import com.pj.ht_sell_goods_list.HtSellGoodsList;
 import com.pj.ht_sell_goods_list.HtSellGoodsListMapper;
 import com.pj.ht_trade_settlement.HtTradeSettlement;
 import com.pj.ht_trade_settlement.HtTradeSettlementMapper;
+import com.pj.project4sp.SP;
 import com.pj.rabbitmq.RabbitMQ;
 import com.pj.utils.ht.AESUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -34,6 +36,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -195,6 +198,7 @@ public class HtByteTask {
                     importDeclarePeople.setCreateTime(new Date());
                     //保存
                     int insert = htTradeSettlementMapper.insert(importDeclarePeople);
+                    long primarykey = SP.publicMapper.getPrimarykey();
                     if(insert == 1){
                         //购买边民列表
                         List<HtBordersList> bordersLists = JSON.parseArray(importDeclarePeople.getBordersList(), HtBordersList.class);
@@ -205,11 +209,15 @@ public class HtByteTask {
                         //航通关联主键
                         String platSeqNo = importDeclarePeople.getPlatSeqNo();
                         //保存购买边民
+                        List<BordersListDto> bordersListDtoList = new ArrayList<>();
                         if(bordersLists.size() > 0){
                             bordersLists.forEach(t -> {
-                                t.setCreateTime(new Date());
-                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
-                                htBordersListMapper.insert(t);
+//                                t.setCreateTime(new Date());
+//                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
+//                                htBordersListMapper.insert(t);
+                                BordersListDto bordersListDto = new BordersListDto();
+                                BeanUtils.copyProperties(t,bordersListDto);
+                                bordersListDtoList.add(bordersListDto);
                             });
                         /**
                          * 接收订单推送消息，边民进行交易确认，支付申请，刷脸认证，系统发起进行交易
@@ -218,25 +226,40 @@ public class HtByteTask {
                             methodHtByteTask.sendMessageToPeople(htBordersLists);
                         }
                         //保存边民购买商品
+                        List<BorderBuyGoodsListDto> borderBuyGoodsListDtoList = new ArrayList<>();
                         if(buyGoodsList.size() > 0){
                             buyGoodsList.forEach(t -> {
-                                t.setCreateTime(new Date());
-                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
-                                htBorderBuyGoodsListMapper.insert(t);
+//                                t.setCreateTime(new Date());
+//                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
+//                                htBorderBuyGoodsListMapper.insert(t);
+                                BorderBuyGoodsListDto borderBuyGoodsListDto = new BorderBuyGoodsListDto();
+                                BeanUtils.copyProperties(t,borderBuyGoodsListDto);
+                                borderBuyGoodsListDtoList.add(borderBuyGoodsListDto);
                             });
                             // ???
                         }
                         //保存商铺卖货物
+                        List<SellGoodsListDto> sellGoodsListDtoList = new ArrayList<>();
                         if(htSellGoodsList.size() > 0){
                             htSellGoodsList.forEach(t -> {
-                                t.setCreateTime(new Date());
-                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
-                                htSellGoodsListMapper.insert(t);
+//                                t.setCreateTime(new Date());
+//                                t.setFinishStatus(FinishStatus.FINISH_STATUS_ZERO.getCode());
+//                                htSellGoodsListMapper.insert(t);
+                                SellGoodsListDto sellGoodsListDto = new SellGoodsListDto();
+                                BeanUtils.copyProperties(t,sellGoodsListDto);
+                                sellGoodsListDtoList.add(sellGoodsListDto);
                             });
                             // ???
                         }
                         //保存航通监听记录
                         methodHtByteTask.updateHtByteInfo(true,item,dataDto);
+                        TradeSettlementDto tradeSettlementDto = new TradeSettlementDto();
+                        BeanUtils.copyProperties(importDeclarePeople,tradeSettlementDto);
+                        tradeSettlementDto.setId(primarykey);
+                        tradeSettlementDto.setBordersListDtoList(bordersListDtoList);
+                        tradeSettlementDto.setBorderBuyGoodsListDtoList(borderBuyGoodsListDtoList);
+                        boolean b = levelOneServerInterface.tradeSettlementDto(tradeSettlementDto);
+                        if(!b)throw new ServiceException("添加错误;");
                         System.out.println("\n交易结算信息处理成功。 messageId = " + item.getMessageId() + "\n");
                         break;
                     }

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

@@ -0,0 +1,226 @@
+package com.pj.ht_trade_settlement;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 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 Long id;
+
+	/**
+	 * 航通主键
+	 */
+	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-落地加工； 
+	 */
+	@JsonProperty("gFlow")
+	private String gFlow;	
+
+	/**
+	 * 进出口标志：I进口 E 出口 
+	 */
+	@JsonProperty("iEFlag")
+	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 Integer finishStatus;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+	/**
+	 *
+	 */
+	private String preNo;
+
+
+}

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

@@ -0,0 +1,92 @@
+package com.pj.ht_trade_settlement;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.api.dto.TradeSettlementDto;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 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);
+	}
+
+	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
+
+	/** 远程调用: 添加大订单时同事生成小定单 */
+	@RequestMapping("rpc/tradeSettlementDto")
+	public boolean tradeSettlementDto(@RequestBody TradeSettlementDto tradeSettlementDto){
+		boolean b = htTradeSettlementService.tradeSettlementDto(tradeSettlementDto);
+		return b;
+	}
+
+	
+	
+	
+
+}

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

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

sp-service/level-one-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/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementService.java

@@ -0,0 +1,106 @@
+package com.pj.ht_trade_settlement;
+
+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.BorderBuyGoodsListDto;
+import com.pj.api.dto.BordersListDto;
+import com.pj.api.dto.TradeSettlementDto;
+import com.pj.enummj.*;
+import com.pj.tb_order.TbOrder;
+import com.pj.tb_order.TbOrderMapper;
+import com.pj.tb_people.TbPeople;
+import com.pj.tb_people.TbPeopleMapper;
+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 java.util.Date;
+import java.util.List;
+
+/**
+ * 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;
+	@Autowired
+	private TbPeopleMapper tbPeopleMapper;
+	@Autowired
+	private TbOrderMapper tbOrderMapper;
+
+	/** 增 */
+	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);	
+	}
+	
+
+	/** 远程调用: 添加大订单时同事生成小定单 */
+	public boolean tradeSettlementDto(TradeSettlementDto tradeSettlementDto){
+		HtTradeSettlement htTradeSettlement = new HtTradeSettlement();
+		BeanUtils.copyProperties(tradeSettlementDto,htTradeSettlement);
+		int insert = htTradeSettlementMapper.insert(htTradeSettlement);
+		//取出边民小定单集合
+		List<BordersListDto> bordersListDtoList = tradeSettlementDto.getBordersListDtoList();
+		BorderBuyGoodsListDto borderBuyGoodsListDto = tradeSettlementDto.getBorderBuyGoodsListDtoList().get(0);
+		//循环
+		if(bordersListDtoList.size() > 0){
+			bordersListDtoList.forEach(item -> {
+				//开始创建小定单
+				TbOrder tbOrder = new TbOrder();
+				//航通字段
+				BeanUtils.copyProperties(item,tbOrder);
+				//				tbOrder.setTradeNo(); // 订单号...  没确认的参数先跳过
+				//根据身份证查询边民
+				List<TbPeople> tbPeople = tbPeopleMapper.selectList(new LambdaQueryWrapper<TbPeople>().eq(TbPeople::getIdCardNo, item.getIdno()));
+				tbOrder.setCallCarStatus(CallCarStatus.CALL_CAR_STATUS_ZERO.getCode());
+				tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+				tbOrder.setCreateTime(new Date());
+				tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode());
+				tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());
+				tbOrder.setSend(DeliverStatus.DELIVER_STATUS_ZERO.getCode());
+				tbOrder.setApply(ApplyStatus.APPLY_STATUS_ZERO.getCode());
+				if(borderBuyGoodsListDto != null){
+					tbOrder.setGoodsNames(borderBuyGoodsListDto.getGoodsName());
+				}
+				if(tbPeople.size() > 0){
+					tbOrder.setBuyUserId(tbPeople.get(0).getId());
+					tbOrder.setBuyUserName(tbPeople.get(0).getBorderName());
+					tbOrder.setGroupId(tbPeople.get(0).getGroupId());
+				}
+				tbOrder.setPreNo(item.getPreNo());
+
+				tbOrderMapper.insert(tbOrder);
+			});
+		}
+		return insert == 1;
+	}
+}

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrders.java

@@ -1,18 +1,19 @@
 package com.pj.tb_collage_orders;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.EqualsAndHashCode;
-
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * Model: tb_collage_orders -- 拼单订单表
- * @author linbl
+ * @author yzs 
  */
 @Data
 @Accessors(chain = true)
@@ -22,15 +23,15 @@ public class TbCollageOrders extends Model<TbCollageOrders> implements Serializa
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id
+	 * 序列化版本id 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;	
 	/**
-	 * 此模块对应的表名
+	 * 此模块对应的表名 
 	 */
-	public static final String TABLE_NAME = "tb_collage_orders";
+	public static final String TABLE_NAME = "tb_collage_orders";	
 	/**
-	 * 此模块对应的权限码
+	 * 此模块对应的权限码 
 	 */
 	public static final String PERMISSION_CODE = "tb-collage-orders";
 	public static final String PERMISSION_CODE_ADD = "tb-collage-orders-add";
@@ -42,206 +43,366 @@ public class TbCollageOrders extends Model<TbCollageOrders> implements Serializa
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 拼单订单表主键
+	 * 拼单订单表主键 
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;
+	private Long id;	
 
 	/**
-	 * 贸易区域id
+	 * 贸易区域id 
 	 */
-	private Long tradeAreaId;
+	private Long tradeAreaId;	
 
 	/**
-	 * 贸易区域名称
+	 * 贸易区域名称 
 	 */
-	private String tradeAreaName;
+	private String tradeAreaName;	
 
 	/**
-	 * 订单编号
+	 * 订单编号 
 	 */
-	private String orderNo;
+	private String orderNo;	
 
 	/**
-	 * 合作社ID
+	 * 合作社ID 
 	 */
-	private String cooperativeId;
+	private String cooperativeId;	
 
 	/**
-	 * 合作社名称
+	 * 合作社名称 
 	 */
-	private String cooperativeName;
+	private String cooperativeName;	
 
 	/**
-	 * 总金额
+	 * 总金额 
 	 */
-	private Double totalPrice;
+	private Double totalPrice;	
 
 	/**
-	 * 进境边民确认
+	 * 进境边民确认 
 	 */
-	private String entryPeopleStatus;
+	private String entryPeopleStatus;	
 
 	/**
-	 * 进境组长确认
+	 * 进境组长确认 
 	 */
-	private String entryLeaderStatus;
+	private String entryLeaderStatus;	
 
 	/**
-	 * 进境报关企业确认
+	 * 进境报关企业确认 
 	 */
-	private String entryCustomsStatus;
+	private String entryCustomsStatus;	
 
 	/**
-	 * 进境申报单号
+	 * 进境申报单号 
 	 */
-	private String entryNo;
+	private String entryNo;	
 
 	/**
-	 * 进境申报时间
+	 * 进境申报时间 
 	 */
-	private String entryTime;
+	private Date entryTime;
 
 	/**
-	 * 进境申报结果
+	 * 进境申报结果 
 	 */
-	private String entryResult;
+	private String entryResult;	
 
 	/**
-	 * 进境申报失败理由
+	 * 进境申报失败理由 
 	 */
-	private String entryFailReason;
+	private String entryFailReason;	
 
 	/**
-	 * 订单边民确认
+	 * 订单边民确认 
 	 */
-	private String peopleConfirmStatus;
+	private String peopleConfirmStatus;	
 
 	/**
-	 * 订单边民确认时间
+	 * 订单边民确认时间 
 	 */
 	private Date peopleConfirmTime;
 
 	/**
-	 * 进口边民确认
+	 * 进口组长确认时间 
 	 */
-	private String importPeopleStatus;
+	private Date importLeaderTime;
 
 	/**
-	 * 进口边民确认时间
+	 * 进口边民确认时间 
 	 */
 	private Date importPeopleTime;
 
 	/**
-	 * 进口组长确认
+	 * 进口组长确认 
 	 */
-	private String importLeaderStatus;
+	private String importLeaderStatus;	
 
 	/**
-	 * 进口组长确认时间
+	 * 进口边民确认 
 	 */
-	private Date importLeaderTime;
+	private String importPeopleStatus;	
 
 	/**
-	 * 进口申报单号
+	 * 进口申报单号 
 	 */
-	private String importNo;
+	private String importNo;	
 
 	/**
-	 * 进口申报时间
+	 * 进口申报时间 
 	 */
-	private String importTime;
+	private Date importTime;
 
 	/**
-	 * 是否收货
+	 * 是否收货 
 	 */
-	private String isDelivery;
+	private String isDelivery;	
 
 	/**
-	 * 订单完成状态(0=未完成,1=已完成)
+	 * 订单完成状态(0=未完成,1=已完成) 
 	 */
-	private String orderFinish;
+	private String orderFinish;	
 
 	/**
-	 * 司机ID
+	 * 司机ID 
 	 */
-	private Long driverId;
+	private Long driverId;	
 
 	/**
-	 * 司机名称
+	 * 司机名称 
 	 */
-	private String driverName;
+	private String driverName;	
 
 	/**
-	 * 司机电话
+	 * 司机电话 
 	 */
-	private String driverPhone;
+	private String driverPhone;	
 
 	/**
-	 * 车ID
+	 * 车ID 
 	 */
-	private Long carId;
+	private Long carId;	
 
 	/**
-	 * 车名称
+	 * 车名称 
 	 */
-	private String carType;
+	private String carType;	
 
 	/**
-	 * 车牌号
+	 * 车牌号 
 	 */
-	private String vehiclePlate;
+	private String vehiclePlate;	
 
 	/**
-	 * 装货地址
+	 * 装货地址 
 	 */
-	private String loadingAddress;
+	private String loadingAddress;	
 
 	/**
-	 * 卸货地址
+	 * 卸货地址 
 	 */
-	private String unloadingAddress;
+	private String unloadingAddress;	
 
 	/**
-	 * 创建人编号
+	 * 创建人编号 
 	 */
-	private Long createBy;
+	private Long createBy;	
 
 	/**
-	 * 创建人名称
+	 * 创建人名称 
 	 */
-	private String createName;
+	private String createName;	
 
 	/**
-	 * 创建时间
+	 * 创建时间 
 	 */
 	private Date createTime;
 
 	/**
-	 * 更新人编号
+	 * 更新人编号 
 	 */
-	private Long updateBy;
+	private Long updateBy;	
 
 	/**
-	 * 更新人名称
+	 * 更新人名称 
 	 */
-	private String updateName;
+	private String updateName;	
 
 	/**
-	 * 更新时间
+	 * 更新时间 
 	 */
 	private Date updateTime;
 
 	/**
-	 * 删除状态(0=禁用,1=启用)
+	 * 删除状态(0=禁用,1=启用) 
+	 */
+	private Integer deleteStatus;
+
+	/**
+	 * 预申报编号 
+	 */
+	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 deleteStatus;
+	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 Date 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 Integer finishStatus;	
 
 
 
 
 
+	
 
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_collage_orders/TbCollageOrdersMapper.xml

@@ -6,18 +6,18 @@
 
 
 	<!-- ================================== 查询相关 ================================== -->
-	<!-- select id, trade_area_id, trade_area_name, order_no, cooperative_id, cooperative_name, total_price, entry_people_status, entry_leader_status, entry_customs_status, entry_no, entry_time, entry_result, entry_fail_reason, import_people_status, import_leader_status, import_no, import_time, is_delivery, order_finish, driver_id, driver_name, driver_phone, car_id, car_type, vehicle_plate, loading_address, unloading_address, create_by, create_name, create_time, update_by, update_name, update_time, delete_status from tb_collage_orders  -->
-
+	<!-- select id, trade_area_id, trade_area_name, order_no, cooperative_id, cooperative_name, total_price, entry_people_status, entry_leader_status, entry_customs_status, entry_no, entry_time, entry_result, entry_fail_reason, people_confirm_status, people_confirm_time, import_leader_time, import_people_time, import_leader_status, import_people_status, import_no, import_time, is_delivery, order_finish, driver_id, driver_name, driver_phone, car_id, car_type, vehicle_plate, loading_address, unloading_address, create_by, create_name, create_time, update_by, update_name, update_time, delete_status, 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, finish_status from tb_collage_orders  -->
+	
 	<!-- 通用映射：自动模式 -->
 	<resultMap id="model" autoMapping="true" type="com.pj.tb_collage_orders.TbCollageOrders"></resultMap>
-
+	
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select *
-		from tb_collage_orders
+		select * 
+		from tb_collage_orders 
 	</sql>
 
-
+	
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
@@ -36,8 +36,12 @@
 			<if test=' this.has("entryTime") '> and entry_time = #{entryTime} </if>
 			<if test=' this.has("entryResult") '> and entry_result = #{entryResult} </if>
 			<if test=' this.has("entryFailReason") '> and entry_fail_reason = #{entryFailReason} </if>
-			<if test=' this.has("importPeopleStatus") '> and import_people_status = #{importPeopleStatus} </if>
+			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
+			<if test=' this.has("peopleConfirmTime") '> and people_confirm_time = #{peopleConfirmTime} </if>
+			<if test=' this.has("importLeaderTime") '> and import_leader_time = #{importLeaderTime} </if>
+			<if test=' this.has("importPeopleTime") '> and import_people_time = #{importPeopleTime} </if>
 			<if test=' this.has("importLeaderStatus") '> and import_leader_status = #{importLeaderStatus} </if>
+			<if test=' this.has("importPeopleStatus") '> and import_people_status = #{importPeopleStatus} </if>
 			<if test=' this.has("importNo") '> and import_no = #{importNo} </if>
 			<if test=' this.has("importTime") '> and import_time = #{importTime} </if>
 			<if test=' this.has("isDelivery") '> and is_delivery = #{isDelivery} </if>
@@ -57,7 +61,38 @@
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
-			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
+			<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("finishStatus") '> and finish_status = #{finishStatus} </if>
 		</where>
 		order by
 		<choose>
@@ -75,38 +110,74 @@
 			<when test='sortType == 12'> entry_time desc </when>
 			<when test='sortType == 13'> entry_result desc </when>
 			<when test='sortType == 14'> entry_fail_reason desc </when>
-			<when test='sortType == 15'> import_people_status desc </when>
-			<when test='sortType == 16'> import_leader_status desc </when>
-			<when test='sortType == 17'> import_no desc </when>
-			<when test='sortType == 18'> import_time desc </when>
-			<when test='sortType == 19'> is_delivery desc </when>
-			<when test='sortType == 20'> order_finish desc </when>
-			<when test='sortType == 21'> driver_id desc </when>
-			<when test='sortType == 22'> driver_name desc </when>
-			<when test='sortType == 23'> driver_phone desc </when>
-			<when test='sortType == 24'> car_id desc </when>
-			<when test='sortType == 25'> car_type desc </when>
-			<when test='sortType == 26'> vehicle_plate desc </when>
-			<when test='sortType == 27'> loading_address desc </when>
-			<when test='sortType == 28'> unloading_address desc </when>
-			<when test='sortType == 29'> create_by desc </when>
-			<when test='sortType == 30'> create_name desc </when>
-			<when test='sortType == 31'> create_time desc </when>
-			<when test='sortType == 32'> update_by desc </when>
-			<when test='sortType == 33'> update_name desc </when>
-			<when test='sortType == 34'> update_time desc </when>
-			<when test='sortType == 35'> delete_status desc </when>
+			<when test='sortType == 15'> people_confirm_status desc </when>
+			<when test='sortType == 16'> people_confirm_time desc </when>
+			<when test='sortType == 17'> import_leader_time desc </when>
+			<when test='sortType == 18'> import_people_time desc </when>
+			<when test='sortType == 19'> import_leader_status desc </when>
+			<when test='sortType == 20'> import_people_status desc </when>
+			<when test='sortType == 21'> import_no desc </when>
+			<when test='sortType == 22'> import_time desc </when>
+			<when test='sortType == 23'> is_delivery desc </when>
+			<when test='sortType == 24'> order_finish desc </when>
+			<when test='sortType == 25'> driver_id desc </when>
+			<when test='sortType == 26'> driver_name desc </when>
+			<when test='sortType == 27'> driver_phone desc </when>
+			<when test='sortType == 28'> car_id desc </when>
+			<when test='sortType == 29'> car_type desc </when>
+			<when test='sortType == 30'> vehicle_plate desc </when>
+			<when test='sortType == 31'> loading_address desc </when>
+			<when test='sortType == 32'> unloading_address desc </when>
+			<when test='sortType == 33'> create_by desc </when>
+			<when test='sortType == 34'> create_name desc </when>
+			<when test='sortType == 35'> create_time desc </when>
+			<when test='sortType == 36'> update_by desc </when>
+			<when test='sortType == 37'> update_name desc </when>
+			<when test='sortType == 38'> update_time desc </when>
+			<when test='sortType == 39'> delete_status desc </when>
+			<when test='sortType == 40'> plat_seq_no desc </when>
+			<when test='sortType == 41'> declare_id desc </when>
+			<when test='sortType == 42'> declare_type desc </when>
+			<when test='sortType == 43'> declare_name desc </when>
+			<when test='sortType == 44'> idno desc </when>
+			<when test='sortType == 45'> shop_no desc </when>
+			<when test='sortType == 46'> shop_name desc </when>
+			<when test='sortType == 47'> org_putrec_no desc </when>
+			<when test='sortType == 48'> org_name desc </when>
+			<when test='sortType == 49'> org_scc desc </when>
+			<when test='sortType == 50'> ve_no desc </when>
+			<when test='sortType == 51'> btrnb_biz_modecd desc </when>
+			<when test='sortType == 52'> g_flow desc </when>
+			<when test='sortType == 53'> i_e_flag desc </when>
+			<when test='sortType == 54'> field_code desc </when>
+			<when test='sortType == 55'> field_name desc </when>
+			<when test='sortType == 56'> customs_code desc </when>
+			<when test='sortType == 57'> car_pool desc </when>
+			<when test='sortType == 58'> sum_amt desc </when>
+			<when test='sortType == 59'> sum_gross_wt desc </when>
+			<when test='sortType == 60'> sum_net_wt desc </when>
+			<when test='sortType == 61'> traf_mode desc </when>
+			<when test='sortType == 62'> curr_code desc </when>
+			<when test='sortType == 63'> pack_no desc </when>
+			<when test='sortType == 64'> decl_time desc </when>
+			<when test='sortType == 65'> bill_no desc </when>
+			<when test='sortType == 66'> voyage_no desc </when>
+			<when test='sortType == 67'> goods_names desc </when>
+			<when test='sortType == 68'> borders_list desc </when>
+			<when test='sortType == 69'> border_buy_goods_list desc </when>
+			<when test='sortType == 70'> sell_goods_list desc </when>
+			<when test='sortType == 71'> finish_status desc </when>
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>
-
-
-
-
-
-
-
-
-
+	
+	
+	
+	
+	
+	
+	
+	
+	
 
 </mapper>

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

@@ -251,15 +251,6 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private Date peopleConfirmTime;
 
 	/**
-	 * 互助委托申报确认状态
-	 */
-	private String cooperEntrustStatus;
-	/**
-	 * 互助委托申报确认时间
-	 */
-	private String cooperEntrustTime;
-
-	/**
 	 * 边民进口申报确认状态(0=待确认,1=是)
 	 */
 	private Integer applyConfirmStatus;
@@ -369,14 +360,4 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 */
 	private String goodsUnit;
 
-	/**
-	 * 车牌号
-	 */
-	private String veNo;
-
-	/**
-	 * 车航次(班)号
-	 */
-	private String voyageNo;
-
 }

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

@@ -86,7 +86,6 @@
 			<if test=' this.has("peopleConfirmType") '> and people_confirm_type = #{peopleConfirmType} </if>
 			<if test=' this.has("collageOrdersId") '> and collage_orders_id = #{collageOrdersId} </if>
 			<if test=' this.has("applyConfirmStatus") '> and apply_confirm_status = #{applyConfirmStatus} </if>
-			<if test=' this.has("cooperEntrustStatus") '> and cooper_entrust_status = #{cooperEntrustStatus} </if>
 		</where>
 		order by
 		<choose>
@@ -144,10 +143,13 @@
 		</choose>
 	</select>
 
-	<select id="getConfirmStatus" resultMap="com.pj.tb_order.vo.ConfirmVo">
-		select id orderId,people_confirm_status,cooper_entrust_status,apply_confirm_status from tb_order
-		where id = #{orderId}
-	</select>
+
+
+
+
+
+
+
 
 
 </mapper>

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

@@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.client.async_server.AsyncServerInterface;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
-import com.pj.api.dto.MessageDto;
-import com.pj.api.dto.OrderDto;
-import com.pj.api.dto.PeopleDto;
+import com.pj.api.dto.*;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
@@ -505,4 +503,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		return update == 1;
 	}
 
+
+
+
 }