autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-07 03:20:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source 
(cherry picked from commit de3fe081f8)
This commit is contained in:
autumn.g@foxmail.com
2023-09-05 15:44:25 +08:00
parent 39e0463d35
commit 37bc31a6f6
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -15,7 +15,6 @@ import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.vo.uniapp.PayModeVO; import com.jsowell.pile.vo.uniapp.PayModeVO;
import com.jsowell.service.MemberService;
import com.jsowell.service.OrderService; import com.jsowell.service.OrderService;
import com.jsowell.wxpay.response.WechatPayNotifyParameter; import com.jsowell.wxpay.response.WechatPayNotifyParameter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +35,6 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/uniapp/pay") @RequestMapping("/uniapp/pay")
public class PayController extends BaseController { public class PayController extends BaseController {
@Autowired
private MemberService memberService;
@Autowired @Autowired
private OrderService orderService; private OrderService orderService;

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -419,4 +419,8 @@ public class TempController extends BaseController {
} }
return new RestApiResponse<>(); return new RestApiResponse<>();
} }
/**
*
*/
} }

12
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -756,12 +756,12 @@ public class OrderService {
.build() .build()
); );
// 余额支付 // 余额支付
// result.add( result.add(
// PayModeVO.builder() PayModeVO.builder()
// .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()) .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())
// .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()) .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel())
// .build() .build()
// ); );
} }
return result; return result;
} }