fix 小店名称重新审核

netflix-dao/src/main/java/com/cyksj/model/request/TransferAccountsReq.java

@@ -49,4 +49,6 @@ public class TransferAccountsReq {
 	private Long userId;
 
 	private Integer channelType;
+
+	private String remark;
 }

netflix-service/src/main/java/com/cyksj/service/cps/shop/YhShopManageServiceImpl.java

@@ -242,6 +242,7 @@ public class YhShopManageServiceImpl implements YhShopManageService{
 				req.setName(applyMoneyReq.getRealName());
 				req.setChannelType(2);
 				req.setUserId(userId);
+				req.setRemark("小店提现");
 				AlipayResponse alipayResponse = transferFuncService.transferAccounts(req);
 				if (alipayResponse.isSuccess()) {
 					distributeMoneyApply.setVerifyStatus(YhShopDistributeMoneyApply.Status.success);

netflix-service/src/main/java/com/cyksj/service/mange/goods/CmsYhShopCommonServiceImpl.java

@@ -71,7 +71,7 @@ public class CmsYhShopCommonServiceImpl implements CmsYhShopCommonService {
 		rates.forEach(data -> {
 			Integer rate = data.getRate();
 			Long goodsId = data.getGoodsId();
-			if (goodsId != null && rate >= 0 && rate <= 100) {
+			if (goodsId != null && rate != null && rate >= 0 && rate <= 100) {
 				GoodsDon goodsDon = goodsDonMapper.selectById(goodsId);
 				if (goodsDon != null) {
 					saveShopGoodsRate.add(data);

netflix-service/src/main/java/com/cyksj/service/pay/impl/TransferFuncServiceImpl.java

@@ -52,6 +52,7 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		String type = transferAccountsReq.getType();
 		BigDecimal points = transferAccountsReq.getPoints();
 		Integer channelType = transferAccountsReq.getChannelType();
+		String remark = transferAccountsReq.getRemark();
 		/* 生成商户转账订单号 */
 		String donNo = SEQUENCE.nextId().toString();
 		if (StrUtil.isEmpty(type)) {
@@ -63,7 +64,7 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		Integer scope = transferAccountsReq.getScope();
 		AlipayClient alipayClient = AliPayClientFactory.getAlipayClient(ShopConfig.DISTRIBUTE_ZFB_DEFAULT_APP_ID);
 
-		AlipayRequest alipayRequest = aliPayTransferAccountsRequest(donNo, account, name, money);
+		AlipayRequest alipayRequest = aliPayTransferAccountsRequest(donNo, account, name, money, remark);
 
 		AlipayResponse response = alipayClient.certificateExecute(alipayRequest);
 		if (response.isSuccess()) {
@@ -76,7 +77,7 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		return response;
 	}
 
-	private AlipayRequest aliPayTransferAccountsRequest(String donNo, String account, String name, BigDecimal money) {
+	private AlipayRequest aliPayTransferAccountsRequest(String donNo, String account, String name, BigDecimal money,String remark) {
 		//支付宝转账
 		AlipayFundTransUniTransferRequest transUniTransferRequest = new AlipayFundTransUniTransferRequest();
 		//转账参数
@@ -86,7 +87,7 @@ public class TransferFuncServiceImpl implements TransferFuncService {
 		model.setTransAmount(money.divide(BigDecimal.valueOf(100)).toString());
 		model.setProductCode(ZfbProductCode.STD_RED_PACKET.getProductCode());
 		model.setBizScene(TransferConstant.DIRECT_TRANSFER);
-		model.setOrderTitle("分销提现");
+		model.setOrderTitle(remark);
 		//红包业务必传，取值REDPACKET
 		JSONObject businessParams = new JSONObject();
 		businessParams.putOpt(TransferConstant.SUB_BIZ_SCENE, TransferConstant.RED_PACKET);

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/shop/YhShopUserController.java

@@ -117,6 +117,7 @@ public class YhShopUserController {
 		yhShopApplyRecord = new YhShopApplyRecord();
 		yhShopApplyRecord.setVerifyStatus(YhShopApplyRecord.Status.modify);
 		yhShopApplyRecord.setName(name);
+		yhShopApplyRecord.setUserId(userId);
 		yhShopApplyRecordMapper.insert(yhShopApplyRecord);
 
 		if (StrUtil.isNotBlank(yhShop.getReason())) {

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -318,6 +318,7 @@ public class DistributePopularizeController {
 				req.setPoints(needSubPoints);
 				req.setUserId(userId);
 				req.setChannelType(1);
+				req.setRemark("分销提现");
 				AlipayResponse alipayResponse = transferFuncService.transferAccounts(req);
 				if (alipayResponse.isSuccess()) {
 					distributeMoneyApply.setVerifyStatus(DistributeMoneyApply.Status.success);