Merge remote-tracking branch 'origin/dev' into dev

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

@@ -13,17 +13,13 @@ import com.ylx.giftCard.domain.GiftCard;
 import com.ylx.giftCard.domain.GiftCardOrder;
 import com.ylx.giftCard.domain.dto.GiftCardOrderQueryDTO;
 import com.ylx.giftCard.domain.dto.UserShoppingFundsDetailQueryDTO;
-import com.ylx.giftCard.domain.vo.GiftCardOrderExportVO;
-import com.ylx.giftCard.domain.vo.GiftCardOrderPageVO;
-import com.ylx.giftCard.domain.vo.UserShoppingFundsDetailItemVO;
-import com.ylx.giftCard.domain.vo.UserShoppingFundsDetailVO;
-import com.ylx.giftCard.domain.vo.UserShoppingFundsSummaryVO;
+import com.ylx.giftCard.domain.vo.*;
 import com.ylx.giftCard.enums.GiftCardOrderStatusEnum;
 import com.ylx.giftCard.mapper.GiftCardOrderMapper;
 import com.ylx.giftCard.service.IGiftCardOrderService;
-import com.ylx.massage.domain.TJs;
+import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.TWxUser;
-import com.ylx.massage.service.TJsService;
+import com.ylx.massage.service.IMaTechnicianService;
 import com.ylx.massage.service.TWxUserService;
 import com.ylx.shopingfundsdetail.domain.vo.ShoppingFundsDetailAddDto;
 import com.ylx.shopingfundsdetail.enums.ShoppingFundsExpenseTypeEnum;
@@ -39,12 +35,12 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
 
-@Slf4j // 添加日志注解
+@Slf4j
 @Service
 public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, GiftCardOrder> implements IGiftCardOrderService {
 
     @Resource
-    private TJsService jsService;
+    private IMaTechnicianService maTechnicianService;
     @Resource
     private TWxUserService wxUserService;
     @Resource
@@ -282,11 +278,11 @@ public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, G
             return;
         }
 
-        TJs merchant = this.jsService.getById(merchantId);
-        if (ObjectUtil.isNotNull(merchant)) {
+        MaTechnician maTechnician = this.maTechnicianService.getById(merchantId);
+        if (ObjectUtil.isNotNull(maTechnician)) {
             order.setMerchantId(merchantId);
-            order.setMerchantName(merchant.getcName());
-            order.setMerchantNickName(merchant.getcNickName());
+            order.setMerchantName(maTechnician.getTeName());
+            order.setMerchantNickName(maTechnician.getTeNickName());
             // 注意：如果 TJs 表有收款账号字段，可以在这里设置
             // order.setMerchantAccount(merchant.getAccount());
         }

nightFragrance-massage/src/main/java/com/ylx/order/enums/OrderStatusEnum.java

@@ -13,7 +13,8 @@ public enum OrderStatusEnum {
     COMPLETED(5, "已完成"),
     CANCELLED(6, "已取消"),
     CLOSED(7, "已关闭"),
-    REJECTED(8, "拒绝接单");
+    REJECTED(8, "拒绝接单"),
+    REFUND_SUCCESS(9, "退款成功");
 
     private final Integer code;
     private final String info;