添加拼多多/京东的订单

admin

2019-07-31 f253c6f0ce5e708850f8e3c84a6a9008fc37df5f

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -621,7 +621,7 @@
         // 查询是否有免单计划

         BigDecimal mianDanMoney = null;

         if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {

            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,

            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(),

                  commonOrder.getOrderNo());

            if (orderList != null && orderList.size() == 1) {// 只有1个订单才参与免单

               BigDecimal payMent = commonOrder.getPayment();