|
|
|
@@ -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()); |
|
|
|
|
|
|
|
|