人工商户进件

ldt-core/src/main/java/org/springblade/ldt/shop/controller/ShopController.java

@@ -39,6 +39,7 @@ import org.springblade.ldt.shop.service.IShopService;
 import org.springblade.ldt.shop.vo.ShopVO;
 import org.springblade.ldt.shop.vo.WechatConfigQueryVO;
 import org.springblade.ldt.shop.wrapper.ShopWrapper;
+import org.springblade.yeePay.entity.saas.InvitationDto;
 import org.springblade.yeePay.entity.saas.MicroInvitationDto;
 import org.springblade.yeePay.entity.saas.WechatApplyDto;
 import org.springblade.yeePay.entity.saas.WechatConfigAddDto;
@@ -194,4 +195,10 @@ public class ShopController extends BladeController {
 		return R.data(shopService.inviteMicro(microInvitationDto));
 	}
 
+	@PostMapping("/invite")
+	@ApiOperation(value = "人工商户进件")
+	public R invite(@RequestBody InvitationDto invitationDto) {
+		return R.data(shopService.inviteMerchant(invitationDto));
+	}
+
 }

ldt-core/src/main/java/org/springblade/ldt/shop/service/IShopService.java

@@ -24,6 +24,7 @@ import org.springblade.ldt.shop.dto.ArtificialWechatApplyDto;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.shop.vo.ShopVO;
 import org.springblade.ldt.shop.vo.WechatConfigQueryVO;
+import org.springblade.yeePay.entity.saas.InvitationDto;
 import org.springblade.yeePay.entity.saas.MicroInvitationDto;
 import org.springblade.yeePay.entity.saas.WechatApplyDto;
 import org.springblade.yeePay.entity.saas.WechatConfigAddDto;
@@ -110,4 +111,13 @@ public interface IShopService extends BaseService<Shop> {
 	 * @Date 2021/11/22 14:08
 	 */
 	R inviteMicro(MicroInvitationDto microInvitationDto);
+
+	/**
+	 * @param invitationDto: 商户进件信息
+	 * @Return R 易宝请求结果
+	 * @Author July
+	 * @Description 人工商户进件
+	 * @Date 2021/11/22 16:10
+	 */
+	R inviteMerchant(InvitationDto invitationDto);
 }

ldt-core/src/main/java/org/springblade/ldt/shop/service/impl/ShopServiceImpl.java

@@ -232,7 +232,8 @@ public class ShopServiceImpl extends BaseServiceImpl<ShopMapper, Shop> implement
 	public R inviteMicro(MicroInvitationDto microInvitationDto) {
 		microInvitationDto.setParentMerchantNo(yeePayConst.getPlatformServiceNo());
 		microInvitationDto.setBusinessRole(SETTLED_MERCHANT.name());
-		microInvitationDto.setRequestNo("ldt" + microInvitationDto.getMerchantCorporationInfo().getMobile() + "micro");
+		microInvitationDto.getAccountInfo().setSettlementDirection(YeepayApiConstant.settlementDirection.BANKCARD.name());
+		microInvitationDto.setRequestNo("ldt" + microInvitationDto.getMerchantCorporationInfo().getLegalLicenceNo() + "micro");
 		microInvitationDto.setNotifyUrl(CallbackServeUrl.CALL_BACK_SERVE_URL + "/invitation/callback/" + SHOP_INVITATION);
 		YopResponse yopResponse = yeepaySaasService.inviteMicro(microInvitationDto);
 		JSONObject res = JSON.parseObject(yopResponse.getStringResult());
@@ -243,6 +244,22 @@ public class ShopServiceImpl extends BaseServiceImpl<ShopMapper, Shop> implement
 		return R.data(res);
 	}
 
+	@Override
+	public R inviteMerchant(InvitationDto invitationDto) {
+		invitationDto.setParentMerchantNo(yeePayConst.getPlatformServiceNo());
+		invitationDto.setBusinessRole(SETTLED_MERCHANT.name());
+		invitationDto.getSettlementAccountInfo().setSettlementDirection(YeepayApiConstant.settlementDirection.ACCOUNT.name());
+		invitationDto.setRequestNo("ldt" + invitationDto.getMerchantCorporationInfo().getLegalLicenceNo() + "invite");
+		invitationDto.setNotifyUrl(CallbackServeUrl.CALL_BACK_SERVE_URL + "/invitation/callback/" + SHOP_INVITATION);
+		YopResponse yopResponse = yeepaySaasService.inviteMerchant(invitationDto);
+		JSONObject res = JSON.parseObject(yopResponse.getStringResult());
+		if (!Objects.equals(res.getString("returnCode"), "NIG00000")) {
+			throw new ServiceException(res.getString("returnMsg"));
+		}
+		bladeRedis.set("manual-micro-invitation", res);
+		return R.data(res);
+	}
+
 	//@Scheduled(cron = "0 */1 * * * ?")
 	private void queryStatus() {
 		//查询当前微信认证队列各个状态

ldt-core/src/main/resources/application.yml

@@ -266,6 +266,7 @@ crypto:
     - /withdraw
     - /pressure_test/scanPay
     - /pressure_test/deCodeNotifyData
-    - /ocr/idcard
+    - /ocr
+    - /oss