Merge branch 'hotfix/20191230_微信数据上报未支付订单不上传' into develop

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -91,10 +91,6 @@ public class OrderCallBackMQService {
             ErrorLog.infoConvertJson(context.getEnvironment().getProperty("spring.application.name"), LogThreadLocal.getTrackingNo(), this.getClass(), "parseObjectOrderInfoReqsError", ex);
             return null;
         }
-        // 未支付订单不通知开放平台
-        if (ObjectUtils.equals(1, orderInfoReqs.getPayState()) || ObjectUtils.equals(NewOrderStatus.PENDING_PAYMENT.getIndex(), orderInfoReqs.getOrderState())) {
-            return null;
-        }
         return orderInfoReqs;
     }
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -663,7 +663,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             Integer needCardAmount = activityPrice - firstCouponAmount;
             shoppingCartGoodsDto.setMemberCardAmount(needCardAmount);
             shoppingCartGoodsDto.setCardOriginalAmount(baseResponse.getResult().getActivityPrice());
-            shoppingCartGoodsDto.setCardDiscountAmount(baseResponse.getResult().getFirstCouponAmount());
+            shoppingCartGoodsDto.setCardDiscountAmount(firstCouponAmount);
             shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsDto.getOriginalTotalAmount() + activityPrice);
             shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsDto.getTotalAmount() + needCardAmount);
             shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsDto.getTotalDiscountAmount() + firstCouponAmount);