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 5da6b6a13..d16612642 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 @@ -18,7 +18,6 @@ import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.service.orderlogic.AbstractOrderLogic; import com.jsowell.pile.service.orderlogic.OrderLogicFactory; 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; @@ -39,8 +38,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 1539b3649..fff2d67a1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -781,12 +781,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; }