| @@ -49,9 +49,6 @@ public class WxProjectConfigController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| WxPayAccountService wxPayAccountService; | WxPayAccountService wxPayAccountService; | ||||
| @Autowired | |||||
| WxPayAccountBillService wxPayAccountBillService; | |||||
| @Autowired | @Autowired | ||||
| MallUserInfoService userInfoService; | MallUserInfoService userInfoService; | ||||
| @@ -293,9 +290,6 @@ public class WxProjectConfigController extends BaseController { | |||||
| WxPayAccount wxPayAccount = wxPayAccountService.getById(appinfo.getPayId()); | WxPayAccount wxPayAccount = wxPayAccountService.getById(appinfo.getPayId()); | ||||
| map.put("wxPayAccount",wxPayAccount); | map.put("wxPayAccount",wxPayAccount); | ||||
| } | } | ||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(this.getTenantInfo()); | |||||
| map.put("wxPayAccountBill",wxPayAccountBill); | |||||
| return new ResultData(map); | return new ResultData(map); | ||||
| }catch (Exception e){ | }catch (Exception e){ | ||||
| @@ -314,16 +308,6 @@ public class WxProjectConfigController extends BaseController { | |||||
| if(StringUtils.isBlank(wxAppinfo.getTenantId())){ | if(StringUtils.isBlank(wxAppinfo.getTenantId())){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | 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); | wxAppinfoService.saveOrUpdate(wxAppinfo); | ||||
| @@ -663,10 +647,6 @@ public class WxProjectConfigController extends BaseController { | |||||
| ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); | ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); | ||||
| map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); | 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 wxAppinfo = new WxAppinfo(); | ||||
| wxAppinfo.setTenantId(wxMall.getTenantId()); | wxAppinfo.setTenantId(wxMall.getTenantId()); | ||||
| @@ -7,15 +7,6 @@ import com.iformall.domain.po.WxPayAccountBill; | |||||
| public interface WxPayAccountBillService { | public interface WxPayAccountBillService { | ||||
| /** | |||||
| * --- 特殊商户号开通后,填写此数据 | |||||
| * WxPayAccountBill初始化 | |||||
| * 返回id | |||||
| * @param wxPayAccount | |||||
| * @return | |||||
| */ | |||||
| Long wxPayAccountInit(WxPayAccount wxPayAccount); | |||||
| /** | /** | ||||
| * 根据实体查询分页列表 | * 根据实体查询分页列表 | ||||
| * | * | ||||
| @@ -7,16 +7,6 @@ import com.iformall.domain.po.WxProjectConfig; | |||||
| public interface WxPayAccountService { | 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); | void deleteById(Long id); | ||||
| //WxPayAccount getByTenantId(String te); | |||||
| WxPayService getWxPayService(String tenantId); | WxPayService getWxPayService(String tenantId); | ||||
| } | } | ||||
| @@ -29,15 +29,6 @@ public class WxPayAccountBillServiceImpl implements WxPayAccountBillService { | |||||
| @Autowired | @Autowired | ||||
| WxBillPropertyMapper wxBillPropertyMapper; | 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 | @Override | ||||
| public PageInfo<WxPayAccountBill> listAsPage(WxPayAccountBill record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxPayAccountBill> listAsPage(WxPayAccountBill record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountBillMapper.findList(record)); | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountBillMapper.findList(record)); | ||||
| @@ -32,26 +32,6 @@ public class WxPayAccountServiceImpl implements WxPayAccountService { | |||||
| @Autowired | @Autowired | ||||
| MaUtil maUtil; | 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 | @Override | ||||
| public PageInfo<WxPayAccount> listAsPage(WxPayAccount record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxPayAccount> listAsPage(WxPayAccount record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountMapper.findList(record)); | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPayAccountMapper.findList(record)); | ||||
| @@ -200,11 +200,6 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { | |||||
| } | } | ||||
| wxPayAccountService.saveOrUpdate(wxPayAccount); | wxPayAccountService.saveOrUpdate(wxPayAccount); | ||||
| WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); | |||||
| wxPayAccountBill.updateTenantInfo(wxPayAccount); | |||||
| wxPayAccountBill.setServiceChargeRate(0); | |||||
| wxPayAccountBillService.saveOrUpdate(wxPayAccountBill); | |||||
| if(appinfo.getPayId() == null){ | if(appinfo.getPayId() == null){ | ||||
| WxAppinfo updApp = new WxAppinfo(); | WxAppinfo updApp = new WxAppinfo(); | ||||
| updApp.updateTenantInfo(appinfo); | updApp.updateTenantInfo(appinfo); | ||||