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

修改进件资料时 判断修改进件状态

Browse Source
This commit is contained in:
gong
2026-01-14 11:32:35 +08:00
parent e798781ca0
commit f12e7f9802
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java
View File

@@ -100,15 +100,19 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
merchant.setBusinessLicenceInfo(JSONObject.toJSONString(reqDto.getBusinessLicenceInfo())); merchant.setBusinessLicenceInfo(JSONObject.toJSONString(reqDto.getBusinessLicenceInfo()));
merchant.setStoreInfo(JSONObject.toJSONString(reqDto.getStoreInfo())); merchant.setStoreInfo(JSONObject.toJSONString(reqDto.getStoreInfo()));
merchant.setSettlementInfo(JSONObject.toJSONString(reqDto.getSettlementInfo())); merchant.setSettlementInfo(JSONObject.toJSONString(reqDto.getSettlementInfo()));
if (merchant.getAlipayStatus().equals(PayCst.EntryStatus.INIT) || merchant.getAlipayStatus().equals(PayCst.EntryStatus.REJECTED)) {
merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
}
if (merchant.getWechatStatus().equals(PayCst.EntryStatus.INIT) || merchant.getWechatStatus().equals(PayCst.EntryStatus.REJECTED)) {
merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
}
if (isSave) { if (isSave) {
merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
result = save(merchant); result = save(merchant);
} else { } else {
ShopDirectMerchant directMerchant = getById(reqDto.getShopId());
if (directMerchant.getAlipayStatus().equals(PayCst.EntryStatus.INIT) || directMerchant.getAlipayStatus().equals(PayCst.EntryStatus.REJECTED)) {
merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
}
if (directMerchant.getWechatStatus().equals(PayCst.EntryStatus.INIT) || directMerchant.getWechatStatus().equals(PayCst.EntryStatus.REJECTED)) {
merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
}
result = updateById(merchant); result = updateById(merchant);
} }
//发送进件队列消息 //发送进件队列消息