收银界面显示会员信息

kmall-admin/src/main/java/com/kmall/admin/haikong/vo/CalculateOrderDiscountPriceResponseVO.java

@@ -19,6 +19,16 @@ public class CalculateOrderDiscountPriceResponseVO {
     private String memberPhone;
 
     /**
+     * 会员当前可用积分
+     */
+    private Integer memberCurrentAvailableScore;
+
+    /**
+     * 会员等级名称
+     */
+    private String levelName;
+
+    /**
      * 抵扣积分
      */
     private Integer deductionScore;
@@ -121,11 +131,29 @@ public class CalculateOrderDiscountPriceResponseVO {
         this.openId = openId;
     }
 
+    public Integer getMemberCurrentAvailableScore() {
+        return memberCurrentAvailableScore;
+    }
+
+    public void setMemberCurrentAvailableScore(Integer memberCurrentAvailableScore) {
+        this.memberCurrentAvailableScore = memberCurrentAvailableScore;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
     @Override
     public String toString() {
         return "CalculateOrderDiscountPriceResponseVO{" +
                 "orderTotalPrice=" + orderTotalPrice +
                 ", memberCode='" + memberCode + '\'' +
+                ", memberCurrentAvailableScore='" + memberCurrentAvailableScore + '\'' +
+                ", levelName='" + levelName + '\'' +
                 ", memberPhone='" + memberPhone + '\'' +
                 ", deductionScore=" + deductionScore +
                 ", scoreDeductionPrice=" + scoreDeductionPrice +

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -4614,7 +4614,9 @@ public class OrderServiceImpl implements OrderService {
         }
         calculateOrderDiscountPriceResponseVO.setOrderTotalPrice(orderTotalPrice);
         calculateOrderDiscountPriceResponseVO.setGoodsDetailsDtos(goodsDetailsDtos);
-
+        calculateOrderDiscountPriceResponseVO.setLevelName("无");
+        calculateOrderDiscountPriceResponseVO.setMemberCurrentAvailableScore(0);
+        calculateOrderDiscountPriceResponseVO.setDeductionScore(0);
 
         // 计算完活动优惠后，计算积分抵扣。（活动与积分抵扣不互斥）
         if (!org.springframework.util.StringUtils.isEmpty(memberCode)) {
@@ -4644,6 +4646,8 @@ public class OrderServiceImpl implements OrderService {
                 // 查询会员表
                 calculateOrderDiscountPriceResponseVO.setOpenId(memberInfoDTO.getOpenId());
                 calculateOrderDiscountPriceResponseVO.setMemberPhone(memberInfoDTO.getPhone());
+                calculateOrderDiscountPriceResponseVO.setMemberCurrentAvailableScore(memberInfoDTO.getScore());
+                calculateOrderDiscountPriceResponseVO.setLevelName(memberInfoDTO.getLevelName());
                 UserEntity userEntity = userService.queryByOpenId(memberInfoDTO.getOpenId());
                 String openId = memberInfoDTO.getOpenId();
                 if (Objects.isNull(userEntity)) {

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -212,6 +212,11 @@
                             <li><h3 style="border: white;padding: 8px">实际支付价:{{actualPrice}}</h3></li>
                             <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px">满减:{{showReduceMoney}}</h3></li>
                         </ul>
+                        <ul>
+                            <li><h3 style="border: white;padding: 8px;">会员当前积分:{{memberCurrentAvailableScore}}</h3></li>
+                            <li><h3 style="border: white;padding: 8px;">抵扣积分:{{deductionScore}}</h3></li>
+                            <li><h3 style="border: white;padding: 8px;">会员等级:{{levelName}}</h3></li>
+                        </ul>
                     </li>
                     <li  style="height: 100px;">
                         <i-button type="error" @click="clearGoodsList" class="goods-button"><i class="fa fa-pencil-square-o"></i>&nbsp;清空</i-button>

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -598,6 +598,10 @@ let vm = new Vue({
         memberPhone: '',
         // 订单抵扣积分
         deductionScore: '',
+        // 会员可用积分
+        memberCurrentAvailableScore: 0,
+        // 会员等级名称
+        levelName: '无',
         // 积分抵扣金额
         scoreDeductionPrice: '',
         // 积分抵扣金额
@@ -2114,6 +2118,8 @@ calculateOrderPrice = function() {
                 vm.memberPhone = r.data.memberPhone;
                 vm.openId = r.data.openId;
                 vm.deductionScore = r.data.deductionScore;
+                vm.memberCurrentAvailableScore = r.data.memberCurrentAvailableScore;
+                vm.levelName = r.data.levelName;
                 vm.scoreDeductionPrice = r.data.scoreDeductionPrice;
                 vm.scoreLimit = r.data.scoreLimit;
                 vm.beforeScore = r.data.beforeScore;