进口申报单同步修改

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

@@ -25,7 +25,7 @@ public interface LevelOneServerInterface {
 
 
     /** 远程调用 进口申报单同步 */
-    @PostMapping("/TbIportOrder/rpc/importOrderDto")
+    @PostMapping("/TbImportOrder/rpc/importOrderDto")
     public boolean importOrderDto(@RequestBody HtImportOrderDto importOrderDto);
 
     /** 远程调用: 添加大订单时同时生成小订单 */

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

@@ -82,13 +82,13 @@ public class BordersListDto {
     private String preNo;
 
     /** 边民额度序号 */
-    private Integer limitNo;
+    private String limitNo;
 
     /** 商品额度 */
     private Double gLimit;
 
     /** 商品序号 */
-    private Integer gNo;
+    private String gNo;
 
     public String getPreNo() {
         return preNo;
@@ -218,11 +218,11 @@ public class BordersListDto {
         this.finishStatus = finishStatus;
     }
 
-    public Integer getLimitNo() {
+    public String getLimitNo() {
         return limitNo;
     }
 
-    public void setLimitNo(Integer limitNo) {
+    public void setLimitNo(String limitNo) {
         this.limitNo = limitNo;
     }
 
@@ -234,15 +234,15 @@ public class BordersListDto {
         this.gLimit = gLimit;
     }
 
-    public Integer getgNo() {
+    public String getgNo() {
         return gNo;
     }
 
-    public void setgNo(Integer gNo) {
+    public void setgNo(String gNo) {
         this.gNo = gNo;
     }
 
-    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, Integer limitNo, Double gLimit, Integer gNo) {
+    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, String limitNo, Double gLimit, String gNo) {
         this.id = id;
         this.platSeqNo = platSeqNo;
         this.borderName = borderName;

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

@@ -2,15 +2,15 @@ package com.pj.api.dto;
 
 public class HtImportOrderDto {
 
-    private Integer platSeqNo;
+    private String platSeqNo;
     private String preNo;
     private String itrdclDeclareId;
     private String declareId;
     private String declareType;
     private String declareName;
     private String ciphertextIdno;
-    private Integer shopNo;
-    private Integer shopName;
+    private String shopNo;
+    private String shopName;
     private String orgPutrecNo;
     private String orgName;
     private String orgScc;
@@ -53,11 +53,11 @@ public class HtImportOrderDto {
     private String borderPeopleLimitList;
     private String goodsList;
 
-    public Integer getPlatSeqNo() {
+    public String getPlatSeqNo() {
         return platSeqNo;
     }
 
-    public void setPlatSeqNo(Integer platSeqNo) {
+    public void setPlatSeqNo(String platSeqNo) {
         this.platSeqNo = platSeqNo;
     }
 
@@ -109,19 +109,19 @@ public class HtImportOrderDto {
         this.ciphertextIdno = ciphertextIdno;
     }
 
-    public Integer getShopNo() {
+    public String getShopNo() {
         return shopNo;
     }
 
-    public void setShopNo(Integer shopNo) {
+    public void setShopNo(String shopNo) {
         this.shopNo = shopNo;
     }
 
-    public Integer getShopName() {
+    public String getShopName() {
         return shopName;
     }
 
-    public void setShopName(Integer shopName) {
+    public void setShopName(String shopName) {
         this.shopName = shopName;
     }
 
@@ -453,7 +453,7 @@ public class HtImportOrderDto {
         this.goodsList = goodsList;
     }
 
-    public HtImportOrderDto(Integer platSeqNo, String preNo, String itrdclDeclareId, String declareId, String declareType, String declareName, String ciphertextIdno, Integer shopNo, Integer shopName, String orgPutrecNo, String orgName, String orgScc, String veNo, String vehicleType, String btrnbBizModecd, String gFlow, String iEFlag, String fieldCode, String fieldName, String customsCode, String carPool, String note, String sumAmt, String sumGrossWt, String sumNetWt, String trafMode, String currCode, String packNo, String tradeCountry, String mName, String mScc, String shareFlag, String dclType, String mdfblRvkRsn, String borderFlag, String delStatus, String declStatus, String declTime, String rcptTime, String auditRemark, String agentCode, String manifestId, String shopPutrecNo, String borderId, String msgId, String entCode, String entName, String borderPeopleList, String borderPeopleLimitList, String goodsList) {
+    public HtImportOrderDto(String platSeqNo, String preNo, String itrdclDeclareId, String declareId, String declareType, String declareName, String ciphertextIdno, String shopNo, String shopName, String orgPutrecNo, String orgName, String orgScc, String veNo, String vehicleType, String btrnbBizModecd, String gFlow, String iEFlag, String fieldCode, String fieldName, String customsCode, String carPool, String note, String sumAmt, String sumGrossWt, String sumNetWt, String trafMode, String currCode, String packNo, String tradeCountry, String mName, String mScc, String shareFlag, String dclType, String mdfblRvkRsn, String borderFlag, String delStatus, String declStatus, String declTime, String rcptTime, String auditRemark, String agentCode, String manifestId, String shopPutrecNo, String borderId, String msgId, String entCode, String entName, String borderPeopleList, String borderPeopleLimitList, String goodsList) {
         this.platSeqNo = platSeqNo;
         this.preNo = preNo;
         this.itrdclDeclareId = itrdclDeclareId;
@@ -505,4 +505,7 @@ public class HtImportOrderDto {
         this.borderPeopleLimitList = borderPeopleLimitList;
         this.goodsList = goodsList;
     }
+
+    public HtImportOrderDto() {
+    }
 }

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

@@ -100,7 +100,8 @@ public class HtByteTask {
 //        asyncServerInterface.sendLevelOneOrderDto(orderDtoById, DataType.DATA_TYPE_ONE.getCode());
         /*  测试mq */
         //扫描表内是否有待处理任务
-        List<HtByte> byteList = htByteMapper.selectList(new LambdaQueryWrapper<HtByte>().eq(HtByte::getFinishStatus, FinishStatus.FINISH_STATUS_ZERO.getCode()));
+        List<HtByte> byteList = htByteMapper.selectList(
+                new LambdaQueryWrapper<HtByte>().eq(HtByte::getFinishStatus, FinishStatus.FINISH_STATUS_ZERO.getCode()).orderByAsc(HtByte::getDataType));
         //判断是否有任务,没有则返回
         if (byteList.size() == 0) {
             System.err.println("\n  ---  暂无待处理任务。" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n");
@@ -234,11 +235,11 @@ public class HtByteTask {
                 case "008":
                     HtImportOrderDto importOrderDto = JSONObject.parseObject(body, HtImportOrderDto.class);
                     boolean result = FeignFactory.levelOneServerInterface.importOrderDto(importOrderDto);
-                    methodHtByteTask.updateHtByteInfo(flag, item, dataDto);
+                    methodHtByteTask.updateHtByteInfo(result, item, dataDto);
                     if(result){
                         System.err.println("\n进口申报单同步处理成功。 messageId = " + item.getMessageId() + "\n");
                     }else {
-                        System.err.println("\n进口申报单同步处理成功。 messageId = " + item.getMessageId() + "\n");
+                        System.err.println("\n进口申报单同步处理失败。 messageId = " + item.getMessageId() + "\n");
                     }
                     break;
                 case "009":

sp-service/level-one-server/src/main/java/com/pj/tb_import_goods/TbImportGoods.java

@@ -55,7 +55,7 @@ public class TbImportGoods extends Model<TbImportGoods> implements Serializable
 	/**
 	 * 商品序号
 	 */
-	private Integer gNo;
+	private String gNo;
 
 	/**
 	 * 商品编码

sp-service/level-one-server/src/main/java/com/pj/tb_import_order/TbImportOrder.java

@@ -47,15 +47,15 @@ public class TbImportOrder extends Model<TbImportOrder> implements Serializable
 	@TableId(type = IdType.AUTO)
 	private Long id;
 
-	private Integer platSeqNo;
+	private String platSeqNo;
 	private String preNo;
 	private String itrdclDeclareId;
 	private String declareId;
 	private String declareType;
 	private String declareName;
 	private String ciphertextIdno;
-	private Integer shopNo;
-	private Integer shopName;
+	private String shopNo;
+	private String shopName;
 	private String orgPutrecNo;
 	private String orgName;
 	private String orgScc;

sp-service/level-one-server/src/main/java/com/pj/tb_import_order/TbImportOrderService.java

@@ -97,7 +97,7 @@ public class TbImportOrderService extends ServiceImpl<TbImportOrderMapper, TbImp
 		BeanUtils.copyProperties(importOrderDto, importOrder);
 		boolean save = save(importOrder);
 		long importOrderId = SP.publicMapper.getPrimarykey();
-		if(true == save) {
+		if(save) {
 			//委托边民额度
 			List<HtIeportDeclBillsBpLimitDto> ieportDeclBillsBpLimitDtoList = JSON.parseArray(importOrderDto.getBorderPeopleLimitList(), HtIeportDeclBillsBpLimitDto.class);
 			ieportDeclBillsBpLimitDtoList.forEach(ieportDeclBillsBpLimitDto -> {
@@ -105,7 +105,7 @@ public class TbImportOrderService extends ServiceImpl<TbImportOrderMapper, TbImp
 				wrapper.set(TbOrder::getLimitNo, ieportDeclBillsBpLimitDto.getLimitNo());
 				wrapper.set(TbOrder::getGLimit, ieportDeclBillsBpLimitDto.getgLimit());
 				wrapper.set(TbOrder::getGNo, ieportDeclBillsBpLimitDto.getgNo());
-				wrapper.set(TbOrder::getImportOrderId, importOrder);
+				wrapper.set(TbOrder::getImportOrderId, importOrderId);
 				wrapper.eq(TbOrder::getPreIeportNo, ieportDeclBillsBpLimitDto.getPlatSeqNo());
 				boolean update = tbOrderService.update(wrapper);
 			});

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

@@ -459,7 +459,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 边民额度序号
 	 */
-	private Integer limitNo;
+	private String limitNo;
 
 	/**
 	 * 商品额度
@@ -469,7 +469,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 商品序号
 	 */
-	private Integer gNo;
+	private String gNo;
 
 	/**
 	 * 进口申报单Id