czg_team/newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加汇付支付

Browse Source
This commit is contained in:
韩鹏辉
2024-02-21 17:27:49 +08:00
parent a7eb6e2028
commit c0cadbe3fe
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/MerchantChannelStatusController.java
View File

@@ -138,9 +138,12 @@ public class MerchantChannelStatusController {
* @return * @return
*/ */
@GetMapping(value = "/manualMerchantIncom") @GetMapping(value = "/manualMerchantIncom")
public RespBody manualMerchantIncome(@RequestParam("userId") String userId, @RequestParam("channelId") String channelId, public RespBody manualMerchantIncome(@RequestParam("userId") String userId,
@RequestParam("type")String type, @RequestParam("errMsg")String errMsg, @RequestParam("channelId") String channelId,
@RequestParam("wxLiteAppId") String wxLiteAppId,@RequestParam("wxPubAppId") String wxPubAppId, @RequestParam("type")String type,
@RequestParam("errMsg")String errMsg,
@RequestParam("wxLiteAppId") String wxLiteAppId,
@RequestParam("wxPubAppId") String wxPubAppId,
@RequestParam("wxPubPath") String wxPubPath @RequestParam("wxPubPath") String wxPubPath
){ ){
if ("1".equals(type)) { if ("1".equals(type)) {

16
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/MerchantChannelStatusService.java
View File

@@ -230,17 +230,17 @@ public class MerchantChannelStatusService {
TbPlussMerchantHfInfo findMerchantHfInfo = merchantHfInfoMapper.selectByMerchantCode(tbPlussMerchantBaseInfo.getMerchantcode()); TbPlussMerchantHfInfo findMerchantHfInfo = merchantHfInfoMapper.selectByMerchantCode(tbPlussMerchantBaseInfo.getMerchantcode());
JSONObject jsonObject = JSON.parseObject(findMerchantHfInfo.getWxInfo()); JSONObject jsonObject = JSON.parseObject(findMerchantHfInfo.getWxInfo());
if (jsonObject == null){ if (jsonObject == null){
d1.put("wxLiteAppld",""); d1.put("wxLiteAppId","");
d1.put("wxPubAppld",""); d1.put("wxPubAppId","");
d1.put("wxPubPath",""); d1.put("wxPubPath","");
}else { }else {
d1.put("wxLiteAppld", jsonObject.get("wxLiteAppld")); d1.put("wxLiteAppId", jsonObject.get("wxLiteAppld"));
d1.put("wxPubAppld", jsonObject.get("wxPubAppld")); d1.put("wxPubAppId", jsonObject.get("wxPubAppld"));
d1.put("wxPubPath", jsonObject.get("wxPubPath")); d1.put("wxPubPath", jsonObject.get("wxPubPath"));
} }
}else { }else {
d1.put("wxLiteAppld",""); d1.put("wxLiteAppId","");
d1.put("wxPubAppld",""); d1.put("wxPubAppId","");
d1.put("wxPubPath",""); d1.put("wxPubPath","");
} }
merchantChannelMessage.add(d1); merchantChannelMessage.add(d1);
@@ -275,8 +275,8 @@ public class MerchantChannelStatusService {
unaudited.put("channel",channel.get(0).getChannel()); unaudited.put("channel",channel.get(0).getChannel());
unaudited.put("valid",account == null? null:account.getChanneltype()); unaudited.put("valid",account == null? null:account.getChanneltype());
unaudited.put("thirdStatus",channel.get(0).getThirdstatus()); unaudited.put("thirdStatus",channel.get(0).getThirdstatus());
unaudited.put("wxLiteAppld",""); unaudited.put("wxLiteAppId","");
unaudited.put("wxPubAppld",""); unaudited.put("wxPubAppId","");
unaudited.put("wxPubPath",""); unaudited.put("wxPubPath","");
merchantChannelMessage.add(unaudited); merchantChannelMessage.add(unaudited);
} }

2
newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml
View File

@@ -585,7 +585,7 @@
FROM FROM
tb_pluss_user_app tb_pluss_user_app
WHERE WHERE
id =( userId =(
SELECT SELECT
parentId parentId
FROM FROM