修改代码

nightFragrance-admin/src/main/resources/application-dev.yml

@@ -57,9 +57,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://39.98.239.48:3366/guangyuyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: '@RqGHG#KZ*C9ytkQ'
+        url: jdbc:mysql://rm-d7q5a6qathaxdzhw.mysql.zhangbei.rds.aliyuncs.com:3306/guangyuyuan?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+        username: sxzgkj
+        password: 'Iy$@$koH@oURxyvw'
       slave:
         # 从数据源开关/默认关闭
         enabled: false
@@ -297,3 +297,23 @@ percent:
   0.06
 hPercent:
   0.94
+
+# 高德地图
+amap:
+  apiKey: 5457092e6c62b83c1b2e45dbe973d858
+
+remote:
+  # 用户中心
+  user-center:
+    # 基础URL
+    base-url: https://test.baoxianzhanggui.com/user-api/usercenter
+  # 本地生活
+  local-live:
+    # 基础URL
+    base-url: https://life.baoxianzhanggui.com/locallive-pro-java
+    # base-url: http://192.168.1.190:8082/jeecg-boot
+    #本地生活平台id
+    client-id: bdsh-X9yZ1wV3uT5sR7qP9o
+  # 广誉远
+  night-fragrance:
+    client-id: gyy-aB4cD6eF8gH0iJ2kL4

nightFragrance-admin/src/main/resources/application-pro.yml

@@ -284,4 +284,24 @@ hCount:
 percent:
   0.06
 hPercent:
-  0.94
+  0.94
+
+# 高德地图
+amap:
+  apiKey: 5457092e6c62b83c1b2e45dbe973d858
+
+remote:
+  # 用户中心
+  user-center:
+    # 基础URL
+    base-url: https://test.baoxianzhanggui.com/user-api/usercenter
+  # 本地生活
+  local-live:
+    # 基础URL
+    base-url: https://life.baoxianzhanggui.com/locallive-pro-java
+    # base-url: http://192.168.1.190:8082/jeecg-boot
+    #本地生活平台id
+    client-id: bdsh-X9yZ1wV3uT5sR7qP9o
+  # 广誉远
+  night-fragrance:
+    client-id: gyy-aB4cD6eF8gH0iJ2kL4

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -247,11 +247,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         //过滤过期的优惠券
         coupons = coupons.stream().filter(coupon -> coupon.getExpirationTime().after(new Date())).collect(Collectors.toList());
         //无门槛优惠券
-        List<CouponReceiveVo> collect = coupons.stream().filter(coupon -> coupon.getDiscountType().equals(DiscountTypeEnum.NO_THRESHOLD.getCode())).collect(Collectors.toList());
+        /*List<CouponReceiveVo> collect = coupons.stream().filter(coupon -> coupon.getDiscountType().equals(DiscountTypeEnum.NO_THRESHOLD.getCode())).collect(Collectors.toList());*/
         //支付成功 后 删除优惠卷
 //        couponReceiveService.removeCoupons(collect);
         //计算优惠金额
-        return collect.stream().map(CouponReceiveVo::getDiscountValue).reduce(BigDecimal.ZERO, BigDecimal::add);
+        //return collect.stream().map(CouponReceiveVo::getDiscountValue).reduce(BigDecimal.ZERO, BigDecimal::add);
+        return BigDecimal.ZERO;
     }
 
 
@@ -669,7 +670,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if (StringUtils.isNotBlank(orderNew.getCouponReceiveId())) {
             CouponReceive couponReceive = new CouponReceive();
             couponReceive.setId(orderNew.getCouponReceiveId());
-            couponReceive.setUseState(MassageConstants.INTEGER_TWO);
+            couponReceive.setCouponStatus(MassageConstants.INTEGER_TWO);
             if (!couponReceiveService.updateById(couponReceive)) {
                 log.error("优惠券状态更新失败id:,{}", orderNew.getCouponReceiveId());
             }
@@ -782,7 +783,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         //退优惠卷
         if (StringUtils.isNotBlank(orderNew.getCouponReceiveId())) {
             CouponReceive couponReceive = couponReceiveService.getById(orderNew.getCouponReceiveId());
-            couponReceive.setUseState(MassageConstants.INTEGER_ZERO);
+            couponReceive.setCouponStatus(MassageConstants.INTEGER_ZERO);
             couponReceiveService.updateById(couponReceive);
         }
         log.info("余额支付退款user:{}", user);