Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -265,7 +265,7 @@ public class OrderSdkAdapter {
         request.setWeight(orderWeight);
 
         // 买一赠一寄件信息
-        if(requestVO.getChooseGoods() != null || !requestVO.getChooseGoods().isEmpty()){
+        if(requestVO.getChooseGoods() != null && !requestVO.getChooseGoods().isEmpty()){
             request.setChooseGoods(JSONArray.parseArray(JSONObject.toJSONString(requestVO.getChooseGoods()), CreateOrderRequest.ChooseGood.class));
         }
 

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -316,7 +316,7 @@ public class OrderAdapter {
         // createOrderDto.setOtherInfo(getOrderOtherInfo(shoppingCartGoodsDto));
 
         // 买一赠一寄件信息
-        if(createOrderVo.getChooseGoods() != null || !createOrderVo.getChooseGoods().isEmpty()){
+        if(createOrderVo.getChooseGoods() != null && !createOrderVo.getChooseGoods().isEmpty()){
             createOrderDto.setChooseGoods(JSONArray.parseArray(JSONObject.toJSONString(createOrderVo.getChooseGoods()), BaseCreateOrderRequest.ChooseGood.class));
         }
         return createOrderDto;