积分扣减

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/manager/CustomerDTO2BOAdapter.java

@@ -27,7 +27,7 @@ public class CustomerDTO2BOAdapter {
 
     public UserScoreUserDetailBO convert2UserScoreUserDetailBO(GetUserScoreUserDetailResponse dto) {
 
-        UserScoreUserDetailBO bo = BeanUtil.convertBean(dto, UserScoreUserDetailBO::new);
+        UserScoreUserDetailBO bo = BeanUtil.convertBean(dto.getResult(), UserScoreUserDetailBO::new);
         return bo;
     }
 

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

@@ -538,6 +538,8 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
         if(scoreReduceBO != null){
             shoppingCartGoodsBO.setScoreReduceAmount(scoreReduceBO.getReduceAmount() == null ? 0 : scoreReduceBO.getReduceAmount().longValue());
             shoppingCartGoodsBO.setReduceScore(scoreReduceBO.getUseScore() == null ? 0 : scoreReduceBO.getUseScore().longValue());
+            totalDiscountAmount += scoreReduceBO.getDiscountAmount();
+            totalAmount -= scoreReduceBO.getDiscountAmount();
         }
 
         // 购买会员卡
@@ -872,6 +874,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
             scoreReduce.setUseScore(getValue(userScoreUseDetail.getUseScore()));
             scoreReduce.setScoreState(userScoreUseDetail.getScoreState());
             scoreReduce.setScoreReduceRate(userScoreUseDetail.getScoreReduceRate());
+            scoreReduce.setDiscountAmount(discountAmount);
         } else {
             scoreReduce = null;
         }