fix:..

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

@@ -191,15 +191,24 @@ swagger:
   # 请求前缀
   pathMapping: /dev-api
 
+# 车费计算
+fare:
+  # 起步价
+  base-fare: 9.3
+  # 超出起步价后每公里费用
+  additional-fare-per-km: 2.4
+  # 起步距离（公里）
+  base-distance-km: 3
+
 # 微信小程序
 wx:
   base-url: https://api.weixin.qq.com/
   # AppID(小程序ID)
-#  app-id: wxb2ae0f4ee11e8705
-  app-id: wxe8661ef542cd963c
+  app-id: wxb2ae0f4ee11e8705
+#  app-id: wxe8661ef542cd963c
   # AppSecret(小程序密钥)
-#  app-secret: 28504227c2662cfb1b39a5baf750bb59
-  app-secret: 7439a36812c1850d060567bce51159ec
+  app-secret: 28504227c2662cfb1b39a5baf750bb59
+#  app-secret: 7439a36812c1850d060567bce51159ec
   # 商户号
   mch-id: 1675015090
   # 商户秘钥

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

@@ -190,7 +190,14 @@ swagger:
   enabled: true
   # 请求前缀
   pathMapping: /dev-api
-
+# 车费计算
+fare:
+  # 起步价
+  base-fare: 9.3
+  # 超出起步价后每公里费用
+  additional-fare-per-km: 2.4
+  # 起步距离（公里）
+  base-distance-km: 3
 # 微信小程序
 wx:
   base-url: https://api.weixin.qq.com/

nightFragrance-common/src/main/java/com/ylx/common/utils/file/MimeTypeUtils.java

@@ -34,7 +34,7 @@ public class MimeTypeUtils
             // 压缩文件
             "rar", "zip", "gz", "bz2",
             // 视频格式
-            "mp4", "avi", "rmvb",
+            "mp4", "avi", "rmvb", "mp3",
             // pdf
             "pdf" };
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TJs.java

@@ -100,6 +100,20 @@ public class TJs implements Serializable {
     @ApiModelProperty("地址")
     private String cAddress;
 
+    /**
+     * 健康证
+     */
+    @TableField("health_certificate")
+    @ApiModelProperty("健康证")
+    private String healthCertificate;
+
+    /**
+     * 营业执照
+     */
+    @TableField("business_license")
+    @ApiModelProperty("营业执照")
+    private String businessLicense;
+
     /**
      * 个人简介
      */

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

@@ -32,7 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 
 /**
@@ -62,6 +61,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     @Resource
     private TConsumptionLogService consumptionLogService;
 
+    @Resource
+    private MassageUtil massageUtil;
+
 
 //    @Resource
 //    private TInfoService infoService;
@@ -82,7 +84,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         }
         //计算车费
         if (order.getDistance() != null) {
-            BigDecimal bigDecimal = MassageUtil.calculateTaxiFare(order.getDistance());
+            BigDecimal bigDecimal = massageUtil.calculateTaxiFare(order.getDistance());
             order.setFare(bigDecimal.setScale(MassageConstants.INTEGER_TWO, RoundingMode.HALF_UP));
         }
         //订单价格
@@ -117,10 +119,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean payOrder(TOrder order) {
-//        if(order.getPayType().equals(PayTypeEnum.WEI_PAY.getCode())){
-//            //调用微信支付
-//            weiPay(order);
-//        }
         // 根据orderid查询订单信息
         TOrder orderNew = getById(order.getcId());
         if (!orderNew.getnStatus().equals(OrderStatusEnum.WAIT_PAY.getCode())) {
@@ -138,20 +136,20 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if (null == user) {
             throw new ServiceException("用户不存在");
         }
-        if (user.getdBalance().compareTo(orderNew.getdTotalMoney()) < MassageConstants.INTEGER_ZERO) {
+        if (user.getdBalance().compareTo(orderNew.getTotalPrice()) < MassageConstants.INTEGER_ZERO) {
             return false;
         } else {
             // 更新用户金额 及下单此时
             TWxUser paramUser = new TWxUser();
             paramUser.setcOpenid(user.getcOpenid());
-            paramUser.setdBalance(user.getdBalance().subtract(orderNew.getdTotalMoney()));
-            paramUser.setdMoney(user.getdMoney().add(orderNew.getdTotalMoney()));
+            paramUser.setdBalance(user.getdBalance().subtract(orderNew.getTotalPrice()));
+            paramUser.setdMoney(user.getdMoney().add(orderNew.getTotalPrice()));
             paramUser.setnNum(user.getnNum() + MassageConstants.INTEGER_ZERO);
             paramUser.setId(user.getId());
             wxUserService.updateById(paramUser);
             //增加消费记录
             TConsumptionLog tConsumptionLog = new TConsumptionLog();
-            tConsumptionLog.setAmount(orderNew.getdTotalMoney().negate());
+            tConsumptionLog.setAmount(orderNew.getTotalPrice().negate());
             tConsumptionLog.setBillNo(orderNew.getOrderNo());
             tConsumptionLog.setOpenId(orderNew.getcOpenId());
             tConsumptionLog.setBillType(BillTypeEnum.BALANCE_PAYMENT.getCode());
@@ -181,11 +179,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         }
     }
 
-    private void weiPay(TOrder order) {
-        // 根据orderid查询订单信息
-        TOrder orderNew = getById(order.getcId());
-    }
-
     /**
      * 拒绝订单
      *

nightFragrance-massage/src/main/java/com/ylx/massage/utils/MassageUtil.java

@@ -1,10 +1,9 @@
 package com.ylx.massage.utils;
 
 
-import com.ylx.common.core.redis.RedisCache;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
@@ -13,23 +12,27 @@ import java.math.RoundingMode;
  * @date 2024-04-15 14:38
  */
 
+@Component
 public class  MassageUtil {
 
-//    public static void main(String[] args) {
-//        // 测试计算4.04公里的费用
-//        BigDecimal totalCost = calculateTaxiFare(BigDecimal.valueOf(4.04));
-//        System.out.println("全程4.04公里的费用为: " + totalCost + "元");
-//    }
+    @Value("${fare.base-fare}")
+    private BigDecimal baseFare;
+
+    @Value("${fare.additional-fare-per-km}")
+    private BigDecimal additionalFarePerKm;
+
+    @Value("${fare.base-distance-km}")
+    private BigDecimal baseDistanceKm;
 
     /**
      * 计算出租车费用
      * @param distance 全程距离（公里）
      * @return 费用总额（元）
      */
-    public static BigDecimal calculateTaxiFare(BigDecimal distance) {
-        final BigDecimal BASE_FARE = new BigDecimal("9.3"); // 起步价
-        final BigDecimal ADDITIONAL_FARE_PER_KM = new BigDecimal("2.4"); // 超出起步价后每公里费用
-        final BigDecimal BASE_DISTANCE_KM = new BigDecimal("3"); // 起步距离（公里）
+    public BigDecimal calculateTaxiFare(BigDecimal distance) {
+        final BigDecimal BASE_FARE = baseFare; // 起步价
+        final BigDecimal ADDITIONAL_FARE_PER_KM = additionalFarePerKm; // 超出起步价后每公里费用
+        final BigDecimal BASE_DISTANCE_KM = baseDistanceKm; // 起步距离（公里）
 
         // 计算超出起步价的公里数，注意应该向上取整，因为不足1公里也要按1公里计费
         BigDecimal extraKms = distance.subtract(BASE_DISTANCE_KM).setScale(0, RoundingMode.UP);

nightFragrance-massage/src/main/resources/mapper/massage/TJsMapper.xml

@@ -17,6 +17,8 @@
         <result column="c_name" property="cName"/>
         <result column="c_phone" property="cPhone"/>
         <result column="c_address" property="cAddress"/>
+        <result column="health_certificate" property="healthCertificate"/>
+        <result column="business_license" property="businessLicense"/>
         <result column="c_jianjie" property="cJianjie"/>
         <result column="n_star" property="nStar"/>
         <result column="n_bili" property="nBili"/>
@@ -47,6 +49,8 @@
         js.c_name,
         js.c_phone,
         js.c_address,
+        js.health_certificate,
+        js.business_license,
         js.c_jianjie,
         js.n_star,
         js.n_bili,