From e28d76a334c1fcf5f8c2474c63a1dbe7ed5e4002 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 31 Dec 2023 23:07:00 +0800 Subject: [PATCH] fix --- .../WxProfitSharingReceiverService.java | 65 ------------------- ...ProfitSharingReceiverApplyServiceImpl.java | 20 ------ 2 files changed, 85 deletions(-) delete mode 100644 yqzjService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java diff --git a/yqzjService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java b/yqzjService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java deleted file mode 100644 index 654ca2b..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxProfitSharingReceiver; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumPayWay; -import com.iformall.enums.EnumProfitSharingType; - -import java.util.List; - -public interface WxProfitSharingReceiverService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @return - */ - PageInfo listAsPage(WxProfitSharingReceiver record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxProfitSharingReceiver getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxProfitSharingReceiver record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - WxProfitSharingReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat,EnumProfitSharingType sharingType); - List findReceivers(TenantEntity tenantEntity,Long merchantId); - - ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, List delList); - - ResultData delReceiver(WxProfitSharingReceiver receiver, Integer send); - - ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); - - void sendMsg(String phone, String account, String merchant, String time, Integer modelType, TenantEntity tenantEntity); - - ResultData updateTtReceiver(WxMerchant merchant); - - ResultData getTtReceiverImprotURL(WxMerchant merchant); - - ResultData getTtReceiverBalanceURL(WxMerchant merchant); - - ResultData updateTtReceiverIsUse(WxMerchant merchant); - -} diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java index e3440a3..112122b 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverApplyServiceImpl.java @@ -38,9 +38,6 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR @Autowired WxProfitSharingReceiverApplyMapper wxProfitSharingReceiverApplyMapper; - @Autowired - WxProfitSharingReceiverService wxProfitSharingReceiverService; - @Autowired WxAppinfoService wxAppinfoService; @@ -143,23 +140,6 @@ public class WxProfitSharingReceiverApplyServiceImpl implements WxProfitSharingR } receiverApplyUpd.setUpdateTime(new Date()); wxProfitSharingReceiverApplyMapper.updateById(receiverApplyUpd); - if(enumApplymentState.equals(EnumSharingReceiverApplymentState.APPLYMENT_STATE_FINISHED)){ - WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(receiverApply, receiverApply.getMerchantId(), EnumAppPlat.WX, EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT_v2); - WxProfitSharingReceiver receiverUpd = new WxProfitSharingReceiver(); - receiverUpd.updateTenantInfo(receiverApply); - if(receiver != null){ - receiverUpd.setId(receiver.getId()); - receiverUpd.setReceiverAccount(receiverApplyUpd.getSubMchid()); - }else{ - receiverUpd.setPlat(EnumAppPlat.WX.getCode()); - receiverUpd.setMerchantId(receiverApply.getMerchantId()); - receiverUpd.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); - receiverUpd.setReceiverAccount(receiverApplyUpd.getSubMchid()); - receiverUpd.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT_v2.getCode()); - receiverUpd.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); - } - wxProfitSharingReceiverService.saveOrUpdate(receiverUpd); - } receiverApply.setSubMchid(receiverApplyUpd.getSubMchid()); receiverApply.setSignUrl(receiverApplyUpd.getSignUrl());