Browse Source

fix

master
lin 1 year ago
parent
commit
37341ba628
2 changed files with 35 additions and 0 deletions
  1. +24
    -0
      gptCApi/src/main/java/com/iformall/controller/HomeController.java
  2. +11
    -0
      gptService/src/main/java/com/iformall/service/wx/WxPayServiceImpl.java

+ 24
- 0
gptCApi/src/main/java/com/iformall/controller/HomeController.java View File

@@ -0,0 +1,24 @@
package com.iformall.controller;

import com.iformall.common.ResultData;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;


@RestController
public class HomeController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Value("${version}")
private String version;

@ApiOperation("获取后端版本号")
@GetMapping("/version")
public ResultData version() {
logger.info(">>>>>>>>>>>>>"+version);
return new ResultData(version);
}
}

+ 11
- 0
gptService/src/main/java/com/iformall/service/wx/WxPayServiceImpl.java View File

@@ -8,6 +8,7 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.entity.PayAdapterResult; import com.iformall.domain.entity.PayAdapterResult;
import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxPayOrder; import com.iformall.domain.po.WxPayOrder;
import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxPayAccount;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
@@ -19,6 +20,7 @@ import com.iformall.mapper.WxPayAccountMapper;
import com.iformall.service.SysConfigService; import com.iformall.service.SysConfigService;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxPayAccountService; import com.iformall.service.WxPayAccountService;
import com.iformall.service.cache.WxCUserCache;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import com.iformall.utils.RedisLock; import com.iformall.utils.RedisLock;
import com.iformall.utils.SysConfigConstant; import com.iformall.utils.SysConfigConstant;
@@ -31,7 +33,9 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -71,6 +75,10 @@ public class WxPayServiceImpl implements WxPayService {
@Autowired @Autowired
WxCUserMapper wxCUserMapper; WxCUserMapper wxCUserMapper;
@Autowired
@Qualifier("objectCommonRedisTemplate")
RedisTemplate<String, Object> wxPayRedisTemplate;
@Override @Override
public PageInfo<WxPayOrder> listPayOrderAsPage(WxPayOrder record, Integer pageIndex, Integer pageSize) { public PageInfo<WxPayOrder> listPayOrderAsPage(WxPayOrder record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayOrderMapper.findList(record)); return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayOrderMapper.findList(record));
@@ -129,6 +137,9 @@ public class WxPayServiceImpl implements WxPayService {
handlePaidSuccess(tenantId,Long.parseLong(payOrderNo),cUserId,Integer.parseInt(cashFeeStr), handlePaidSuccess(tenantId,Long.parseLong(payOrderNo),cUserId,Integer.parseInt(cashFeeStr),
DateUtils.string2Date(time_end, DateUtils.DATE_PATTERN_ALL_NOSPACE).getTime(),transcationId, DateUtils.string2Date(time_end, DateUtils.DATE_PATTERN_ALL_NOSPACE).getTime(),transcationId,
userPhone); userPhone);
WxCUser cUser = wxCUserMapper.selectById(cUserId, tenantId);
WxCUserCache.cacheApp(wxPayRedisTemplate, cUser);
} catch (Exception e) { } catch (Exception e) {
logger.error("handlePaidCallBackError.",e); logger.error("handlePaidCallBackError.",e);
return notifyErrorResult(e.getMessage()); return notifyErrorResult(e.getMessage());


Loading…
Cancel
Save