czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

后台主页逻辑加规则，账单详情改变接口传参方式，vip同步小程序，后台营业执照日期格式，银盛回调暂时在测试服上

Browse Source
This commit is contained in:
liuyingfang
2023-04-25 16:36:31 +08:00
parent 69eea7ab5f
commit b5174dce3d
8 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
View File

@@ -476,9 +476,13 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
if (!mbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_MICRO)) {
busInfo.setBusNm(mbi.getBussAuthName());
busInfo.setBusNo(mbi.getBussAuthNum());
busInfo.setBusCertBgn(mbi.getBussAuthStartTime().replace("-", ""));
//TODO 有时营业执照有效日期没有填写
busInfo.setBusCertExpire(mbi.getBussAuthEndTime().replace("-", ""));
if (mbi.getBussAuthStartTime() == null || mbi.getBussAuthEndTime() == null){
throw new MsgException("营业执照日期有误");
}
busInfo.setBusCertBgn(mbi.getBussAuthStartTime().replace("年","")
.replace("月", "").replace("日", ""));
busInfo.setBusCertExpire(mbi.getBussAuthEndTime().replace("年","")
.replace("月", "").replace("日", ""));
busInfo.setBusAddr(mbi.getBussAuthAddress());
busInfo.setBusCertType("19");
} else {

8
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
View File

@@ -390,9 +390,9 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
account.setBankCardId(accountDTO.getBankCard().getId() + "");
save(account);
if (!accountDTO.getChannelType().equals(Account.CHANNEL_TYPE_D1)) {
return;
}
// if (!accountDTO.getChannelType().equals(Account.CHANNEL_TYPE_D1)) {
// return;
// }
// 如果不存在D0的结算信息，则直接将D1的结算信息带过来
LambdaQueryWrapper<Account> qWrapperAccountD1 = Wrappers.lambdaQuery();
@@ -1161,7 +1161,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
bankCardDTO.setBankHolder(certName);
try {
aliyunService.checkBankCorrect(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName);
aliyunService.checkBankCorrectNow(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName);
} catch (MsgException e) {
throw new MsgException("银行卡信息校验不通过，请填写结算人【" + DesensitizedUtil.chineseName(certName) + "】的银行卡");
}

20
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
View File

@@ -69,6 +69,7 @@ import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -76,6 +77,8 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.io.*;
@@ -839,6 +842,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
setMemberRechargeOrder(dto, menber, memberOrder, recharge, order);
try {
merchantMenberService.sendMenberBalanceChangeNotice(menber,recharge.getRechargeMoney(),"3");
synchronizedUsers(dto, menber);
}catch (Exception e){
e.printStackTrace();
}
@@ -850,6 +854,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
setMemberRechargeOrder(dto, menber, memberOrder, recharge, order);
try {
merchantMenberService.sendMenberBalanceChangeNotice(menber,recharge.getRechargeMoney(),"1");
synchronizedUsers(dto, menber);
}catch (Exception e){
e.printStackTrace();
}
@@ -863,6 +868,21 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
}
}
//数据同步到小程序
public static void synchronizedUsers(MemberRechargeDTO userDTO, MerchantMenber menber){
RestTemplate restTemplate = new RestTemplate();
String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-member";
LinkedMultiValueMap<String, Object> param = new LinkedMultiValueMap<>(16);
String useFee = BigDecimal.valueOf(menber.getUsableRechargeFee() + menber.getUsableGiveFee()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString();
param.add("type", userDTO.getType());
param.add("rechargeMoney", userDTO.getRechargeMoney());
param.add("storeId", userDTO.getStoreId());
param.add("phone", userDTO.getPhone());
param.add("useFee", useFee);
param.add("memberCode",menber.getMemberCode());
String s = restTemplate.postForObject(baseUrl, param, String.class);
System.out.println("搞定");
}
/**
* @param order
* @param dto

8
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java
View File

@@ -40,10 +40,10 @@ public class YsConfigV3 {
public static final String REQ_SUCCESS = "00000";
public static final String BIZ_SUCCESS = "0000";
public static final String AUDIT_NOTIFY_URL = "https://ky.sxczgkj.cn/api/auditCallback/ysV3";
public static final String AUDIT_SIGN_NOTIFY_URL = "https://ky.sxczgkj.cn/api/auditCallback/ysSignV3";
//银盛进件回调
public static final String AUDIT_NOTIFY_URL = "http://wxgzh.sxczgkj.cn/api/auditCallback/ysV3";
//银盛签约回调
public static final String AUDIT_SIGN_NOTIFY_URL = "http://wxgzh.sxczgkj.cn/api/auditCallback/ysSignV3";
/** 成功 */
public static final String STATUS_SUCCESS = "00";