Merge branch 'master' of lhm/kmall-haikong into master

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

@@ -1128,6 +1128,11 @@ public class OrderController {
         List<OrderGoodsEntity> goodsList = orderGoodsService.queryList(map);
 
         BigDecimal tax = new BigDecimal(0);
+        for (OrderGoodsEntity orderGoodsEntity : goodsList) {
+            tax = tax.add(orderGoodsEntity.getTaxPrice());
+        }
+
+        /*BigDecimal tax = new BigDecimal(0);
         for(OrderGoodsEntity orderGoodsEntity : goodsList){
             BigDecimal retailPrice = orderGoodsEntity.getRetailPrice();
             BigDecimal goodsRate = orderGoodsEntity.getGoodsRate();
@@ -1139,17 +1144,17 @@ public class OrderController {
             orderGoodsEntity.setTax(goodsTax);
             tax = tax.add(goodsTax).setScale(2,RoundingMode.HALF_UP);
 //            BigDecimal goodsTax = retailPrice.divide(new BigDecimal(1).add(goodsRate),2,RoundingMode.HALF_DOWN).multiply(goodsRate).multiply(new BigDecimal(number)).setScale(0,RoundingMode.HALF_DOWN);
-        }
+        }*/
         String response = null;
 
-        try {
-            // 查询失败原因
-            String url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/"+orderSn;
-            // 同步访问,返回结果字符串
-            response = OkHttpUtils.post(map, url, "SSL");
-        } catch (Exception e) {
-            logger.error("查询失败。"+e.getMessage());
-        }
+//        try {
+//            // 查询失败原因
+//            String url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/"+orderSn;
+//            // 同步访问,返回结果字符串
+//            response = OkHttpUtils.post(map, url, "SSL");
+//        } catch (Exception e) {
+//            logger.error("查询失败。"+e.getMessage());
+//        }
 
         Map<String,Object> result = new HashMap<>();
         result.put("orderProcessRecordEntity",orderProcessRecordEntity);

kmall-admin/src/main/java/com/kmall/admin/dto/ScoreReductionDTO.java

@@ -16,7 +16,6 @@ public class ScoreReductionDTO implements Serializable {
     private String prodBarcode;
     private String sku;
     private Integer storeId;
-    private BigDecimal scoreLimit;
     private Date deadline;
     private String deadlineStr;
     private String reject;
@@ -45,14 +44,6 @@ public class ScoreReductionDTO implements Serializable {
         this.storeId = storeId;
     }
 
-    public BigDecimal getScoreLimit() {
-        return scoreLimit;
-    }
-
-    public void setScoreLimit(BigDecimal scoreLimit) {
-        this.scoreLimit = scoreLimit;
-    }
-
     public Date getDeadline() {
         return deadline;
     }

kmall-admin/src/main/java/com/kmall/admin/entity/mk/MkActivitiesScoreEntity.java

@@ -32,10 +32,6 @@ public class MkActivitiesScoreEntity implements Serializable {
      */
     private Integer storeId;
     /**
-     * 抵扣比例
-     */
-    private BigDecimal scoreLimit;
-    /**
      * 营销活动编号
      */
     private Long mkaId;
@@ -117,19 +113,6 @@ public class MkActivitiesScoreEntity implements Serializable {
         return storeId;
     }
     /**
-     * 设置：抵扣比例
-     */
-    public void setScoreLimit(BigDecimal scoreLimit) {
-        this.scoreLimit = scoreLimit;
-    }
-
-    /**
-     * 获取：抵扣比例
-     */
-    public BigDecimal getScoreLimit() {
-        return scoreLimit;
-    }
-    /**
      * 设置：营销活动编号
      */
     public void setMkaId(Long mkaId) {

kmall-admin/src/main/java/com/kmall/admin/haikong/config/HaiKongConfig.java

@@ -25,7 +25,6 @@ public class HaiKongConfig {
         haiKongProperties.setMemberUrl(environment.getProperty("haikong.member.url"));
         haiKongProperties.setMemberAppId(environment.getProperty("haikong.member.appId"));
         haiKongProperties.setMemberAppSecret(environment.getProperty("haikong.member.appSecret"));
-        haiKongProperties.setMemberScoreLimit(Integer.parseInt(environment.getProperty("haikong.member.scoreLimit")));
         haiKongProperties.setRetry(Integer.parseInt(environment.getProperty("haikong.retry")));
         haiKongProperties.setVmcconnectUrl(environment.getProperty("haikong.vmcconnect.url"));
         haiKongProperties.setVmcconnectAppId(environment.getProperty("haikong.vmcconnect.appId"));

kmall-admin/src/main/java/com/kmall/admin/haikong/config/HaiKongProperties.java

@@ -13,8 +13,6 @@ public class HaiKongProperties {
 
     private String memberAppSecret;
 
-    private Integer memberScoreLimit;
-
     private Integer retry;
 
     /**
@@ -91,14 +89,6 @@ public class HaiKongProperties {
         this.memberAppSecret = memberAppSecret;
     }
 
-    public Integer getMemberScoreLimit() {
-        return memberScoreLimit;
-    }
-
-    public void setMemberScoreLimit(Integer memberScoreLimit) {
-        this.memberScoreLimit = memberScoreLimit;
-    }
-
     public Integer getRetry() {
         return retry;
     }

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

@@ -19,6 +19,14 @@ public class Constants {
 
     /* --------------------------------------------------redis常量----------------------------------------------- */
 
+    /* --------------------------------------------------系统常量----------------------------------------------- */
+
+    public static final String HAIKONG_MEMBER_SCORE_LIMIT = "HAIKONG_MEMBER_SCORE_LIMIT";
+
+    public static final String HAIKONG_MEMBER_MAX_SCORE_RATIO = "HAIKONG_MEMBER_MAX_SCORE_RATIO";
+
+    /* --------------------------------------------------系统常量----------------------------------------------- */
+
 
     /* --------------------------------------------------支付宝常量----------------------------------------------- */
 

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

@@ -4619,36 +4619,58 @@ public class OrderServiceImpl implements OrderService {
 
         List<MkActivitiesScoreEntity> mkActivitiesScoreEntities = mkActivitiesScoreService.queryActivityInfoByMkaIdList(mkaIdList);
 
-        // 参与了积分抵扣的sku集合
-        List<String> scoreDeductionSkuList = mkActivitiesScoreEntities.stream()
+        if (CollectionUtils.isEmpty(mkActivitiesScoreEntities)) {
+            LOGGER.error("查询积分抵扣活动SKU为空！");
+            throw new ServiceException("查询积分抵扣活动SKU为空！请先导入积分抵扣活动信息！");
+        }
+
+        // 参与了积分抵扣的sku集合，过滤的是参与的sku，如果该list不为空，则默认其余的sku不参与积分抵扣
+        List<String> scoreDeductionAllowSkuList = mkActivitiesScoreEntities.stream()
                 .filter(m -> Constants.RejectStatus.ALLOW.getCode().equals(m.getReject()))
                 .map(MkActivitiesScoreEntity::getSku)
                 .collect(Collectors.toList());
-        // 转换成map，保存参与了积分抵扣活动的sku，积分计算比例的数据，key===>sku，value===>最大抵扣比例
-        Map<String, BigDecimal> skuScoreLimitMap = mkActivitiesScoreEntities.stream()
-                .filter(m -> Constants.RejectStatus.ALLOW.getCode().equals(m.getReject()))
-                .collect(Collectors.toMap(MkActivitiesScoreEntity::getSku, mkActivitiesScoreEntity -> {
-                    BigDecimal scoreLimit = mkActivitiesScoreEntity.getScoreLimit();
-                    if (Objects.isNull(scoreLimit)) {
-                        LOGGER.error("商品：【{}】，未设置最大抵扣比例！请设置后再计算优惠价！", mkActivitiesScoreEntity.getSku());
-                        throw new ServiceException(String.format("商品：【%s】，未设置最大抵扣比例！请设置后再计算优惠价！", mkActivitiesScoreEntity.getSku()));
-                    }
-                    return scoreLimit;
-                }, (k1, k2) -> k2));
+        // 不参与积分抵扣的sku集合，如果该list不为空，则默认其余的sku参与积分抵扣
+        List<String> scoreDeductionRejectSkuList = mkActivitiesScoreEntities.stream()
+                .filter(m -> Constants.RejectStatus.REJECT.getCode().equals(m.getReject()))
+                .map(MkActivitiesScoreEntity::getSku)
+                .collect(Collectors.toList());
+
+        if (!CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && !CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
+            LOGGER.error("积分抵扣表中既有参与又有不参与！与需求不符！");
+            throw new ServiceException("导入的积分抵扣活动商品设置有误！请确保导入的数据中只有参与或者不参与！");
+        }
+        if (CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
+            LOGGER.error("积分抵扣表中无是否参与字段！");
+            throw new ServiceException("导入的积分抵扣活动商品设置有误！导入的活动商品数据中必须有参与或者不参与！");
+        }
+
         // 当前订单中参与了积分抵扣活动的sku总支付金额
         BigDecimal skuTotalPrice = BigDecimal.ZERO;
         for (GoodsDetailsDto goodsDetailsDto : goodsDetailsDtos) {
             String sku = goodsDetailsDto.getGoodsSn();
             if (!promotionSkuList.contains(sku)) {
-                if (scoreDeductionSkuList.contains(sku)) {
-                    BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
-                    skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
+                if (CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && !CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
+                    if (!scoreDeductionRejectSkuList.contains(sku)) {
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
+                        skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
+                    }
+                } else if (!CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
+                    if (scoreDeductionAllowSkuList.contains(sku)) {
+                        BigDecimal skuActualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
+                        skuTotalPrice = skuTotalPrice.add(skuActualPaymentAmount);
+                    }
                 }
             }
         }
         // 2. 计算积分抵扣后的总价格
         if (isCalculateScorePrice.get()) {
-            Integer scoreLimit = haiKongProperties.getMemberScoreLimit();
+            // HAIKONG_MEMBER_SCORE_LIMIT 系统参数，海控平台统一30积分1块钱
+            String scoreLimitStr = sysConfigDao.queryByKey(Constants.HAIKONG_MEMBER_SCORE_LIMIT);
+            if (org.springframework.util.StringUtils.isEmpty(scoreLimitStr)) {
+                LOGGER.error("计算优惠价格时，未设置统一的抵扣规则！");
+                throw new ServiceException(String.format("请先设置统一的积分规则，设置方式：【系统管理】-->【系统参数】，参数名为：【%s】", Constants.HAIKONG_MEMBER_SCORE_LIMIT));
+            }
+            Integer scoreLimit = Integer.parseInt(scoreLimitStr);
             if (score < scoreLimit) {
                 LOGGER.error("用户【{}】的积分数量为：{}，最低需要{}积分才能抵扣！", memberCode, score, scoreLimit);
                 calculateOrderDiscountPriceResponseVO.setAfterScore(score);
@@ -4658,16 +4680,38 @@ public class OrderServiceImpl implements OrderService {
                 int scoreInteger = score % scoreLimit == 0 ? score : score - (score % scoreLimit);
                 // 过滤掉参与过限时特价并且与积分抵扣互斥的sku，以及未参加积分抵扣活动的sku
                 goodsDetailsDtos = goodsDetailsDtos.stream().filter(goodsDetailsDto -> {
-                    if (!promotionSkuList.contains(goodsDetailsDto.getSku()) && scoreDeductionSkuList.contains(goodsDetailsDto.getSku())) {
-                        return true;
+                    String sku = goodsDetailsDto.getSku();
+                    if (!promotionSkuList.contains(sku)) {
+                        // 如果导入的商品都为不参与，则其余的商品都默认参与积分抵扣活动
+                        if (CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && !CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
+                            if (!scoreDeductionRejectSkuList.contains(sku)) {
+                                return true;
+                            }
+                        // 如果导入的商品都为参与，则默认其余商品不参与
+                        } else if (!CollectionUtils.isEmpty(scoreDeductionAllowSkuList) && CollectionUtils.isEmpty(scoreDeductionRejectSkuList)) {
+                            if (scoreDeductionAllowSkuList.contains(sku)) {
+                                return true;
+                            }
+                        }
                     }
                     // 满赠商品不参与积分分摊计算
                     return !Constants.ActivityTopicEnum.MZ.getTopicName().equals(goodsDetailsDto.getActivity());
                 }).collect(Collectors.toList());
+                // 系统设置的最大抵扣比例（最多能抵扣订单金额的比例），在系统管理的系统参数中设置，KEY为 HAIKONG_MEMBER_MAX_SCORE_RATIO
+                String scoreRatioStr = sysConfigDao.queryByKey(Constants.HAIKONG_MEMBER_MAX_SCORE_RATIO);
+                if (org.springframework.util.StringUtils.isEmpty(scoreRatioStr)) {
+                    LOGGER.error("计算优惠价格时，未设置订单的最大积分抵扣比例！");
+                    throw new ServiceException(String.format("请先设置订单的最大积分抵扣比例，设置方式：【系统管理】-->【系统参数】，参数名为：【%s】", Constants.HAIKONG_MEMBER_MAX_SCORE_RATIO));
+                }
+                BigDecimal scoreRatio = new BigDecimal(scoreRatioStr);
                 // 总分摊积分
                 BigDecimal shareScore = BigDecimal.ZERO;
                 // 取整后的积分数量
                 BigDecimal scoreIntegerDecimal = BigDecimal.valueOf(scoreInteger);
+                // 计算积分能抵扣的金额
+                BigDecimal scoreCanDeductionPrice = orderTotalPrice.multiply(new BigDecimal(scoreRatioStr)).setScale(0, BigDecimal.ROUND_FLOOR);
+                // 计算最大可抵扣积分
+                BigDecimal maxDeductionScore = scoreCanDeductionPrice.multiply(BigDecimal.valueOf(scoreLimit));
                 // 订单详情积分抵扣总金额
                 BigDecimal goodsDetailScoreDeductionPrice = BigDecimal.ZERO;
                 int size = goodsDetailsDtos.size();
@@ -4678,14 +4722,12 @@ public class OrderServiceImpl implements OrderService {
                     String activity = goodsDetailsDto.getActivity();
                     goodsDetailsDto.setActivity(org.springframework.util.StringUtils.isEmpty(activity) ? "积分抵扣" : activity.contains("积分抵扣") ? activity : activity + ",积分抵扣");
                     String sku = goodsDetailsDto.getGoodsSn();
-                    // 系统设置的最大抵扣比例（最多能抵扣订单金额的比例），导入积分抵扣活动时设置
-                    BigDecimal scoreLimitDecimal = skuScoreLimitMap.get(sku);
                     String prodBarcode = goodsDetailsDto.getProdBarcode();
                     // 此字段 = 零售价 - 其他活动优惠金额
                     BigDecimal actualPaymentAmount = goodsDetailsDto.getActualPaymentAmount();
                     // 当前商品最大支持抵扣的金额
                     BigDecimal currentSkuMaxDeductionPrice = actualPaymentAmount.multiply(BigDecimal.valueOf(goodsDetailsDto.getSellVolume()))
-                                                                                .multiply(scoreLimitDecimal);
+                                                                                .multiply(scoreRatio).setScale(0, BigDecimal.ROUND_FLOOR);
                     // 其他活动优惠金额
                     BigDecimal otherDiscountedPrice = Objects.isNull(goodsDetailsDto.getDiscountedPrice()) ? BigDecimal.ZERO : goodsDetailsDto.getDiscountedPrice();
 
@@ -4699,17 +4741,19 @@ public class OrderServiceImpl implements OrderService {
                         discountedPrice = shareScoreItem.divide(BigDecimal.valueOf(scoreLimit), 2, BigDecimal.ROUND_HALF_UP);
                     }
                     // 订单商品详情最后一个商品并且详情不止一个商品
-                    if (i == index && size > 1) {// 商品总价
+                    if (i == index && size > 1) {
                         // 最后一个商品分摊积分 = 积分总数 - 已分摊积分
                         shareScoreItem = scoreIntegerDecimal.subtract(shareScore);
-                        discountedPrice = shareScoreItem.divide(BigDecimal.valueOf(scoreLimit), 2, BigDecimal.ROUND_HALF_UP);
+//                        discountedPrice = shareScoreItem.divide(BigDecimal.valueOf(scoreLimit), 2, BigDecimal.ROUND_HALF_UP);
+                        // 2021-12-13最后一个商品修改计算方式，原计算方式：(总抵扣积分 - 已分摊积分) / 30，改为：积分能抵扣的金额 - 已抵扣金额
+                        discountedPrice = scoreCanDeductionPrice.subtract(goodsDetailScoreDeductionPrice);
                     }
                     // 订单商品详情只有一个商品的情况下
                     if (size == 1) {
                         // 总计分为所有积分取整
-                        shareScore = scoreIntegerDecimal;
+                        shareScoreItem = scoreIntegerDecimal;
                         // 3-3. 计算积分抵扣后的价格
-                        discountedPrice = shareScore.divide(BigDecimal.valueOf(scoreLimit), 2, BigDecimal.ROUND_HALF_UP);
+                        discountedPrice = shareScoreItem.divide(BigDecimal.valueOf(scoreLimit), 2, BigDecimal.ROUND_HALF_UP);
                     }
                     // 当前计算出来的积分抵扣金额如果比最大的还要大，则积分抵扣金额为最大抵扣金额，并且积分需要重新计算
                     if (discountedPrice.compareTo(currentSkuMaxDeductionPrice) > 0) {
@@ -5057,7 +5101,7 @@ public class OrderServiceImpl implements OrderService {
         orderGoodsVo.setInventoryType(goodsDto.getInventoryType());
         orderGoodsVo.setDefectiveProductsGrade(goodsDto.getDefectiveProductsGrade());
 
-        BigDecimal number = new BigDecimal(Long.valueOf(goodsDto.getSellVolume()));
+        /*BigDecimal number = new BigDecimal(Long.valueOf(goodsDto.getSellVolume()));
         BigDecimal goodsTotal = goodsDto.getRetailPrice().multiply(number);//单商品总价
         BigDecimal rate = goodsTotal.divide(orderInfo.getGoods_price(), 2, BigDecimal.ROUND_HALF_UP);//当前商品总价/订单总价（不含运费、不含优惠券）
         BigDecimal freightPrice = BigDecimal.valueOf(orderInfo.getFreight_price());
@@ -5085,13 +5129,13 @@ public class OrderServiceImpl implements OrderService {
             orderGoodsVo.setSettlePrice(goodsTotal);//商品结算平摊价格
         } else {
             orderGoodsVo.setSettlePrice(settlePrice);//商品结算平摊价格
-        }
+        }*/
 
         // 计算税费
-        GoodsEntity goodsEntity = goodsService.queryObject(goodsDto.getId().intValue());
+        /*GoodsEntity goodsEntity = goodsService.queryObject(goodsDto.getId().intValue());
         BigDecimal goodsTax = CalculateTax.calculateFinalTax(goodsEntity, goodsDto.getStoreRetailPrice(), goodsService).setScale(3, RoundingMode.HALF_UP);
-        goodsTax = goodsTax.multiply(number).setScale(2, RoundingMode.HALF_UP);
-        orderGoodsVo.setTaxPrice(goodsTax);
+        goodsTax = goodsTax.multiply(number).setScale(2, RoundingMode.HALF_UP);*/
+        orderGoodsVo.setTaxPrice(goodsDto.getGoodsTaxes());
 
         return orderGoodsVo;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesScoreServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -96,6 +97,13 @@ public class MkActivitiesScoreServiceImpl implements MkActivitiesScoreService {
         if (!CollectionUtils.isEmpty(scoreReductionDTOList)) {
             List<MkActivitiesScoreEntity> mkActivitiesScoreEntities = new ArrayList<>();
 
+            Set<String> rejectSet = scoreReductionDTOList.stream().map(ScoreReductionDTO::getReject).collect(Collectors.toSet());
+            if (CollectionUtils.isEmpty(rejectSet)) {
+                throw new RRException("是否参与字段不能为空！");
+            }
+            if (rejectSet.size() > 1) {
+                throw new RRException("请检查是否参与字段，必须为参与或者不参与！不能既有参与又有不参与！");
+            }
             scoreReductionDTOList.forEach(scoreReductionDTO -> {
                 Map<String, Object> valideDate = MapBeanUtil.fromObject(scoreReductionDTO);
                 // 校验excel传入的数据
@@ -103,7 +111,6 @@ public class MkActivitiesScoreServiceImpl implements MkActivitiesScoreService {
                 builder.put("storeId", "门店编号");
                 builder.put("sku", "商品SKU");
                 builder.put("prodBarcode", "商品条码");
-                builder.put("scoreLimit", "抵扣比例");
                 builder.put("reject", "是否参与");
                 builder.put("deadlineStr", "截止日期");
 

kmall-admin/src/main/resources/XmlTemplate/ScoreReductionDTOList.xml

@@ -8,9 +8,8 @@
                 <mapping row="1" col="0">ScoreReductionDTO.storeId</mapping>
                 <mapping row="1" col="1">ScoreReductionDTO.prodBarcode</mapping>
                 <mapping row="1" col="2">ScoreReductionDTO.sku</mapping>
-                <mapping row="1" col="3">ScoreReductionDTO.scoreLimit</mapping>
-                <mapping row="1" col="4">ScoreReductionDTO.reject</mapping>
-                <mapping row="1" col="5">ScoreReductionDTO.deadlineStr</mapping>
+                <mapping row="1" col="3">ScoreReductionDTO.reject</mapping>
+                <mapping row="1" col="4">ScoreReductionDTO.deadlineStr</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesScoreDao.xml

@@ -8,7 +8,6 @@
         <result property="prodBarcode" column="prod_barcode"/>
         <result property="sku" column="sku"/>
         <result property="storeId" column="store_id"/>
-        <result property="scoreLimit" column="score_limit"/>
         <result property="mkaId" column="mka_id"/>
         <result property="deadline" column="deadline"/>
         <result property="reject" column="reject"/>
@@ -24,7 +23,6 @@
 			`prod_barcode`,
 			`sku`,
 			`store_id`,
-			`score_limit`,
 			`mka_id`,
 			`deadline`,
 			`reject`,
@@ -42,7 +40,6 @@
     		`prod_barcode`,
     		`sku`,
     		`store_id`,
-    		`score_limit`,
     		`mka_id`,
     		`deadline`,
     		`reject`,
@@ -89,7 +86,6 @@
     		`prod_barcode`,
     		`sku`,
     		`store_id`,
-    		`score_limit`,
     		`mka_id`,
     		`deadline`,
     		`reject`,
@@ -107,7 +103,6 @@
     		`prod_barcode`,
     		`sku`,
     		`store_id`,
-    		`score_limit`,
     		`mka_id`,
     		`deadline`,
     		`reject`,
@@ -134,7 +129,6 @@
 			`prod_barcode`,
 			`sku`,
 			`store_id`,
-			`score_limit`,
 			`mka_id`,
 			`deadline`,
 			`reject`,
@@ -146,7 +140,6 @@
 			#{prodBarcode},
 			#{sku},
 			#{storeId},
-			#{scoreLimit},
 			#{mkaId},
 			#{deadline},
 			#{reject},
@@ -161,7 +154,6 @@
 			`prod_barcode`,
 			`sku`,
 			`store_id`,
-			`score_limit`,
 			`mka_id`,
 			`deadline`,
 			`reject`,
@@ -175,7 +167,6 @@
 				#{item.prodBarcode},
 				#{item.sku},
 				#{item.storeId},
-				#{item.scoreLimit},
 				#{item.mkaId},
 				#{item.deadline},
 				#{item.reject},
@@ -193,7 +184,6 @@
 			<if test="prodBarcode != null">`prod_barcode` = #{prodBarcode}, </if>
 			<if test="sku != null">`sku` = #{sku}, </if>
 			<if test="storeId != null">`store_id` = #{storeId}, </if>
-			<if test="scoreLimit != null">`score_limit` = #{scoreLimit}, </if>
 			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
 			<if test="deadline != null">`deadline` = #{deadline}, </if>
 			<if test="reject != null">`reject` = #{reject}, </if>

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

@@ -178,7 +178,7 @@
                                 <th style="width: 300px;padding: 7px">跨境商品名称</th>
                                 <th style="padding: 7px">单价</th>
                                 <th style="padding: 7px">优惠金额</th>
-                                <th style="padding: 7px">税费</th>
+                                <th style="padding: 7px">预估税费</th>
                                 <th style="padding: 7px">实际支付价</th>
                                 <th style="padding: 7px">数量</th>
                                 <th style="padding: 7px">参与活动</th>
@@ -448,7 +448,7 @@
 <!--                                    <td>{{item.discountedPrice}}</td>-->
                                     <td>{{item.number}}</td>
                                     <td>{{item.actualPaymentAmount}}</td>
-                                    <td >{{item.tax}}</td>
+                                    <td >{{item.taxPrice}}</td>
                                     <td >{{item.activity}}</td>
                                 </tr>
                             </table>

kmall-admin/src/main/webapp/js/mk/mkactivityform.js

@@ -3,7 +3,7 @@ $(function () {
         url: '../mkactivityform/list',
         datatype: "json",
         colModel: [
-            {label: '操作', width: 200, align: 'center', frozen: true,
+            {label: '操作', width: 200, align: 'center',
                 formatter: function (value, col, row) {
                     htmlStr = "<button class='btn btn-outline btn-primary' " +
                         "onclick='vm.showMkactivities(\""+row.mkCode+"\")'>管理营销方式</button>";

kmall-manager/src/main/resources/conf/haikong.properties

@@ -3,8 +3,6 @@
 haikong.member.url=https://test-ump.greedc.com
 haikong.member.appId=mianshuitestzhanxiao
 haikong.member.appSecret=mianshuitestzhanxiao1029
-#### \u6D77\u63A7\u89C4\u5B9A\u7684\u591A\u5C11\u79EF\u5206\u62B5\u4E00\u5143
-haikong.member.scoreLimit=30
 haikong.retry=3
 haikong.ware.url=http://yjapi.highstore.cn:8202/esbcenter/api/esb
 haikong.ware.appId=GREE