czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lyf' into lyf

Browse Source
This commit is contained in:
wangguocheng
2024-05-22 11:43:13 +08:00
parent 1b4866c4dc 000bf44a63
commit 2f84bed116
8 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
View File

@@ -217,21 +217,20 @@ public class LoginContoller {
}
// /**
// * 获取会员码
// *
// * @param openId
// * @param token
// * @param id
// * @return
// */
// @GetMapping("createCardNo")
// public Result createCardNo(@RequestHeader("openId") String openId, @RequestHeader("token") String token, @RequestHeader("id") String id,
//
// @RequestParam("shopId") String shopId
// ) {
// return loginService.createCardNo(id, openId,shopId);
// }
/**
* 获取会员码
*
* @param openId
* @param token
* @param id
* @return
*/
@GetMapping("createCardNo")
public Result createCardNo(@RequestHeader("openId") String openId, @RequestHeader("token") String token, @RequestHeader("id") String id,
@RequestParam("shopId") String shopId
) {
return loginService.createCardNo(id, openId,shopId);
}
@GetMapping("/userInfo")
public Result userInfo(@RequestParam("userId") Integer userId) {

15
src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
View File

@@ -53,11 +53,13 @@ public class NotifyController {
Map<String, Object> map= getParameterMap(request);
log.info("fstmemberInCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){
Map<String,Object> object=(Map)map.get("bizData");
// Map<String,Object> object=(Map)map.get("bizData");
JSONObject object=JSONUtil.parseObj(map.get("bizData").toString());
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
if("TRADE_SUCCESS".equals(object.get("state").toString())){
String orderNo=map.get("mchOrderNo").toString();
String tradeNo=map.get("payOrderId").toString();
String orderNo=object.get("mchOrderNo").toString();
String tradeNo=object.get("payOrderId").toString();
return payService.fstMemberInSuccess(orderNo,tradeNo);
}
}
@@ -90,11 +92,12 @@ public class NotifyController {
Map<String, Object> map= getParameterMap(request);
log.info("notifyfstCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){
Map<String,Object> object=(Map)map.get("bizData");
JSONObject object=JSONUtil.parseObj(map.get("bizData").toString());
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
if("TRADE_SUCCESS".equals(object.get("state").toString())){
String orderNo=map.get("mchOrderNo").toString();
String tradeNo=map.get("payOrderId").toString();
String orderNo=object.get("mchOrderNo").toString();
String tradeNo=object.get("payOrderId").toString();
return payService.callBackPayFST(tradeNo);
}
}

10
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@@ -127,6 +127,16 @@ public class PayController {
}
@RequestMapping("getActive")
public Result getActive(
@RequestHeader("token") String token,
@RequestParam("shopId") String shopId,
@RequestParam("page") int page,
@RequestParam("pageSize") int pageSize){
return payService.getActivate(shopId,page,pageSize);
}
/**
* 充值
*