积分商品,砍价商品结算单错误问题

config/application.yml

@@ -25,11 +25,20 @@ spring:
     admin:
       client:
         url: http://192.168.0.116:8000
+  # mongodb
+  data:
+    mongodb:
+      uri: 192.168.0.116:27017
+      database: lilishop
+      username: root
+      password: lilishop
+      authentication-database: admin
+  #      replica-set-name: mongoreplset
   cache:
     type: redis
   # Redis
   redis:
-    host: 192.168.0.116
+    host: 101.43.251.145
     port: 6379
     password: lilishop
     lettuce:
@@ -60,7 +69,7 @@ spring:
       default-datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.0.116:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://101.43.251.145:3306/zhimai1?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
         username: root
         password: lilishop
         maxActive: 50
@@ -154,6 +163,8 @@ ignored:
     - /**/*.css
     - /**/*.png
     - /**/*.ico
+    - /buyer/distribution/distribution/**
+    - /store/distribution/goods/**
 
 # Swagger界面内容配置
 swagger:
@@ -182,6 +193,7 @@ logging:
     cn.lili: info
   #    org.hibernate: debug
   #    org.springframework: debug
+  #    org.springframework.data.mongodb.core: debug
   file:
     # 指定路径
     path: logs
@@ -211,22 +223,22 @@ lili:
   #短信模版配置
   sms:
     #登录
-    LOGIN: SMS_205755300
+    LOGIN: SMS_234157072
     #注册
-    REGISTER: SMS_205755298
+    REGISTER: SMS_234157072
     #找回密码
-    FIND_USER: SMS_205755301
+    FIND_USER: SMS_234157072
     #设置密码
-    UPDATE_PASSWORD: SMS_205755297
+    UPDATE_PASSWORD: SMS_234157072
     #支付密码
-    WALLET_PASSWORD: SMS_205755301
+    WALLET_PASSWORD: SMS_234157072
   system:
     isDemoSite: false
     isTestModel: true
-  #     脱敏级别：
+    #     脱敏级别：
-  #     0：不做脱敏处理
+    #     0：不做脱敏处理
-  #     1：管理端用户手机号等信息脱敏
+    #     1：管理端用户手机号等信息脱敏
-  #     2：商家端信息脱敏（为2时，表示管理端，商家端同时脱敏）
+    #     2：商家端信息脱敏（为2时，表示管理端，商家端同时脱敏）
     sensitiveLevel: 1
 
   statistics:
@@ -268,7 +280,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.0.116:9200
+      cluster-nodes: 101.43.251.145:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -297,10 +309,8 @@ lili:
       notice-group: lili_notice_group
       notice-send-topic: lili_send_notice_topic
       notice-send-group: lili_send_notice_group
-      after-sale-topic: lili_after_sale_topic
-      after-sale-group: lili_after_sale_group
 rocketmq:
-  name-server: 192.168.0.116:9876
+  name-server: 101.43.251.145:9876
   isVIPChannel: false
   producer:
     group: lili_group
@@ -309,7 +319,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://192.168.0.116:9001/xxl-job-admin
+      addresses: http://127.0.0.1:8080/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address:

framework/src/main/java/cn/lili/modules/order/cart/render/impl/CommissionRender.java

@@ -4,6 +4,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.PromotionTypeEnum;
+import cn.lili.common.utils.CurrencyUtil;
 import cn.lili.modules.goods.service.CategoryService;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
@@ -85,7 +86,7 @@ public class CommissionRender implements CartRenderStep {
                     if (kanjiaPromotions.isPresent()) {
                         JSONObject promotionsObj = JSONUtil.parseObj(kanjiaPromotions.get().getValue());
                         KanjiaActivityGoods kanjiaActivityGoods = JSONUtil.toBean(promotionsObj, KanjiaActivityGoods.class);
-                        priceDetailDTO.setSettlementPrice(kanjiaActivityGoods.getSettlementPrice());
+                        priceDetailDTO.setSettlementPrice(CurrencyUtil.add(kanjiaActivityGoods.getSettlementPrice(),priceDetailDTO.getBillPrice()));
                     }
                 }
             }

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java

@@ -222,6 +222,7 @@ public class PointsGoodsServiceImpl extends AbstractPromotionsServiceImpl<Points
      */
     @Override
     public void updateEsGoodsIndex(PointsGoods promotions) {
+        super.updateEsGoodsIndex(promotions);
         Map<String, Object> query = MapUtil.builder(new HashMap<String, Object>()).put("id", promotions.getSkuId()).build();
         Map<String, Object> update = MapUtil.builder(new HashMap<String, Object>()).put("points", promotions.getPoints()).build();
         //修改规格索引,发送mq消息