suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20241008_sysBuildAndAdjust' into 'master'

Browse Source 
Cc 20241008 sys build and adjust

See merge request hangzhou/java/custom_zxjp!25
This commit is contained in:
苏竹红
2024-11-07 13:21:28 +00:00
parent d36d9f2017 eb565b2974
commit a483ac86ad
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.BankDAO;
import com.cool.store.dao.LineAuditInfoDAO;
import com.cool.store.dao.LineInfoDAO;
@@ -13,6 +14,7 @@ import com.cool.store.mapper.LinePayMapper;
import com.cool.store.request.AuditRejectRequest;
import com.cool.store.request.BranchBankPageRequest;
import com.cool.store.service.BankService;
import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.StringUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
@@ -21,9 +23,11 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.MessageFormat;
import java.util.List;
/**
@@ -34,6 +38,10 @@ import java.util.List;
@Slf4j
public class BankServiceImpl extends LineFlowService implements BankService {
@Autowired
private RedisUtilPool redisUtilPool;
@Value("${mybatis.configuration.variables.enterpriseId}")
private String eid;
@Autowired
private BankDAO bankDAO;
@Resource
@@ -71,6 +79,8 @@ public class BankServiceImpl extends LineFlowService implements BankService {
WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage();
//更新线索阶段
lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, lineInfo.getId());
redisUtilPool.delKey(key);
return Boolean.TRUE;
}

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.LineInfoDAO;
import com.cool.store.dao.QualificationsInfoDAO;
import com.cool.store.dao.RegionAreaConfigDao;
@@ -14,13 +15,17 @@ import com.cool.store.mapper.LineInfoMapper;
import com.cool.store.request.JoinIntentionRequest;
import com.cool.store.service.JoinIntentionService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.PartnerBaseInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.MessageFormat;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
View File

@@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.MessageFormat;
import java.util.*;
@@ -207,7 +208,12 @@ public class LinePayServiceImpl implements LinePayService {
linePayDO.setUpdateUserId(partnerUser.getPartnerId());
}
}
linePayDO.setAmount(request.getAmount());
if(PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())){
String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, request.getLineId());
String getAmount = redisUtilPool.getString(key);
linePayDO.setAmount(new BigDecimal(getAmount));
}
}
}