Merge #45 into master from cc_20260226_fix
fix:建店资料查询收款银行信息区分品牌 * cc_20260226_fix: (2 commits squashed) - fix:建店资料查询收款银行信息区分品牌 - fix:sql缺失 Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/45
This commit is contained in:
@@ -82,6 +82,7 @@
|
|||||||
<if test="request.financialManagerName != null">financial_manager_name,</if>
|
<if test="request.financialManagerName != null">financial_manager_name,</if>
|
||||||
<if test="request.financialManagerMobile != null">financial_manager_mobile,</if>
|
<if test="request.financialManagerMobile != null">financial_manager_mobile,</if>
|
||||||
<if test="request.businessLicense != null">business_license,</if>
|
<if test="request.businessLicense != null">business_license,</if>
|
||||||
|
<if test="request.unifiedSocialCreditCode != null">unified_social_credit_code,</if>
|
||||||
<if test="request.electronicEmail != null">electronic_email,</if>
|
<if test="request.electronicEmail != null">electronic_email,</if>
|
||||||
<if test="request.infoSource != null">info_source,</if>
|
<if test="request.infoSource != null">info_source,</if>
|
||||||
<if test="request.otherRemark != null">other_remark,</if>
|
<if test="request.otherRemark != null">other_remark,</if>
|
||||||
|
|||||||
@@ -256,7 +256,10 @@ public class BuildInformationServiceImpl implements BuildInformationService {
|
|||||||
response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
|
response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
|
||||||
}
|
}
|
||||||
if (StringUtils.isBlank(response.getReceivingFirmName())) {
|
if (StringUtils.isBlank(response.getReceivingFirmName())) {
|
||||||
String bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO);
|
String bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":" + shopInfo.getFranchiseBrand());
|
||||||
|
if (StringUtils.isBlank(bankInfoStr)) {
|
||||||
|
bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":1");
|
||||||
|
}
|
||||||
if (StringUtils.isNotBlank(bankInfoStr)) {
|
if (StringUtils.isNotBlank(bankInfoStr)) {
|
||||||
JSONObject bankInfo = JSONObject.parseObject(bankInfoStr);
|
JSONObject bankInfo = JSONObject.parseObject(bankInfoStr);
|
||||||
response.setReceivingFirmName(bankInfo.getString("receivingFirmName"));
|
response.setReceivingFirmName(bankInfo.getString("receivingFirmName"));
|
||||||
|
|||||||
Reference in New Issue
Block a user