Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java

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

@@ -1151,7 +1151,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         } else {
             ret.setIsPurchaseLogisticsUpdateToPlatform(dsPurchaseSetting.getIsPurchaseLogisticsUpdateToPlatform());
             ret.setDeliveryTimeType(dsPurchaseSetting.getDeliveryTimeType());
-            ret.setIsAutoPay(dsPurchaseSetting.getIsAutoPay() != 0 && isDsAutoPayWhitelist(shopId) ? 1 : 0);
+//            ret.setIsAutoPay(dsPurchaseSetting.getIsAutoPay() != 0 && isDsAutoPayWhitelist(shopId) ? 1 : 0);
+            ret.setIsAutoPay(dsPurchaseSetting.getIsAutoPay() != 0 ? 1 : 0);
             ret.setIsAutoPurchase(dsPurchaseSetting.getIsAutoPurchase() != 0 ? 1 : 0);
             ret.setDelayPurchaseMinute(dsPurchaseSetting.getDelayPurchaseMinute());
             ret.setIsUseForbiddenPurchaseProfit(dsPurchaseSetting.getIsUseForbiddenPurchaseProfit() != 0 ? 1 : 0);

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

@@ -42,6 +42,7 @@
         <include refid="Base_Column_List" />
         from dd_aftersale_msg
         where  msg_id = #{msgId,jdbcType=VARCHAR}
+        limit 1
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

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

@@ -42,6 +42,7 @@
         <include refid="Base_Column_List" />
         from dd_trade_msg
         where  msg_id = #{msgId,jdbcType=VARCHAR}
+        limit 1
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">