From 6bb52e5af2e735d41f5819c129ae0554383df621 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 11 Aug 2022 15:15:01 +0800 Subject: [PATCH] // pay account --- .../basic/WxProjectConfigController.java | 20 ------------------- .../service/WxPayAccountBillService.java | 9 --------- .../iformall/service/WxPayAccountService.java | 12 ----------- .../impl/WxPayAccountBillServiceImpl.java | 9 --------- .../service/impl/WxPayAccountServiceImpl.java | 20 ------------------- .../impl/WxProjectConfigServiceImpl.java | 5 ----- 6 files changed, 75 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index fbcccfbbb..d6b068d0a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -49,9 +49,6 @@ public class WxProjectConfigController extends BaseController { @Autowired WxPayAccountService wxPayAccountService; - @Autowired - WxPayAccountBillService wxPayAccountBillService; - @Autowired MallUserInfoService userInfoService; @@ -293,9 +290,6 @@ public class WxProjectConfigController extends BaseController { WxPayAccount wxPayAccount = wxPayAccountService.getById(appinfo.getPayId()); map.put("wxPayAccount",wxPayAccount); } - - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(this.getTenantInfo()); - map.put("wxPayAccountBill",wxPayAccountBill); return new ResultData(map); }catch (Exception e){ @@ -314,16 +308,6 @@ public class WxProjectConfigController extends BaseController { if(StringUtils.isBlank(wxAppinfo.getTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } -// if(wxAppinfo.getId() == null){ -// WxPayAccount byTenantId = wxPayAccountService.getByTenantId(wxAppinfo.getTenantId()); -// if(byTenantId != null){ -// wxAppinfo.setPayId(byTenantId.getId()); -// } -// WxPayAccountBill billByTenantId = wxPayAccountBillService.getByTenantId(wxAppinfo.getTenantId()); -// if(billByTenantId != null){ -// wxAppinfo.setPayBillId(billByTenantId.getId()); -// } -// } wxAppinfoService.saveOrUpdate(wxAppinfo); @@ -663,10 +647,6 @@ public class WxProjectConfigController extends BaseController { ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); -// WxPayAccount wxPayAccount = wxPayAccountService.getByTenantId(wxMall.getTenantId()); -// map.put("wxPayAccount",wxPayAccount); -// WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxMall.getTenantId()); -// map.put("wxPayAccountBill",wxPayAccountBill); WxAppinfo wxAppinfo = new WxAppinfo(); wxAppinfo.setTenantId(wxMall.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java index 83d45304a..8e0616ec6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java @@ -7,15 +7,6 @@ import com.iformall.domain.po.WxPayAccountBill; public interface WxPayAccountBillService { - /** - * --- 特殊商户号开通后,填写此数据 - * WxPayAccountBill初始化 - * 返回id - * @param wxPayAccount - * @return - */ - Long wxPayAccountInit(WxPayAccount wxPayAccount); - /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java b/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java index 7e9619073..fa5aaf956 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPayAccountService.java @@ -7,16 +7,6 @@ import com.iformall.domain.po.WxProjectConfig; public interface WxPayAccountService { - /** - * --- 特殊商户号开通后,填写此数据 - * WxPayAccount初始化 - * - * @param tenantId - * @param wxProjectConfig - * @return - */ - WxPayAccount wxPayAccountInit(String tenantId, WxProjectConfig wxProjectConfig); - /** * 根据实体查询分页列表 * @@ -50,7 +40,5 @@ public interface WxPayAccountService { void deleteById(Long id); - //WxPayAccount getByTenantId(String te); - WxPayService getWxPayService(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java index 13d7f2eac..ef30ea7a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java @@ -29,15 +29,6 @@ public class WxPayAccountBillServiceImpl implements WxPayAccountBillService { @Autowired WxBillPropertyMapper wxBillPropertyMapper; - @Override - public Long wxPayAccountInit(WxPayAccount wxPayAccount) { - WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); - wxPayAccountBill.setParentTenantId(wxPayAccount.getParentTenantId()); - wxPayAccountBill.setTenantId(wxPayAccount.getTenantId()); - wxPayAccountBillMapper.insert(wxPayAccountBill); - return wxPayAccountBill.getId(); - } - @Override public PageInfo listAsPage(WxPayAccountBill record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountBillMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java index ea8b48570..f1c5664ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java @@ -32,26 +32,6 @@ public class WxPayAccountServiceImpl implements WxPayAccountService { @Autowired MaUtil maUtil; - - @Override - public WxPayAccount wxPayAccountInit(String tenantId, WxProjectConfig wxProjectConfig) { - WxPayAccount wxPayAccount = new WxPayAccount(); -// wxPayAccount.setTenantId(tenantId); -// wxPayAccount.setMchId(wxProjectConfig.getMchId()); -// wxPayAccount.setSubMchId(wxProjectConfig.getSubMchId()); -// wxPayAccount.setApiKey(wxProjectConfig.getApiKey()); -// //默认------------------------------------------------------------- -// wxPayAccount.setNotifyUrl("https://admin.malls.iformall.com/wxPay/notify"); -// wxPayAccount.setCertPath("/opt/iformall/service/apiclient_cert.p12"); -// //---------------------------------------------------------------- -// wxPayAccount.setType(1);//0:普通商户模式, 1:服务商模式(默认服务商模式) -// wxPayAccount.setShare(0);//0: 未分账,1:分账(默认不分账) -// wxPayAccount.setRate(wxProjectConfig.getRate()); -// wxPayAccount.setRealRate(wxProjectConfig.getRealRate()); -// wxPayAccountMapper.insert(wxPayAccount); - return wxPayAccount; - } - @Override public PageInfo listAsPage(WxPayAccount record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 72d67f167..377df12c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -200,11 +200,6 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { } wxPayAccountService.saveOrUpdate(wxPayAccount); - WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); - wxPayAccountBill.updateTenantInfo(wxPayAccount); - wxPayAccountBill.setServiceChargeRate(0); - wxPayAccountBillService.saveOrUpdate(wxPayAccountBill); - if(appinfo.getPayId() == null){ WxAppinfo updApp = new WxAppinfo(); updApp.updateTenantInfo(appinfo);