From 92e9dee23643f10e74af960bfa5a43f8371710e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Wed, 22 May 2024 09:40:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NotifyController.java | 15 +++++++++------ .../cashierservice/controller/PayController.java | 4 ++++ .../system/cashierservice/service/PayService.java | 15 +++++++++++---- src/main/resources/application-dev.yml | 2 +- src/main/resources/application.yml | 3 ++- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java index 1a026fd..96f5749 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java @@ -53,11 +53,13 @@ public class NotifyController { Map map= getParameterMap(request); log.info("fstmemberInCallBack回调返回信息:{}",JSONUtil.toJsonStr(map)); if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){ - Map object=(Map)map.get("bizData"); +// Map 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 map= getParameterMap(request); log.info("notifyfstCallBack回调返回信息:{}",JSONUtil.toJsonStr(map)); if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){ - Map 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); } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index c010e68..932f421 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -127,6 +127,10 @@ public class PayController { } +// public Result getActive(@RequestHeader("token") String token,@RequestParam("shopId") String shopId,@RequestParam("page") int page,@RequestParam("pageSize") int pageSize){ +// +// } + /** * 充值 * diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 6117d86..661c06e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -114,8 +114,11 @@ public class PayService { - @Value("${thirdPay.callBack}") - private String callBack; + @Value("${thirdPay.callInBack}") + private String callInBack; + + @Value("${thirdPay.callFSTBack}") + private String callFSTBack; @Autowired ThirdPayService thirdPayService; @@ -240,7 +243,7 @@ public class PayService { reqbody=body.toString(); } - PublicResp publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),reqbody,reqbody,payment.getAmount().setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),openId,ip,DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callBack,null,thirdApply.getAppToken()); + PublicResp publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),reqbody,reqbody,payment.getAmount().setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),openId,ip,DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callFSTBack,null,thirdApply.getAppToken()); if(ObjectUtil.isNotNull(publicResp)&&ObjectUtil.isNotEmpty(publicResp)){ if("000000".equals(publicResp.getCode())){ WxScanPayResp wxScanPayResp= publicResp.getObjData(); @@ -784,7 +787,7 @@ public class PayService { } } }else { - PublicResp publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),"会员充值","会员充值",new BigDecimal(amount).setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),userId,ip, DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callBack,null,thirdApply.getAppToken()); + PublicResp publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),"会员充值","会员充值",new BigDecimal(amount).setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),userId,ip, DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callInBack,null,thirdApply.getAppToken()); if(ObjectUtil.isNotNull(publicResp)&&ObjectUtil.isNotEmpty(publicResp)){ if("000000".equals(publicResp.getCode())){ WxScanPayResp wxScanPayResp= publicResp.getObjData(); @@ -918,6 +921,10 @@ public class PayService { return null; } + + + + /** * 生成长度为12的随机串 * diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f98e837..38086ab 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -59,7 +59,7 @@ ysk: callBackIn: https://p40312246f.goho.co/cashierService/notify/memberInCallBack default: 18710449883 server: - port: 9888 + port: 9889 prod: dev1 queue: cart_queue_putdev1 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 94f3399..f520886 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -57,5 +57,6 @@ aliyun: thirdPay: payType: fushangtong - callBack: https://cashierclient.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack + callInBack: https://wxcashiertest.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack + callFSTBack: https://wxcashiertest.sxczgkj.cn${server.servlet.context-path}notify/notifyfstCallBack url: https://paymentapi.sxczgkj.cn From 000bf44a6378d1265ba987c01e91c21186b97826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Wed, 22 May 2024 11:43:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LoginContoller.java | 29 +++++++++---------- .../controller/PayController.java | 12 ++++++-- .../cashierservice/dao/TbActivateMapper.java | 3 ++ .../cashierservice/service/PayService.java | 10 +++++++ .../resources/mapper/TbActivateMapper.xml | 4 +++ 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java index fe52ccf..aed4f14 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java @@ -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) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 932f421..a7ce8a0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -127,9 +127,15 @@ public class PayController { } -// public Result getActive(@RequestHeader("token") String token,@RequestParam("shopId") String shopId,@RequestParam("page") int page,@RequestParam("pageSize") int pageSize){ -// -// } + @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); + + } /** * 充值 diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java index 2b8505e..2a458b2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.util.List; @Component @Mapper @@ -23,4 +24,6 @@ public interface TbActivateMapper { int updateByPrimaryKey(TbActivate record); TbActivate selectByAmount(@Param("shopId") String shopId,@Param("amount") BigDecimal amount); + + List selectByShpopId(String shopId); } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index c328d4f..bcb9d7c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -24,6 +24,8 @@ import com.chaozhanggui.system.cashierservice.thirdpay.service.ThirdPayService; import com.chaozhanggui.system.cashierservice.util.*; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -925,6 +927,14 @@ public class PayService { } + public Result getActivate(String shopId,int page ,int pageSize){ + PageHelper.startPage(page, pageSize); + List list=tbActivateMapper.selectByShpopId(shopId); + PageInfo pageInfo=new PageInfo(list); + return Result.success(CodeEnum.SUCCESS,pageInfo); + } + + diff --git a/src/main/resources/mapper/TbActivateMapper.xml b/src/main/resources/mapper/TbActivateMapper.xml index 0f29dcc..821aa29 100644 --- a/src/main/resources/mapper/TbActivateMapper.xml +++ b/src/main/resources/mapper/TbActivateMapper.xml @@ -118,4 +118,8 @@ + + \ No newline at end of file