更新商家分账的四个状态
This commit is contained in:
parent
1e5c8145c4
commit
764ebfbc48
@ -33,6 +33,7 @@ import com.suisung.mall.shop.esign.utils.comm.EsignHttpResponse;
|
||||
import com.suisung.mall.shop.esign.utils.enums.EsignRequestType;
|
||||
import com.suisung.mall.shop.esign.utils.exception.EsignDemoException;
|
||||
import com.suisung.mall.shop.lakala.service.LakalaApiService;
|
||||
import com.suisung.mall.shop.lakala.service.LklLedgerMemberService;
|
||||
import com.suisung.mall.shop.page.service.OssService;
|
||||
import com.suisung.mall.shop.store.service.ShopMchEntryService;
|
||||
import com.suisung.mall.shop.store.service.ShopStoreBaseService;
|
||||
@ -97,6 +98,11 @@ public class EsignContractServiceImpl extends BaseServiceImpl<EsignContractMappe
|
||||
@Resource
|
||||
private LakalaApiService lakalaApiService;
|
||||
|
||||
|
||||
@Lazy
|
||||
@Resource
|
||||
private LklLedgerMemberService lklLedgerMemberService;
|
||||
|
||||
@Resource
|
||||
private OssService ossService;
|
||||
|
||||
@ -304,22 +310,8 @@ public class EsignContractServiceImpl extends BaseServiceImpl<EsignContractMappe
|
||||
log.error("商家申请分账功能失败：{}", retPair.getSecond());
|
||||
}
|
||||
|
||||
|
||||
// taskService.executeTask(() -> {
|
||||
// 1、（电子合同）给商家申请分账功能使用；
|
||||
|
||||
// 新建一个正式的已审核通过的店铺
|
||||
// Pair<Integer, String> retPair = shopStoreBaseService.merchEntryInfo2StoreInfo(esignContract.getMch_mobile());
|
||||
// if (retPair.getFirst() > 0) {
|
||||
// // 更改合同记录表的店铺id
|
||||
// updateContractStoreId(esignContract.getMch_mobile(), retPair.getFirst());
|
||||
// // 填充合同模版表的店铺Id
|
||||
// esignContractFillingFileService.updateContractFillingStoreId(esignContract.getMch_mobile(), retPair.getFirst());
|
||||
// // 店铺创建状态已完成
|
||||
// shopMchEntryService.updateMerchEntryStoreStatus(esignContract.getMch_mobile(), CommonConstant.Enable);
|
||||
// }
|
||||
|
||||
// });
|
||||
// 更新商家的hasEsigned状态=1
|
||||
lklLedgerMemberService.updateMulStatus("", esignContract.getMch_mobile(), 1, 0, 0, 0);
|
||||
|
||||
return new ResponseEntity<>(new JSONObject().put("code", 200).put("msg", "success").toString(), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@ -58,11 +58,12 @@ public interface LklLedgerMemberService extends IBaseService<LklLedgerMember> {
|
||||
* 更新分账多个状态
|
||||
*
|
||||
* @param merCupNo
|
||||
* @param mchMobile
|
||||
* @param hasEsigned
|
||||
* @param hasApplySplit
|
||||
* @param hasReceiver
|
||||
* @param hasBindReceiver
|
||||
* @return
|
||||
*/
|
||||
Boolean updateMulStatus(String merCupNo, Integer hasEsigned, Integer hasApplySplit, Integer hasReceiver, Integer hasBindReceiver);
|
||||
Boolean updateMulStatus(String merCupNo, String mchMobile, Integer hasEsigned, Integer hasApplySplit, Integer hasReceiver, Integer hasBindReceiver);
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ import java.util.List;
|
||||
public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
private static final boolean init = false;
|
||||
private static final String lklSuccessCode = "000000";
|
||||
//### 可选的两个参数，不同的店铺商家，可以数据库里配置不同的商户号和终端号
|
||||
// 可选的两个参数，不同的店铺商家，可以数据库里配置不同的商户号和终端号
|
||||
@Value("${lakala.merchant_no}")
|
||||
public String merchantNo; // 拉卡拉分配的商户号
|
||||
@Value("${lakala.term_no}")
|
||||
@ -553,7 +553,6 @@ public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
return Pair.of(true, I18nUtil._("商家已经申请过了！"));
|
||||
}
|
||||
|
||||
|
||||
// 1. 配置初始化
|
||||
initLKLSDK();
|
||||
|
||||
@ -681,6 +680,7 @@ public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
}
|
||||
|
||||
// 更改本地分账记录状态数据
|
||||
String merCupNo = paramsJSON.getStr("merCupNo");
|
||||
Boolean success = lklLedgerMemberService.updateAuditResult(applyId,
|
||||
paramsJSON.getStr("merInnerNo"),
|
||||
paramsJSON.getStr("merCupNo"),
|
||||
@ -696,16 +696,20 @@ public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
respData.put("retMsg", "操作成功！");
|
||||
log.info("商户分账申请业务回调：处理成功");
|
||||
|
||||
// 重要注：商户分账申请业务成功后，同时也会新增接收方，绑定接收方（平台方和代理商），绑定之前，判断是否已经绑定过了？
|
||||
// 重要注：商户分账申请业务成功后，同时也会新增接收方，这时系统绑定接收方（平台方和代理商），绑定之前，要判断是否已经绑定过了？
|
||||
JSONObject bindParamsJSON = new JSONObject();
|
||||
bindParamsJSON.put("merInnerNo", paramsJSON.getStr("merInnerNo"));
|
||||
bindParamsJSON.put("merCupNo", paramsJSON.getStr("merCupNo"));
|
||||
bindParamsJSON.put("merCupNo", merCupNo);
|
||||
Pair<Boolean, String> bindResult = innerApplyLedgerMerReceiverBind(bindParamsJSON);
|
||||
if (bindResult.getFirst()) {
|
||||
log.info("商户分账申请业务回调：", bindResult.getSecond());
|
||||
} else {
|
||||
log.error("商户分账申请业务回调：", bindResult.getSecond());
|
||||
}
|
||||
|
||||
// 更新商家的hasApplySplit状态=1
|
||||
lklLedgerMemberService.updateMulStatus(merCupNo, "", 0, 1, 0, 0);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -738,8 +742,10 @@ public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
req.setOrgCode(orgCode);
|
||||
req.setVersion("2.0");
|
||||
|
||||
String mchMobile = paramsJSON.getStr("contactMobile");
|
||||
|
||||
req.setReceiverName(paramsJSON.getStr("receiverName"));
|
||||
req.setContactMobile(paramsJSON.getStr("contactMobile"));
|
||||
req.setContactMobile(mchMobile);
|
||||
|
||||
req.setLicenseNo(paramsJSON.getStr("licenseNo"));
|
||||
req.setLicenseName(paramsJSON.getStr("licenseName"));
|
||||
@ -812,6 +818,9 @@ public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
log.error("接收方创建成功，但更新本地数据 lklLedgerReceiverService.saveOrUpdateByReceiverNo 失败！");
|
||||
}
|
||||
|
||||
// 更新商家的has_receiver状态=1
|
||||
lklLedgerMemberService.updateMulStatus("", mchMobile, 0, 0, 1, 0);
|
||||
|
||||
|
||||
return CommonResult.success(lklLedgerReceiver, "创建接收方成功！");
|
||||
} catch (SDKException e) {
|
||||
@ -1073,6 +1082,9 @@ public class LakalaApiServiceImpl implements LakalaApiService {
|
||||
if (success) {
|
||||
respData.put("retCode", lklSuccessCode);
|
||||
|
||||
// 更改商家的状态 has_bind_receiver 状态=1
|
||||
lklLedgerMemberService.updateMulStatus(merCupNo, "", 0, 0, 0, 1);
|
||||
|
||||
// TODO 新建一个正式的已审核通过的店铺， 新建之前判断是否已经新建过了？
|
||||
// 新建一个正式的已审核通过的店铺
|
||||
ShopMchEntry shopEntry = shopMchEntryService.getShopMerchEntryByMerCupNo(merCupNo);
|
||||
|
||||
@ -128,6 +128,7 @@ public class LklLedgerMemberServiceImpl extends BaseServiceImpl<LklLedgerMemberM
|
||||
* 更新分账多个状态
|
||||
*
|
||||
* @param merCupNo
|
||||
* @param mchMobile
|
||||
* @param hasEsigned
|
||||
* @param hasApplySplit
|
||||
* @param hasReceiver
|
||||
@ -135,36 +136,47 @@ public class LklLedgerMemberServiceImpl extends BaseServiceImpl<LklLedgerMemberM
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateMulStatus(String merCupNo, Integer hasEsigned, Integer hasApplySplit, Integer hasReceiver, Integer hasBindReceiver) {
|
||||
if (StrUtil.isBlank(merCupNo)) {
|
||||
log.error("缺少参数：merCupNo}");
|
||||
public Boolean updateMulStatus(String merCupNo, String mchMobile, Integer hasEsigned, Integer hasApplySplit, Integer hasReceiver, Integer hasBindReceiver) {
|
||||
if (StrUtil.isBlank(merCupNo) && StrUtil.isBlank(mchMobile)) {
|
||||
log.error("缺少必要参数:{} 或 {}", "merCupNo", "mchMobile");
|
||||
return false;
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
UpdateWrapper<LklLedgerMember> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.eq("mer_cup_no", merCupNo);
|
||||
if (hasEsigned != null && hasEsigned > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_esigned", hasEsigned);
|
||||
}
|
||||
if (hasApplySplit != null && hasApplySplit > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_apply_split", hasApplySplit);
|
||||
}
|
||||
if (hasReceiver != null && hasReceiver > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_receiver", hasReceiver);
|
||||
}
|
||||
if (hasBindReceiver != null && hasBindReceiver > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_bind_receiver", hasBindReceiver);
|
||||
}
|
||||
try {
|
||||
int i = 0;
|
||||
UpdateWrapper<LklLedgerMember> updateWrapper = new UpdateWrapper<>();
|
||||
if (StrUtil.isNotBlank(mchMobile)) {
|
||||
updateWrapper.eq("mch_mobile", mchMobile);
|
||||
}
|
||||
if (StrUtil.isNotBlank(merCupNo)) {
|
||||
updateWrapper.eq("mer_cup_no", merCupNo);
|
||||
}
|
||||
|
||||
if (i == 0) {
|
||||
if (hasEsigned != null && hasEsigned > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_esigned", hasEsigned);
|
||||
}
|
||||
if (hasApplySplit != null && hasApplySplit > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_apply_split", hasApplySplit);
|
||||
}
|
||||
if (hasReceiver != null && hasReceiver > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_receiver", hasReceiver);
|
||||
}
|
||||
if (hasBindReceiver != null && hasBindReceiver > 0) {
|
||||
i++;
|
||||
updateWrapper.set("has_bind_receiver", hasBindReceiver);
|
||||
}
|
||||
|
||||
if (i == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return update(updateWrapper);
|
||||
} catch (Exception e) {
|
||||
log.error("更新分账商家多个状态失败", e);
|
||||
return false;
|
||||
}
|
||||
|
||||
return update(updateWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
@ -368,7 +368,7 @@ public class LklTkServiceImpl {
|
||||
formData.put("larIdCardEnd", larIdCardEnd); // 身份证有效期结束时间，长期：9999-12-31
|
||||
|
||||
// 营业执照上的经营内容
|
||||
formData.put("businessContent", shopMchEntry.getSales_info());
|
||||
formData.put("businessContent", shopMchEntry.getBiz_license_content());
|
||||
|
||||
// 营业执照信息
|
||||
if (isQy) {
|
||||
|
||||
@ -205,6 +205,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
|
||||
return CommonResult.failed(isApplied.getSecond());
|
||||
}
|
||||
|
||||
// 营业执照经营范围内容
|
||||
if (ObjectUtil.isEmpty(record.getSales_info())) {
|
||||
record.setSales_info(record.getBiz_license_content());
|
||||
}
|
||||
|
||||
record.setCreated_by(userId);
|
||||
record.setApproval_status(CommonConstant.MCH_APPR_STA_PADDING);
|
||||
record.setApproval_remark("您的申请入驻平台材料已提交，待审中，请耐心等待！");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user