记得上下班打卡 | git大法好,push需谨慎

Commit b67ebca6 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev-dragon&order' into dev_bd_rm_consumer_od

parents 01ed9f78 0520e5bd
...@@ -391,7 +391,7 @@ public class MixOrderServiceImpl implements IMixOrderService { ...@@ -391,7 +391,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew(); DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
dragonPayBaseReqDto.setPayType(payType); dragonPayBaseReqDto.setPayType(payType);
dragonPayBaseReqDto.setDeviceFrom(deviceForm); dragonPayBaseReqDto.setDeviceFrom(deviceForm);
if (details.equals("js") || payType.equals("applet")) { if (deviceForm.equals("js") || payType.equals("applet")) {
dragonPayBaseReqDto.setOpenId(openId); dragonPayBaseReqDto.setOpenId(openId);
} }
dragonPayBaseReqDto.setType("MIX"); dragonPayBaseReqDto.setType("MIX");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment