收银端新增会员码提交

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

@@ -1766,6 +1766,7 @@ public class GoodsServiceImpl implements GoodsService {
 
         /*
         * 2. 查询海仓仓库系统，判断库存是否足够
+        * TODO 测试的时候注释，海控仓库系统没有测试环境，上生产时放开注释
         * */
         /*WareQueryStockParamDTO wareQueryStockParamDTO = new WareQueryStockParamDTO();
         List<Criteria> criteriaList = new ArrayList<>();

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

@@ -4240,6 +4240,15 @@ public class OrderServiceImpl implements OrderService {
                     throw new ServiceException(String.format("未知的满赠活动分类类型：【%s,%s】，请联系管理员！", activityTopicEnum.getTopicCode(), activityTopicEnum.getTopicName()));
             }
         });
+
+        // TODO 计算完活动优惠后，计算积分抵扣。
+        String memberCode = calculateOrderDiscountPriceVo.getMemberCode();
+        try {
+            haiKongMemberTemplate.getMemberInfoByCode("{\"code\":" + memberCode + "}");
+        } catch (Exception e) {
+            throw new ServiceException(e);
+        }
+
         return goodsDetailsDtos;
     }
 

kmall-admin/src/main/java/com/kmall/admin/vo/CalculateOrderDiscountPriceVo.java

@@ -12,13 +12,16 @@ public class CalculateOrderDiscountPriceVo {
 
     private String storeId;
 
+    private String memberCode;
+
     private List<GoodsDetailsDto> goodsList;
 
     public CalculateOrderDiscountPriceVo() {
     }
 
-    public CalculateOrderDiscountPriceVo(String storeId, List<GoodsDetailsDto> goodsList) {
+    public CalculateOrderDiscountPriceVo(String storeId, String memberCode, List<GoodsDetailsDto> goodsList) {
         this.storeId = storeId;
+        this.memberCode = memberCode;
         this.goodsList = goodsList;
     }
 
@@ -30,6 +33,14 @@ public class CalculateOrderDiscountPriceVo {
         this.storeId = storeId;
     }
 
+    public String getMemberCode() {
+        return memberCode;
+    }
+
+    public void setMemberCode(String memberCode) {
+        this.memberCode = memberCode;
+    }
+
     public List<GoodsDetailsDto> getGoodsList() {
         return goodsList;
     }

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

@@ -2002,20 +2002,16 @@ function toRefund(){
         });
     })
 }
-// 计算当前购物栏商品优惠价格
+
+/**
+ * 计算当前购物栏商品优惠价格
+ */
 calculateOrderPrice = function() {
-    vm.machineCode = sessionStorage.getItem("machineCode");
-    var cmbCity = $('#cmbCity').val();
-    var cmbProvince = $('#cmbProvince').val();
-    var cmbArea = $('#cmbArea').val();
-    var addrUser = $('#addrUser').val();
-    addrUser = cmbProvince+cmbCity+cmbArea+addrUser;
-    console.log(vm.machineCode);
-    var param = {
+    let param = {
         'storeId': sessionStorage.getItem("storeId"),
+        'memberCode': vm.couponBarCode,
         'goodsList' : vm.goodsList
     };
-
     console.log("请求参数===>" + JSON.stringify(param));
 
     $.ajax({