commit

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.ta.pddserver.entity.CollectOrderSendEntity;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
 import org.ta.pddserver.entity.CollectReceiverDetailEntity;
+import org.ta.pddserver.entity.LogOrderMailDetailEntity;
 import org.ta.pddserver.model.api.request.*;
 import org.ta.pddserver.model.api.response.LogOrderListResponse;
 import org.ta.pddserver.model.api.response.LogOrderMailDetailListResponse;
@@ -141,8 +142,12 @@ public class PddLocalController {
 
         PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
 
-        // 查询orderNO 下所有mailNo,判断是全部还是部分
+        Long status = 0L;
+        Long unStatus = 0L;
 
+        // 查询orderNO 下所有mailNo,判断是全部还是部分
+        Long unNum = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), unStatus);
+        Long num = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), status);
 
         notifyRequest.setProviderCode(PROVIDER_CODE);
         notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
@@ -150,7 +155,7 @@ public class PddLocalController {
         notifyRequest.setTimeZone("UTC+8");
 
         notifyRequest.setStatus("FULL_INBOUND");
-        notifyRequest.setPackageQuantity(1L); // 已入库数量 + 1
+        notifyRequest.setPackageQuantity(num + 1); // 已入库数量 + 1
 
         notifyRequest.setPackageInfo(new PddServiceConsoInboundRequest.PackageInfo());
         notifyRequest.getPackageInfo().setMailNo(mailNoResponse.getMailNo());
@@ -175,6 +180,8 @@ public class PddLocalController {
         requestModel.setTimestamp(time);
         requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
         String resp = PddHttpTool.sendJsonPost(requestModel);
+
+        //更新入库包裹状态
     }
 
     /*收到拆包通知后 完成拆包*/

PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderMailDetailMapper.java

@@ -28,4 +28,7 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
 
     @Update("UPDATE `log_order_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo};")
     Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("action") String action);
+
+    @Select("SELECT COUNT(*) FROM  `log_order_mail_detail` WHERE `logisticsOrderCode` = #{logisticsOrderCode} AND `status` = ${status};")
+    Long getSumByCodeStatus(@Param("logisticsOrderCode") String logisticsOrderCode, @Param("status") Long status);
 }

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailImpl.java

@@ -34,4 +34,10 @@ public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper
     public MailNoResponse getInfoByMailNo(String mailNo, String status) {
         return baseMapper.getInfoByMailNo(mailNo, status);
     }
+
+
+
+    public Long getSumByCodeStatus(String logisticsOrderCode, Long status) {
+        return baseMapper.getSumByCodeStatus(logisticsOrderCode, status);
+    }
 }
\ No newline at end of file