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

更新新逻辑

Browse Source
This commit is contained in:
liuyingfang
2023-11-16 14:15:46 +08:00
parent bb05947394
commit 8b555d4682
17 changed files with 205 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java
View File

@@ -56,10 +56,11 @@ public class IntroduceController {
if ("AG".equals(typeCode) || "FB".equals(typeCode) || "SB".equals(typeCode)){
return image.PROMOTION_IMAGE.getImageUrl();
}
if ("1".equals(merchantType)){
//TODO 现在的逻辑是所有的都可以是创客
// if ("1".equals(merchantType)){
return image.SMALL_IMAGE.getImageUrl();
}
return image.OTHER_IMAGE.getImageUrl();
// }
// return image.OTHER_IMAGE.getImageUrl();
}
@PostMapping ("/common")
@@ -97,13 +98,13 @@ public class IntroduceController {
//安卓
if ("1".equals(type)){
if ("1".equals(entity.getAndroid())) {
return ResultGenerator.genSuccessResult(entity.getContent());
return ResultGenerator.genSuccessResult(image(params.get("typeCode"), params.get("merchantType")));
}
return ResultGenerator.genSuccessResult("");
//IOS
}else if ("2".equals(type)){
if ("1".equals(entity.getIos())) {
return ResultGenerator.genSuccessResult(entity.getContent());
return ResultGenerator.genSuccessResult(image(params.get("typeCode"), params.get("merchantType")));
}
return ResultGenerator.genSuccessResult("");
}

13
pluss-api-page/src/main/java/cn/pluss/platform/controller/ZfbAttestationController.java
View File

@@ -39,14 +39,15 @@ public class ZfbAttestationController {
@PostMapping
public Result<Object> Attestation(@RequestBody Map<String, String> params) {
QueryWrapper<Account> QueryWrapper = new QueryWrapper<Account>()
.eq("userId", Integer.valueOf(params.get("userId")))
.eq("valid", 1);
Account one = accountService.getOne(QueryWrapper);
if (one == null){
QueryWrapper<MerchantChannelStatus> QueryWrapper = new QueryWrapper<MerchantChannelStatus>()
.eq("merchantCode", params.get("merchantCode"))
.eq("status", 3)
.ne("merchantId","");
MerchantChannelStatus merchantCode = merchantChannelStatusService.getOne(QueryWrapper);
if (merchantCode == null){
throw new MsgException("账号异常");
}
MerchantChannelStatus merchantCode = merchantChannelStatusService.getMerchantCodeByInfo(params.get("merchantCode"), one.getChannelType());
HashMap<Object, Object> merchantCodeMap = new HashMap<>();
switch (merchantCode.getChannel()){
case 1:

8
pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java
View File

@@ -66,6 +66,14 @@ public class AuditCallbackController {
return sxfMerchantAuditService.merchantAuditCallback(result);
}
@PostMapping("updateSxf")
// TODO 后续需要接sxf的回调
public Map<String, Object> updateSxfCallback(@RequestBody JSONObject result) throws Exception {
System.out.println("回调成功+++++++++\n");
System.out.println(result);
return result;
}
@PostMapping("ys")
public String ysAuditCallback(@RequestParam Map<String, Object> result) throws Exception {
result = (JSONObject) JSON.toJSON(result);