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

update 修改充电桩信息

Browse Source
This commit is contained in:
Guoqs
2024-07-01 10:56:33 +08:00
parent 74283d5ab0
commit 46bfa2bfb6
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import com.jsowell.common.UserAgentUtils;
import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.adapay.AdapayPayChannelEnum;
import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.enums.ykc.ScenarioEnum; import com.jsowell.common.enums.ykc.ScenarioEnum;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
@@ -134,10 +135,13 @@ public class PayController extends BaseController {
Map<String, Object> map = null; Map<String, Object> map = null;
if (isLock) { if (isLock) {
String appId = request.getHeader("appId"); String appId = request.getHeader("appId");
dto.setWechatAppId(appId);
// 设置请求来源 // 设置请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request)); dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.WX_LITE.getValue())) {
dto.setWechatAppId(appId);
} else if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.ALIPAY_LITE.getValue())) {
dto.setAlipayAppId(appId);
}
map = orderService.payOrderV2(dto); map = orderService.payOrderV2(dto);
} }

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

@@ -197,9 +197,17 @@ public class OrderService {
* @param dto * @param dto
*/ */
public Map<String, Object> payOrderV2(PayOrderDTO dto) { public Map<String, Object> payOrderV2(PayOrderDTO dto) {
String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId()); // String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
String delayMode = null;
if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.WX_LITE.getValue())) {
delayMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
} else if (StringUtils.equals(dto.getRequestSource(), AdapayPayChannelEnum.ALIPAY_LITE.getValue())) {
delayMode = pileMerchantInfoService.getDelayModeByAlipayAppId(dto.getAlipayAppId());
}
// 获取处理逻辑 // 获取处理逻辑
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode); AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(delayMode);
Map<String, Object> map = orderLogic.payOrder(dto); Map<String, Object> map = orderLogic.payOrder(dto);
return map; return map;
} }