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

银盛大改，增加D1通道

Browse Source
This commit is contained in:
liuyingfang
2023-06-21 09:34:28 +08:00
parent 0f6cc8d945
commit 7eaf21c7e8
18 changed files with 354 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
View File

@@ -891,7 +891,7 @@ public class MerchantOrderController {
orderPosVO.setOrderNumber(order.getOrderNumber());
orderPosVO.setMercOrderNo(order.getMercOrderNo());
orderPosVO.setTransTime(String.valueOf(order.getTransDt()));
return ResultGenerator.genSuccessJsonPos(orderPosVO, req.getAppId(), req.getReqData());
return ResultGenerator.genSuccessJsonPos(orderPosVO, req.getAppId(), req.getRequestId());
}
String aisleSwitch = order.getAisleSwitch();
MerchantChannelStatus channel = null;
@@ -933,7 +933,7 @@ public class MerchantOrderController {
orderPosVO.setMercOrderNo(order.getMercOrderNo());
orderPosVO.setTransTime(String.valueOf(order.getTransDt()));
}
return ResultGenerator.genSuccessJsonPos(orderPosVO, req.getAppId(), req.getReqData());
return ResultGenerator.genSuccessJsonPos(orderPosVO, req.getAppId(), req.getRequestId());
}
@GetMapping("/closeOrder")

19
pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceStockController.java
View File

@@ -95,4 +95,23 @@ public class DeviceStockController{
dsService.bindDevcieV2(dto);
return ResultGenerator.genSuccessResult("绑定成功",null);
}
@PostMapping("/bindtablecode")
public Result<Object> bindTableCode(@RequestBody DeviceStockDTO dto){
dsService.bindTableCode(dto);
return ResultGenerator.genSuccessResult("绑定成功",null);
}
/**
* 验证桌码
* @param code
* @return
*/
@GetMapping("/checkNum")
public Result<Object> checkNum(String code){
dsService.checkDevice(code);
return ResultGenerator.genSuccessResult();
}
}

24
pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java
View File

@@ -198,19 +198,19 @@ public class WxController {
// ysServiceV3.req(ReqMethod.Reporting, bizContentMap);
// }
//
@PostMapping("/appIdAddOrUpdate")
public void appIdAddOrUpdate(){
JSONObject bizContentMap = new JSONObject();
bizContentMap.put("channelId", "CUPS_WECHAT");
bizContentMap.put("mercId", "QRY230511483159");
bizContentMap.put("appletId", "wxc2bb94c0ddda1032");
ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap);
}
// @PostMapping("/appIdAddOrUpdate")
// public void appIdAddOrUpdate(){
// JSONObject bizContentMap = new JSONObject();
// bizContentMap.put("channelId", "CUPS_WECHAT");
// bizContentMap.put("mercId", "QRY230511483159");
// bizContentMap.put("appletId", "wxc2bb94c0ddda1032");
// ysServiceV3.req(ReqMethod.appIdAddOrUpdate, bizContentMap);
// }
@PostMapping("/auditResult")
public void test(String sysFlowId){
ysAuditServiceV3.result(sysFlowId);
}
// @PostMapping("/auditResult")
// public void test(String sysFlowId){
// ysAuditServiceV3.result(sysFlowId);
// }
/**
* 获取公众号权限

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

@@ -93,19 +93,34 @@ public class AuditCallbackController {
log.info("云商服V3进件接口回调参数：{}，",result.toJSONString());
executorService.execute(() -> {
try {
ysAuditServiceV3.callback(result);
ysAuditServiceV3.callback(result,4);
} catch (Exception e) {
e.printStackTrace();
}
});
return "success";
}
@PostMapping("/ysV3D1")
public String ysAuditCallbackV3D1(@RequestBody JSONObject result) throws Exception {
log.info("云商服V3进件接口回调参数：{}，",result.toJSONString());
executorService.execute(() -> {
try {
ysAuditServiceV3.callback(result,6);
} catch (Exception e) {
e.printStackTrace();
}
});
return "success";
}
@PostMapping("/ysSignV3")
public String ysSignV3(@RequestBody JSONObject result) throws Exception {
log.info("云商服V3签约接口回调参数：{}，",result.toJSONString());
executorService.execute(() -> {
try {
ysAuditServiceV3.callback(result);
ysAuditServiceV3.callback(result,4);
} catch (Exception e) {
e.printStackTrace();
}

2
pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
View File

@@ -73,6 +73,8 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
limitUri.add("/api/auditCallback/tradeCallBack");
limitUri.add("/api/merchantOrder/posTradeQuery");
limitUri.add("/api/merchantOrder/posTradeQueryNumber");
limitUri.add("/api/device/stock/checkNum");
limitUri.add("/api/device/stock/bindtablecode");
boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s));
if (passFlag) {
return true;