Merge branch 'feature/haikong-20211122' of lhm/kmall-haikong into feature/haikong-20211122

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1,17 +1,15 @@
 package com.kmall.admin.controller;
 
-import com.kmall.admin.dto.GoodsDetailsDto;
 import com.kmall.admin.dto.OrderExpressDto;
-import com.kmall.admin.dto.QueryOrderDto;
 import com.kmall.admin.dto.SystemFormatDto;
 import com.kmall.admin.entity.*;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
-import com.kmall.admin.haikong.vo.QueryGoodsVo;
+import com.kmall.admin.haikong.vo.CalculateOrderDiscountPriceResponseVO;
 import com.kmall.admin.service.*;
 import com.kmall.admin.utils.CalculateTax;
 import com.kmall.admin.utils.ParamUtils;
 import com.kmall.admin.utils.ShiroUtils;
-import com.kmall.admin.vo.CalculateOrderDiscountPriceVo;
+import com.kmall.admin.haikong.vo.CalculateOrderDiscountPriceVO;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.constant.JxlsXmlTemplateName;
 import com.kmall.common.utils.*;
@@ -34,7 +32,6 @@ import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -1367,11 +1364,11 @@ public class OrderController {
     }
 
     @PostMapping("/calculateOrderDiscountPrice")
-    public R calculateOrderDiscountPrice(@RequestBody CalculateOrderDiscountPriceVo calculateOrderDiscountPriceVo) {
+    public R calculateOrderDiscountPrice(@RequestBody CalculateOrderDiscountPriceVO calculateOrderDiscountPriceVo) {
 
         try {
-            List<GoodsDetailsDto> queryGoodsVos = orderService.calculateOrderDiscountPrice(calculateOrderDiscountPriceVo);
-            return R.ok().put("goodsList", queryGoodsVos);
+            CalculateOrderDiscountPriceResponseVO calculateOrderDiscountPriceResponseVO = orderService.calculateOrderDiscountPrice(calculateOrderDiscountPriceVo);
+            return R.ok().put("data", calculateOrderDiscountPriceResponseVO);
         } catch (Exception e) {
             return R.error("计算出错！请联系管理员！" + e.getMessage());
         }

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsDao.java

@@ -3,7 +3,7 @@ package com.kmall.admin.dao;
 import com.kmall.admin.dto.GoodsDetailsDto;
 import com.kmall.admin.dto.GoodsPanoramaDto;
 import com.kmall.admin.entity.GoodsEntity;
-import com.kmall.admin.haikong.vo.QueryGoodsVo;
+import com.kmall.admin.haikong.vo.QueryGoodsVO;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
@@ -110,10 +110,10 @@ public interface GoodsDao extends BaseDao<GoodsEntity> {
     /**
      * 查询库存及sku的信息，查询出来的库存是门店的库存
      *
-     * @param queryGoodsVoList 查询条件，包含商品条码、sku、门店id
+     * @param queryGoodsVOList 查询条件，包含商品条码、sku、门店id
      * @return 商品信息
      */
-    List<GoodsEntity> queryGoodsStockByQueryGoodsVoList(List<QueryGoodsVo> queryGoodsVoList);
+    List<GoodsEntity> queryGoodsStockByQueryGoodsVoList(List<QueryGoodsVO> queryGoodsVOList);
 
     /**
      * 根据产品条码和sku查询保税展示补货的商品

kmall-admin/src/main/java/com/kmall/admin/entity/GoodsEntity.java

@@ -1,6 +1,6 @@
 package com.kmall.admin.entity;
 
-import com.kmall.admin.haikong.vo.QueryGoodsVo;
+import com.kmall.admin.haikong.vo.QueryGoodsVO;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
@@ -282,7 +282,7 @@ public class GoodsEntity implements Serializable {
     public GoodsEntity() {
     }
 
-    public GoodsEntity(QueryGoodsVo queryGoodsVo) {
+    public GoodsEntity(QueryGoodsVO queryGoodsVo) {
         BeanUtils.copyProperties(this, queryGoodsVo);
         this.goodsNumber = queryGoodsVo.getSellVolume();
     }

kmall-admin/src/main/java/com/kmall/admin/haikong/constant/Constants.java

@@ -19,24 +19,27 @@ public class Constants {
         /**
          * 满赠活动
          */
-        MZ("mz", "满赠"),
+        MZ("mz", "满赠", 3),
         /**
          * 限时特价活动
          */
-        LSCX("lscx", "限时特价"),
+        LSCX("lscx", "限时特价", 1),
         /**
          * 优惠券活动
          */
-        YHJ("yhj", "优惠券")
+        YHJ("yhj", "优惠券", 5)
         ;
 
         private final String topicCode;
 
         private final String topicName;
 
-        ActivityTopicEnum(String topicCode, String topicName) {
+        private final Integer priority;
+
+        ActivityTopicEnum(String topicCode, String topicName, Integer priority) {
             this.topicCode = topicCode;
             this.topicName = topicName;
+            this.priority = priority;
         }
 
         public String getTopicCode() {
@@ -46,6 +49,10 @@ public class Constants {
         public String getTopicName() {
             return topicName;
         }
+
+        public Integer getPriority() {
+            return priority;
+        }
     }
 
     /**

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

@@ -0,0 +1,42 @@
+package com.kmall.admin.haikong.vo;
+
+import com.kmall.admin.dto.GoodsDetailsDto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 计算优惠后价格响应类
+ * @author lhm
+ * @createDate 2021-11-22
+ */
+public class CalculateOrderDiscountPriceResponseVO {
+
+    private BigDecimal orderTotalPrice;
+
+    private List<GoodsDetailsDto> goodsDetailsDtos;
+
+    public BigDecimal getOrderTotalPrice() {
+        return orderTotalPrice;
+    }
+
+    public void setOrderTotalPrice(BigDecimal orderTotalPrice) {
+        this.orderTotalPrice = orderTotalPrice;
+    }
+
+    public List<GoodsDetailsDto> getGoodsDetailsDtos() {
+        return goodsDetailsDtos;
+    }
+
+    public void setGoodsDetailsDtos(List<GoodsDetailsDto> goodsDetailsDtos) {
+        this.goodsDetailsDtos = goodsDetailsDtos;
+    }
+
+    @Override
+    public String toString() {
+        return "CalculateOrderDiscountPriceResponseVO{" +
+                "orderTotalPrice=" + orderTotalPrice +
+                ", goodsDetailsDtos=" + goodsDetailsDtos +
+                '}';
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/vo/CalculateOrderDiscountPriceVo.java → kmall-admin/src/main/java/com/kmall/admin/haikong/vo/CalculateOrderDiscountPriceVO.java

@@ -1,14 +1,15 @@
-package com.kmall.admin.vo;
+package com.kmall.admin.haikong.vo;
 
 import com.kmall.admin.dto.GoodsDetailsDto;
 
 import java.util.List;
 
 /**
+ * 计算优惠后价格请求参数
  * @author lhm
  * @createDate 2021-11-19
  */
-public class CalculateOrderDiscountPriceVo {
+public class CalculateOrderDiscountPriceVO {
 
     private String storeId;
 
@@ -16,10 +17,10 @@ public class CalculateOrderDiscountPriceVo {
 
     private List<GoodsDetailsDto> goodsList;
 
-    public CalculateOrderDiscountPriceVo() {
+    public CalculateOrderDiscountPriceVO() {
     }
 
-    public CalculateOrderDiscountPriceVo(String storeId, String memberCode, List<GoodsDetailsDto> goodsList) {
+    public CalculateOrderDiscountPriceVO(String storeId, String memberCode, List<GoodsDetailsDto> goodsList) {
         this.storeId = storeId;
         this.memberCode = memberCode;
         this.goodsList = goodsList;
@@ -48,4 +49,13 @@ public class CalculateOrderDiscountPriceVo {
     public void setGoodsList(List<GoodsDetailsDto> goodsList) {
         this.goodsList = goodsList;
     }
+
+    @Override
+    public String toString() {
+        return "CalculateOrderDiscountPriceVO{" +
+                "storeId='" + storeId + '\'' +
+                ", memberCode='" + memberCode + '\'' +
+                ", goodsList=" + goodsList +
+                '}';
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/haikong/vo/QueryGoodsVo.java → kmall-admin/src/main/java/com/kmall/admin/haikong/vo/QueryGoodsVO.java

@@ -8,7 +8,7 @@ import java.util.Objects;
  * @author lhm
  * @createDate 2021-11-15
  */
-public class QueryGoodsVo {
+public class QueryGoodsVO {
 
     /**
      * 商品条码
@@ -311,7 +311,7 @@ public class QueryGoodsVo {
 
     @Override
     public String toString() {
-        return "QueryGoodsVo{" +
+        return "QueryGoodsVO{" +
                 "prodBarcode='" + prodBarcode + '\'' +
                 ", sku='" + sku + '\'' +
                 ", storeId=" + storeId +
@@ -356,7 +356,7 @@ public class QueryGoodsVo {
         if (Objects.isNull(obj)) {
             return false;
         }
-        if (obj instanceof QueryGoodsVo) {
+        if (obj instanceof QueryGoodsVO) {
             return this.hashCode() == obj.hashCode();
         }
         return false;

kmall-admin/src/main/java/com/kmall/admin/service/GoodsService.java

@@ -6,7 +6,7 @@ import com.kmall.admin.dto.GoodsPanoramaDto;
 import com.kmall.admin.entity.GoodsEntity;
 import com.kmall.admin.entity.TaxErrorRecordEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
-import com.kmall.admin.haikong.vo.QueryGoodsVo;
+import com.kmall.admin.haikong.vo.QueryGoodsVO;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 
 import java.util.List;
@@ -231,10 +231,10 @@ public interface GoodsService {
 
     /**
      * 查询库存及sku的信息，查询出来的库存是门店的库存
-     * @param queryGoodsVoList 查询条件，包含商品条码、sku、门店id
+     * @param queryGoodsVOList 查询条件，包含商品条码、sku、门店id
      * @return              商品信息
      */
-    List<GoodsEntity> queryGoodsStockByQueryGoodsVoList(List<QueryGoodsVo> queryGoodsVoList);
+    List<GoodsEntity> queryGoodsStockByQueryGoodsVoList(List<QueryGoodsVO> queryGoodsVOList);
 
     /**
      * 根据产品条码和sku查询保税展示补货的商品

kmall-admin/src/main/java/com/kmall/admin/service/OrderService.java

@@ -3,8 +3,8 @@ package com.kmall.admin.service;
 import com.kmall.admin.dto.*;
 import com.kmall.admin.entity.*;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
-import com.kmall.admin.haikong.vo.QueryGoodsVo;
-import com.kmall.admin.vo.CalculateOrderDiscountPriceVo;
+import com.kmall.admin.haikong.vo.CalculateOrderDiscountPriceResponseVO;
+import com.kmall.admin.haikong.vo.CalculateOrderDiscountPriceVO;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
 import com.kmall.manager.manager.alipay.AliPayMicropayApiResult;
@@ -12,7 +12,6 @@ import com.kmall.manager.manager.wechat.wxglobal.dto.WechatGlobalRefundApiResult
 import com.kmall.common.utils.print.ticket.item.Ticket;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import net.sf.json.JSONObject;
-import org.apache.ibatis.annotations.Param;
 
 import java.io.IOException;
 import java.util.List;
@@ -242,7 +241,7 @@ public interface OrderService {
      * @param calculateOrderDiscountPriceVo 请求参数
      * @return  商品集合
      */
-    List<GoodsDetailsDto> calculateOrderDiscountPrice(CalculateOrderDiscountPriceVo calculateOrderDiscountPriceVo);
+    CalculateOrderDiscountPriceResponseVO calculateOrderDiscountPrice(CalculateOrderDiscountPriceVO calculateOrderDiscountPriceVo);
 
     R resendOrderHkMall(String orderSn);
 }

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

@@ -14,10 +14,7 @@ import com.kmall.admin.entity.kmall2eccs.KtoEccsEntity;
 import com.kmall.admin.entity.mk.MkActivitiesEntity;
 import com.kmall.admin.entity.shop.ShopErrorPriceRecordEntity;
 import com.kmall.admin.haikong.client.HaiKongWarehouseTemplate;
-import com.kmall.admin.haikong.dto.Criteria;
-import com.kmall.admin.haikong.dto.WareQueryStockParamDTO;
-import com.kmall.admin.haikong.dto.WareQueryStockResponseDTO;
-import com.kmall.admin.haikong.vo.QueryGoodsVo;
+import com.kmall.admin.haikong.vo.QueryGoodsVO;
 import com.kmall.admin.service.*;
 import com.kmall.admin.service.kmall2eccs.KtoEccsService;
 import com.kmall.admin.service.mk.MkActivitiesService;
@@ -27,12 +24,10 @@ import com.kmall.admin.service.shop.ShopErrorPriceRecordService;
 import com.kmall.admin.utils.CalculateTax;
 import com.kmall.admin.utils.GoodsUtils;
 import com.kmall.admin.utils.ShiroUtils;
-import com.kmall.admin.utils.jackson.JacksonUtil;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.kmall.common.constant.Dict;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.common.utils.*;
-import com.kmall.manager.manager.express.sf.ServiceException;
 import com.kmall.manager.manager.redis.JedisUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,7 +39,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -2463,12 +2457,12 @@ public class GoodsServiceImpl implements GoodsService {
     /**
      * 查询库存及sku的信息，查询出来的库存是门店的库存
      *
-     * @param queryGoodsVoList 查询条件，包含商品条码、sku、门店id
+     * @param queryGoodsVOList 查询条件，包含商品条码、sku、门店id
      * @return 商品信息
      */
     @Override
-    public List<GoodsEntity> queryGoodsStockByQueryGoodsVoList(List<QueryGoodsVo> queryGoodsVoList) {
-        return goodsDao.queryGoodsStockByQueryGoodsVoList(queryGoodsVoList);
+    public List<GoodsEntity> queryGoodsStockByQueryGoodsVoList(List<QueryGoodsVO> queryGoodsVOList) {
+        return goodsDao.queryGoodsStockByQueryGoodsVoList(queryGoodsVOList);
     }
 
     /**

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

@@ -2012,7 +2012,7 @@ function toRefund(){
 calculateOrderPrice = function() {
     let param = {
         'storeId': sessionStorage.getItem("storeId"),
-        'memberCode': vm.couponBarCode,
+        'memberCode': vm.$refs.couponBarCode.value,
         'goodsList' : vm.goodsList
     };
     console.log("请求参数===>" + JSON.stringify(param));
@@ -2024,12 +2024,13 @@ calculateOrderPrice = function() {
         data: JSON.stringify(param),
         success: function (r) {
             if (r.code === 0) {
-                let calGoodsList = r.goodsList;
+                let calGoodsList = r.data.goodsDetailsDtos;
                 // 更新购物栏中数据
                 console.log("返回====>" + JSON.stringify(r));
                 console.log("计算前数据===>" + JSON.stringify(vm.goodsList));
                 vm.goodsList.clear();
                 calGoodsList.forEach(goods => vm.goodsList.push(goods));
+                vm.actualPrice = r.data.orderTotalPrice;
                 console.log("计算后数据===>" + JSON.stringify(calGoodsList));
                 console.log("替换后数据===>" + JSON.stringify(vm.goodsList));