Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of…

Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -662,7 +662,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);