优化

ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java

@@ -132,6 +132,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         request.setPlatformOrders(platformOrders);
 
         BatchCreateDistributionOrdersResponseDTO dsResponse = dsApiService.batchCreateDistributionOrders(shopId, request);
+        log.info("dsResponse:" + dsResponse);
         if (!dsResponse.isSuccess()) {
             throw new RuntimeException(dsResponse.getReason());
         }
@@ -325,8 +326,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     private void saveErrorPurchaseOrderDsEncrypt(Long ShopId, BatchCreateDistributionOrdersResponseDTO response) {
         List<PurchaseOrderDsEncrypt> logs = new ArrayList<>();
+        if (response.getErrorList() == null) {
+            return;
+        }
         for (DsErrorRetDTO errorItem: response.getErrorList()) {
-            if (errorItem.getIsEncryptOrder() < 1) {
+            if (errorItem.getIsEncryptOrder() != null && errorItem.getIsEncryptOrder() < 1) {
                 continue;
             }
             PurchaseOrderDsEncrypt log = new PurchaseOrderDsEncrypt();
@@ -358,6 +362,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     private static HashMap<String, String> buildSourceOrderIdAndPayFailReasonMap(BatchCreateDistributionOrdersResponseDTO response) {
         HashMap<String, String> sourceOrderIdAndPayFailReasonMap = new HashMap<>();
+        if (response.getSuccessList() == null) {
+            return sourceOrderIdAndPayFailReasonMap;
+        }
         for (DsSuccessRetDTO successRet: response.getSuccessList()) {
             Map<String, DsPayRetDTO> sourceOrderIdAndPayRetMap = successRet.getPayRet();
             for (Map.Entry<String, DsPayRetDTO> entry: sourceOrderIdAndPayRetMap.entrySet()) {

ms-dal/src/main/resources/mapper/PurchaseOrderDsEncryptMapper.xml

@@ -87,7 +87,7 @@
                 <if test="gmtModified != null">#{gmtModified,jdbcType=TIMESTAMP},</if>
         </trim>
     </insert>
-    <insert id="insertBatch" keyColumn="purchase_order_ds_encrypt_id" keyProperty="purchaseOrderDsEncryptId" parameterType="com.ms.dal.entity.PurchaseOrderDsEncrypt" useGeneratedKeys="true">
+    <insert id="insertBatch" keyColumn="purchase_order_ds_encrypt_id" keyProperty="list.purchaseOrderDsEncryptId" parameterType="java.util.List" useGeneratedKeys="true">
         insert into purchase_order_ds_encrypt
         ( purchase_order_ds_encrypt_id,shop_id,order_id
         ,purchase_order_sn,is_support_encrypt_order,is_encrypt_order
@@ -95,10 +95,10 @@
         ,gmt_modified)
         values
         <foreach item="item" collection="list" separator="," >
-            (#{purchaseOrderDsEncryptId,jdbcType=BIGINT},#{shopId,jdbcType=BIGINT},#{orderId,jdbcType=VARCHAR}
-            ,#{purchaseOrderSn,jdbcType=VARCHAR},#{isSupportEncryptOrder,jdbcType=TINYINT},#{isEncryptOrder,jdbcType=TINYINT}
-            ,#{result,jdbcType=VARCHAR},#{reason,jdbcType=VARCHAR},#{gmtCreate,jdbcType=TIMESTAMP}
-            ,#{gmtModified,jdbcType=TIMESTAMP})
+            (#{item.purchaseOrderDsEncryptId,jdbcType=BIGINT},#{item.shopId,jdbcType=BIGINT},#{item.orderId,jdbcType=VARCHAR}
+            ,#{item.purchaseOrderSn,jdbcType=VARCHAR},#{item.isSupportEncryptOrder,jdbcType=TINYINT},#{item.isEncryptOrder,jdbcType=TINYINT}
+            ,#{item.result,jdbcType=VARCHAR},#{item.reason,jdbcType=VARCHAR},#{item.gmtCreate,jdbcType=TIMESTAMP}
+            ,#{item.gmtModified,jdbcType=TIMESTAMP})
         </foreach>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.ms.dal.entity.PurchaseOrderDsEncrypt">