From 37bc31a6f6603f88f2c443711c8d1fd39dc57d8e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 5 Sep 2023 15:44:25 +0800 Subject: [PATCH] update (cherry picked from commit de3fe081f8874e71fdecc33f09eb2f0e83c3b54c) --- .../java/com/jsowell/api/uniapp/PayController.java | 3 --- .../java/com/jsowell/api/uniapp/TempController.java | 4 ++++ .../main/java/com/jsowell/service/OrderService.java | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 443b94f9b..ee9563bf3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -15,7 +15,6 @@ import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.vo.uniapp.PayModeVO; -import com.jsowell.service.MemberService; import com.jsowell.service.OrderService; import com.jsowell.wxpay.response.WechatPayNotifyParameter; import org.springframework.beans.factory.annotation.Autowired; @@ -36,8 +35,6 @@ import java.util.Map; @RestController @RequestMapping("/uniapp/pay") public class PayController extends BaseController { - @Autowired - private MemberService memberService; @Autowired private OrderService orderService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index b74dd8270..93a835a9c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -419,4 +419,8 @@ public class TempController extends BaseController { } return new RestApiResponse<>(); } + + /** + * + */ } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 1afd51289..a130e2422 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -756,12 +756,12 @@ public class OrderService { .build() ); // 余额支付 - // result.add( - // PayModeVO.builder() - // .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()) - // .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()) - // .build() - // ); + result.add( + PayModeVO.builder() + .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()) + .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()) + .build() + ); } return result; }