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

This commit is contained in:
wangguocheng 2024-05-21 17:37:56 +08:00
parent 03c6f7c0da 25b48f5163
commit 8fb21d0a1b
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
View File

@ -46,7 +46,6 @@ public class LoginFilter implements Filter {
"cashierService/common/**",//通用接口 "cashierService/common/**",//通用接口
"cashierService/distirict/**",//首页其它接口 "cashierService/distirict/**",//首页其它接口
"cashierService/login/**",//登录部分接口不校验 "cashierService/login/**",//登录部分接口不校验
"cashierService/product/queryShopIdByTableCode",
"cashierService/product/queryProduct", "cashierService/product/queryProduct",
"cashierService/product/productInfo", "cashierService/product/productInfo",
"cashierService/notify/**",//登录部分接口不校验 "cashierService/notify/**",//登录部分接口不校验

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

@ -56,16 +56,12 @@ public class PayController {
/** /**
* 储值卡支付 * 储值卡支付
* @param token * @param token
* @param loginName
* @param clientType
* @param orderId * @param orderId
* @param memberId * @param memberId
* @return * @return
*/ */
@GetMapping("accountPay") @GetMapping("accountPay")
public Result accountPay(@RequestHeader("token") String token, public Result accountPay(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam("orderId") String orderId, @RequestParam("orderId") String orderId,
@RequestParam("memberId") String memberId @RequestParam("memberId") String memberId
){ ){
@ -86,6 +82,7 @@ public class PayController {
}else { }else {
userId = TokenUtil.parseParamFromToken(token).getString("userId"); userId = TokenUtil.parseParamFromToken(token).getString("userId");
} }
//订单支付 orderId:62,payType=wechatPay,userId:or1l860rwM-rU_j9KrgMOwued
log.info("订单支付 orderId:{},payType={},userId:{}",orderId,payType,userId); log.info("订单支付 orderId:{},payType={},userId:{}",orderId,payType,userId);
try { try {
// if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){ // if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){

4
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@ -376,11 +376,11 @@ public class PayService {
throw new MsgException("生成订单错误"); throw new MsgException("生成订单错误");
} }
if (ObjectUtil.isNull(tbMerchantAccount.getMerchantId()) || ObjectUtil.isEmpty(tbMerchantAccount.getMerchantId())) { if (ObjectUtil.isNull(tbMerchantAccount)) {
return Result.fail("没有对应的商户"); return Result.fail("没有对应的商户");
} }
TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getMerchantId())); TbMerchantThirdApply thirdApply = tbMerchantThirdApplyMapper.selectByPrimaryKey(Integer.valueOf(tbMerchantAccount.getId()));
if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) { if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) {
return Result.fail("支付通道不存在"); return Result.fail("支付通道不存在");