소스 검색

fix

master
lin 2 년 전
부모
커밋
d62663f2ac
3개의 변경된 파일24개의 추가작업 그리고 4개의 파일을 삭제
  1. +2
    -1
      gptService/src/main/java/com/iformall/domain/po/WxPayOrder.java
  2. +20
    -2
      gptService/src/main/java/com/iformall/service/wx/WxPayServiceImpl.java
  3. +2
    -1
      gptService/src/main/resources/mapper/WxPayOrderMapper.xml

+ 2
- 1
gptService/src/main/java/com/iformall/domain/po/WxPayOrder.java 파일 보기

@@ -49,7 +49,8 @@ public class WxPayOrder extends TenantEntity {
private Date validStartTime;
@io.swagger.annotations.ApiModelProperty(value="生效结束时间",name="validEndTime")
private Date validEndTime;
@io.swagger.annotations.ApiModelProperty(value="备注",name="remark")
private String remark;
@TableField(exist = false)
private Date begin;


+ 20
- 2
gptService/src/main/java/com/iformall/service/wx/WxPayServiceImpl.java 파일 보기

@@ -170,6 +170,17 @@ public class WxPayServiceImpl implements WxPayService {
boolean stocksetlock = redisLock.lock("carPayOrderLock_"+orderId, timeStr);
if (stocksetlock) {
try {
WxCUser wxCUser = wxCUserMapper.selectById(cUserId, tenantId);
if (null == wxCUser) {
throw new MallinkException(ErrorCode.SERVER_ERROR.getCode(),"支付更新失败,用户不存在"+cUserId);
}
Date curr = new Date();
//用户当前是否已过期
boolean isExpired = false;
if (null != wxCUser.getValidEndTime() && wxCUser.getValidEndTime().before(curr)) {
isExpired = true;
}
//创建停车支付订单记录
final IdWorker idworker = IdWorker.get();
payOrder = new WxPayOrder();
@@ -182,13 +193,20 @@ public class WxPayServiceImpl implements WxPayService {
payOrder.setTransactionId(transcationId);
payOrder.setcUserPhone(userPhone);
SysConfig config = sysConfigService.getByKey(SysConfigConstant.expired_days, payOrder);
Date curr = new Date();
payOrder.setCreateTime(curr);
payOrder.setUpdateTime(curr);
payOrder.setValidStartTime(curr);
Date endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), curr);
Date endtime = null;
if (isExpired) {
endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), curr);
payOrder.setRemark("过期缴费");
}else {
endtime = DateUtils.getTimeAfterDays(Integer.parseInt(config.getConfigItemValue()), wxCUser.getValidEndTime());
payOrder.setRemark("未过期续费");
}
payOrder.setValidEndTime(endtime);
wxPayOrderMapper.insert(payOrder);
wxCUserMapper.updateValidTime(cUserId, tenantId, curr, endtime);
}catch(Exception e) {
logger.error("handlePaidSuccess fail.",e);


+ 2
- 1
gptService/src/main/resources/mapper/WxPayOrderMapper.xml 파일 보기

@@ -14,11 +14,12 @@
<result column="transaction_id" jdbcType="VARCHAR" property="transactionId"/>
<result column="valid_start_time" jdbcType="TIMESTAMP" property="validStartTime"/>
<result column="valid_end_time" jdbcType="TIMESTAMP" property="validEndTime"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`c_user_id`,`c_user_phone`,`pay_amount`,
`pay_time`,`transaction_id`,`valid_start_time`,`valid_end_time`
`pay_time`,`transaction_id`,`valid_start_time`,`valid_end_time`,`remark`
</sql>

<sql id="dynamicWhereConditions">


불러오는 중...
취소
저장