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

update订单逻辑改造工厂模式

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-01 11:36:31 +08:00
parent 5a7e130e26
commit b53aedb423
12 changed files with 181 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,7 @@ public class PayController extends BaseController {
if (isLock) {
String appId = request.getHeader("appId");
dto.setWechatAppId(appId);
map = orderService.payOrderV2(dto);
map = orderService.payOrder(dto);
}
response = new RestApiResponse<>(map);

5
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -18,6 +18,7 @@ import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.TitleTypeEnum;
import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
import com.jsowell.common.enums.uniapp.BalanceChangesEnum;
import com.jsowell.common.enums.ykc.OrderStatusEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
@@ -609,8 +610,8 @@ public class MemberService {
log.info("使用汇付支付充值余额 支付配置参数:{}", JSON.toJSONString(config));
// 查询延时支付模式，由一级运营商配置决定
String payMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
String delayMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
String payMode = MerchantDelayModeEnum.getAdapayPayMode(delayMode);
// 封装对象
// String payMode = Constants.ADAPAY_PAY_MODE_DELAY; // 汇付延时分账
CreateAdaPaymentParam createAdaPaymentParam = new CreateAdaPaymentParam();

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

@@ -120,6 +120,9 @@ public class OrderService {
@Resource
private OrderPileOccupyService orderPileOccupyService;
@Resource
private IPileMerchantInfoService pileMerchantInfoService;
@Resource
private RedisCache redisCache;
@@ -1206,4 +1209,11 @@ public class OrderService {
public Map<String, Object> payOccupyPileOrder(PayOrderDTO dto) {
return orderPileOccupyService.payOccupyPileOrder(dto);
}
public Map<String, Object> payOrderV2(PayOrderDTO dto) {
String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
// 获取处理逻辑
// OrderLogicFactory.getOrderLogic();
return null;
}
}