diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 158c3af1f..433df06f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -11,6 +11,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.QrCodeService; +import com.iformall.utils.Constant; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -46,7 +47,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/updateQrCode") public void updateQrCode(String p)throws ServletException, IOException { if("xlldxx".equals(p)) { - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; List list = wxMerchantMapper.findQrcodeEmptyList(); logger.info("updateQrCode.count:"+list.size()); @@ -55,7 +56,7 @@ public class WxAppinfoController extends BaseController { @Override public void run() { String param = merchant.getWeappScene(); - ResultData resultData = qrCodeService.uploadQrcode(merchant.getTenantId(), 1, pageUrl, param, 0, "", "", "店铺详情"); + ResultData resultData = qrCodeService.uploadQrcode(merchant, 1, pageUrl, param, 0, "", "", "店铺详情"); Map map = (Map) resultData.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -72,7 +73,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/updateCouponQrCode") public void updateCouponQrCode(String p)throws ServletException, IOException { if("xlldxx".equals(p)){ - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; List list = wxCouponChannelMapper.findQrcodeEmptyList(); logger.info("updateCouponQrCode.count:"+list.size()); @@ -81,7 +82,7 @@ public class WxAppinfoController extends BaseController { @Override public void run() { String param = couponChannel.getWeappScene(); - ResultData resultData = qrCodeService.uploadQrcode(couponChannel.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultData = qrCodeService.uploadQrcode(couponChannel,1,pageUrl,param,0,"","","券"); Map map = (Map)resultData.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -122,7 +123,7 @@ public class WxAppinfoController extends BaseController { } try { qrCodeService.exportQrcode(request, response, - getTenantId(), type, pageUrl, sceneParam, + getTenantInfo(), type, pageUrl, sceneParam, withText, text1, text2, name); } catch (Exception e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 8f174cbe4..032d699dd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -73,10 +73,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); - } - public String getIpAddr() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index d8c1752e4..f9195c911 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -48,6 +48,7 @@ public class WxBrandController extends BaseController { if (null == wxBrand) { wxBrand = new WxBrand(); } + wxBrand.updateTenantInfo(getTenantInfo()); wxBrand.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); return new ResultData(page); @@ -57,7 +58,7 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-增加") public ResultData add(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::add"); - wxBrand.setTenantId(getTenantId()); + wxBrand.updateTenantInfo(getTenantInfo()); return wxBrandService.save(wxBrand); } @@ -69,10 +70,11 @@ public class WxBrandController extends BaseController { if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ //判断是否解绑商户 - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.updateTenantInfo(wxBrand); - wxMerchant.setIsDel(0); - wxMerchant.setBrand(wxBrand.getId()); + WxMerchant wxMerchant = new WxMerchant() {{ + setIsDel(0); + setBrand(wxBrand.getId()); + updateTenantInfo(wxBrand); + }}; List merchantList = wxMerchantService.findList(wxMerchant); if(CollectionUtils.isNotEmpty(merchantList)){ return new ResultData(Result.ERROR, "请先删除已绑定该品牌的商户。"); @@ -101,7 +103,7 @@ public class WxBrandController extends BaseController { @GetMapping("/queryBrand") @SystemControllerLog(description = "品牌-租户-全部") public ResultData queryBrand() { - List> brandList = wxBrandService.queryBrand(getTenantId()); + List> brandList = wxBrandService.queryBrand(getTenantInfo()); return new ResultData(brandList); } @@ -114,7 +116,12 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-名称是否存在") public ResultData hasBrand(String name, Long id) { logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); - return wxBrandService.hasBrand(getTenantId(), name, id); + WxBrand wxBrand = new WxBrand() {{ + setName(name); + setId(id); + updateTenantInfo(getTenantInfo()); + }}; + return wxBrandService.hasBrand(wxBrand); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index b36f45f56..6d5722c5a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -25,7 +25,7 @@ public class WxMallBuildingController extends BaseController { @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") public ResultData getbuildingfloorlist() { logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); - return wxMallBuildingService.getbuildingfloorlist(getTenantId()); + return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); } @ApiOperation("保存楼层楼座面积") @@ -42,7 +42,7 @@ public class WxMallBuildingController extends BaseController { if (record.getTotalArea() == null && record.getOperatingArea() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - record.setTenantId(getTenantId()); + record.updateTenantInfo(getTenantInfo()); wxMallBuildingService.saveFloorArea(record); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java index 623f7299f..4424a8eeb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java @@ -24,7 +24,7 @@ public class WxMerchantBUserController extends BaseController { @ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true) public ResultData hasphone(String phone) { logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::hasphone"); - boolean has = wxMerchantBUserService.hasphone(phone, getTenantId()); + boolean has = wxMerchantBUserService.hasPhone(getTenantInfo(), phone); return new ResultData(Result.SUCCESS, "查询成功", has); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 9a7c6b7b1..5649a5563 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -53,7 +53,7 @@ public class WxMerchantController extends BaseController { public ResultData listVo(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); @@ -70,7 +70,7 @@ public class WxMerchantController extends BaseController { public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); @@ -83,7 +83,7 @@ public class WxMerchantController extends BaseController { public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::etcpList"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); final List merchantList = wxMerchantService.etcpList(wxMerchant); return new ResultData(merchantList); } @@ -123,7 +123,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-新增") public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); ResultData resultData = wxMerchantService.addMerchant(wxMerchant, getUserId()); @@ -131,7 +131,7 @@ public class WxMerchantController extends BaseController { //加载二维码图片 String pageUrl = "pages/index/index"; String param = "t:md:"+resultData.data; - ResultData resultQrCode = qrCodeService.uploadQrcode(wxMerchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情"); + ResultData resultQrCode = qrCodeService.uploadQrcode(wxMerchant,1,pageUrl,param,0,"","","店铺详情"); Map map = (Map)resultQrCode.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -148,7 +148,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新") public ResultData updateMerchant(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchant"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchant(wxMerchant); } @@ -157,7 +157,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新账户") public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantAccount(wxMerchant); } @@ -166,7 +166,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新管理员") public ResultData updateMerchantAdmin(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantAdmin(wxMerchant); } @@ -175,7 +175,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新法人") public ResultData updateMerchantCopr(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantCorp"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantCorp(wxMerchant); } @@ -184,7 +184,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新税务") public ResultData updateMerchantTax(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantTax"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantTax(wxMerchant); } @@ -193,7 +193,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新会员等级权益") public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantLevel(wxMerchant); } @@ -202,7 +202,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "查询当前租户下商户名称列表") public ResultData nameList() { logger.debug("[" + getIpAddr() + "] WxMerchantController::name_list"); - return new ResultData(wxMerchantService.findList(getTenantId())); + return new ResultData(wxMerchantService.findList(getTenantInfo())); } @ApiOperation("根据id查询接口") @@ -220,7 +220,7 @@ public class WxMerchantController extends BaseController { @GetMapping("/exportData") @SystemControllerLog(description = "商户-商户数据导出") public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchantService.exportData(wxMerchant,request,response); } @@ -230,7 +230,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-置顶") public ResultData top(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::top"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.top(wxMerchant); } @@ -239,7 +239,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新收款账户状态") public ResultData useAccount(@RequestBody WxProfitSharingReceiver wxProfitSharingReceiver) { logger.debug("[" + getIpAddr() + "] WxMerchantController::useAccount"); - wxProfitSharingReceiver.setTenantId(getTenantId()); + wxProfitSharingReceiver.updateTenantInfo(getTenantInfo()); return wxMerchantService.useAccount(wxProfitSharingReceiver); } @@ -248,7 +248,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-查看是否存在商户名称相同记录") public ResultData hasMerchant(@ModelAttribute WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::hasMerchant"); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); boolean has = wxMerchantService.hasMerchant(wxMerchant); return new ResultData(has); } @@ -262,7 +262,7 @@ public class WxMerchantController extends BaseController { public ResultData userTradeList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); return new ResultData(page); @@ -277,7 +277,7 @@ public class WxMerchantController extends BaseController { public ResultData userTradeDetailList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); final PageInfo page = wxMerchantService.userTradeDetailList(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -288,7 +288,7 @@ public class WxMerchantController extends BaseController { public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeDetailList"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchantService.exportUserTradeList(wxMerchant, request,response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 617affdd8..4c986045b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -42,7 +42,7 @@ public class WxShopController extends BaseController { if (null == wxShop){ wxShop = new WxShop(); } - wxShop.setTenantId(getTenantId()); + wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); @@ -54,7 +54,7 @@ public class WxShopController extends BaseController { @SystemControllerLog(description = "店铺管理-新增") public ResultData add(@RequestBody WxShop wxShop) { logger.debug("[" + getIpAddr() + "] WxShopController::add"); - wxShop.setTenantId(getTenantId()); + wxShop.updateTenantInfo(getTenantInfo()); return wxShopService.saveOrUpdate(wxShop); } @@ -63,6 +63,10 @@ public class WxShopController extends BaseController { @SystemControllerLog(description = "店铺管理-更新") public ResultData update(@RequestBody WxShop wxShop) { logger.debug("[" + getIpAddr() + "] WxShopController::update"); + if (null == wxShop){ + wxShop = new WxShop(); + } + wxShop.updateTenantInfo(getTenantInfo()); return wxShopService.saveOrUpdate(wxShop); } @@ -89,9 +93,9 @@ public class WxShopController extends BaseController { @GetMapping("getShopListByShopNumber") @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true) @SystemControllerLog(description = "店铺管理-获取商铺数据") - public ResultData getbshoplist(String shopNumber) { + public ResultData getShoplist(String shopNumber) { logger.debug("[" + getIpAddr() + "] WxShopController::getbshoplist"); - return wxShopService.getbshoplist(getTenantId(), shopNumber); + return wxShopService.getShopList(getTenantInfo(), shopNumber); } @ApiOperation("获取商户商铺数据") @@ -100,7 +104,7 @@ public class WxShopController extends BaseController { @SystemControllerLog(description = "店铺管理-获取商户商铺数据") public ResultData getMerchantShopByShopId(String shopId) { logger.debug("[" + getIpAddr() + "] WxShopController::getMerchantShopByShopId"); - return wxShopService.getMerchantShopByShopId(getTenantId(), shopId); + return wxShopService.getMerchantShopByShopId(getTenantInfo(), shopId); } @ApiOperation("查询商铺号是否存在") @@ -112,7 +116,13 @@ public class WxShopController extends BaseController { @SystemControllerLog(description = "店铺管理-查询商铺号是否存在") public ResultData hasShopNumber(String shopNumber, Long id, Integer type) { logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber"); - return wxShopService.hasShopNumber(getTenantId(), shopNumber, id, type); + WxShop wxShop = new WxShop() {{ + setShopNumber(shopNumber); + setType(type); + setId(id); + }}; + wxShop.updateTenantInfo(getTenantInfo()); + return wxShopService.hasShopNumber(wxShop); } @@ -127,7 +137,7 @@ public class WxShopController extends BaseController { if (null == wxShop){ wxShop = new WxShop(); } - wxShop.setTenantId(getTenantId()); + wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); return new ResultData(page); @@ -141,7 +151,7 @@ public class WxShopController extends BaseController { if (null == wxShop){ wxShop = new WxShop(); } - wxShop.setTenantId(getTenantId()); + wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); wxShopService.exportShop(wxShop, request, response); } @@ -154,7 +164,7 @@ public class WxShopController extends BaseController { if (null == wxShop){ wxShop = new WxShop(); } - wxShop.setTenantId(getTenantId()); + wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); wxShopService.exportNotRentShop(wxShop, request, response); } @@ -170,7 +180,7 @@ public class WxShopController extends BaseController { if (null == wxShop){ wxShop = new WxShop(); } - wxShop.setTenantId(getTenantId()); + wxShop.updateTenantInfo(getTenantInfo()); wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java index d6277b35c..1a14dcc9f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java @@ -45,7 +45,7 @@ public class WxTagsController extends BaseController { @SystemControllerLog(description = "会员管理-查询会员用户人群") public Result findCountByTag(Long[] tagIds) { logger.debug("[" + getIpAddr() + "] WxTagsController::findCountByTag"); - return new ResultData(wxCUserTagsService.findTagList(getTenantId(), Arrays.asList(tagIds))); + return new ResultData(wxCUserTagsService.findTagList(getTenantInfo(), Arrays.asList(tagIds))); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index 7b6774fee..a65d2ea41 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCarVo; import com.iformall.enums.EnumCarVendor; import com.iformall.enums.EnumCouponStatus; @@ -63,9 +64,9 @@ public class WxCarController extends BaseController { @Autowired WxCouponMapper wxCouponMapper; - private WxPark getCurrentPark() { + private WxPark getCurrentPark(TenantEntity tenantEntity) { WxPark parkQ = new WxPark(); - parkQ.setTenantId(getTenantId()); + parkQ.updateTenantInfo(tenantEntity); WxPark wxPark = wxParkService.getByObj(parkQ); // 1, get mall's park // future use redis to optimize @@ -78,7 +79,7 @@ public class WxCarController extends BaseController { public ResultData getVendor() { logger.debug("[" + getIpAddr() + "] WxCarController::getVendor"); // 1, get mall's park - WxPark park = getCurrentPark(); + WxPark park = getCurrentPark(getTenantInfo()); Map map = new HashMap(); map.put("vendor", park.getVendorType()); return new ResultData(map); @@ -131,8 +132,9 @@ public class WxCarController extends BaseController { @SystemControllerLog(description = "车-优免券模板") public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCarController::quanTemplate"); + TenantEntity tenantEntity = getTenantInfo(); /// 1, get mall's park - WxPark park = getCurrentPark(); + WxPark park = getCurrentPark(tenantEntity); String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); String url = objParams.getString("url"); @@ -198,9 +200,10 @@ public class WxCarController extends BaseController { public ResultData save(@RequestBody WxCouponCarVo coupon) { logger.debug("[" + getIpAddr() + "] WxCarController::save"); logger.info(coupon.toString()); + final TenantEntity tenantEntity = getTenantInfo(); // Save to wx_counpon Date curDate = new Date(); - WxPark park = getCurrentPark(); + WxPark park = getCurrentPark(tenantEntity); if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { // check 同一个模板的券分配额是否超了 if (StringUtils.isBlank(coupon.getVendorParams())) { @@ -223,7 +226,7 @@ public class WxCarController extends BaseController { } } // check End - coupon.setTenantId(getTenantId()); + coupon.updateTenantInfo(getTenantInfo()); ResultData resultData = wxCouponService.saveOrUpdate(coupon); if (resultData.code != ResultData.SUCCESS){ @@ -231,14 +234,15 @@ public class WxCarController extends BaseController { } // Save to wx_coupon_car - WxCouponCar couponCar = new WxCouponCar(); - couponCar.setId(coupon.getId()); - couponCar.setTenantId(getTenantId()); - couponCar.setParkId(park.getId()); - couponCar.setVendorType(park.getVendorType()); - couponCar.setVendorParams(coupon.getVendorParams()); - couponCar.setCreateDate(curDate); - couponCar.setUpdateDate(curDate); + WxCouponCar couponCar = new WxCouponCar() {{ + setId(coupon.getId()); + updateTenantInfo(tenantEntity); + setParkId(park.getId()); + setVendorType(park.getVendorType()); + setVendorParams(coupon.getVendorParams()); + setCreateDate(curDate); + setUpdateDate(curDate); + }}; WxCouponCar newCouponCar = wxCouponCarService.getById(couponCar.getId()); if (newCouponCar == null) { wxCouponCarService.save(couponCar); @@ -252,7 +256,7 @@ public class WxCarController extends BaseController { wc.setId(coupon.getId()); coupon.getFlowParams().put("businessId",coupon.getId()); - wxFlowService.start(coupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); + wxFlowService.start(coupon.getFlowParams(), getUserId(), getUser().getName(), tenantEntity); //作废审批 if (EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(coupon.getStatus())) { wc.setCancleApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); @@ -319,8 +323,9 @@ public class WxCarController extends BaseController { @GetMapping("/getParkStatus") @SystemControllerLog(description = "车-停车场状态") public ResultData getParkStatus() { + TenantEntity tenantEntity = getTenantInfo(); /// 1, get mall's park - WxPark park = getCurrentPark(); + WxPark park = getCurrentPark(tenantEntity); if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String params = park.getVendorParams(); if(params == null) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 4cdbb764a..3f65a59c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -57,7 +57,7 @@ public class WxPropertyContractController extends BaseController { if (null == wxPropertyContract) { wxPropertyContract = new WxPropertyContract(); } - wxPropertyContract.setTenantId(getTenantId()); + wxPropertyContract.updateTenantInfo(getTenantInfo()); Map result = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); return new ResultData(result); } @@ -67,7 +67,7 @@ public class WxPropertyContractController extends BaseController { public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); MallUserInfo user = getUser(); - wxPropertyContract.setTenantId(user.getTenantId()); + wxPropertyContract.updateTenantInfo(user); wxPropertyContract.setAdjustPeriodHandle(); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); wxPropertyContract.setContractType(contractType); @@ -83,7 +83,7 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId()); MallUserInfo user = getUser(); - propertyContract.setTenantId(user.getTenantId()); + propertyContract.updateTenantInfo(user); propertyContract.setAdjustPeriodHandle(); propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); @@ -94,7 +94,7 @@ public class WxPropertyContractController extends BaseController { public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); MallUserInfo user = getUser(); - wxPropertyContract.setTenantId(user.getTenantId()); + wxPropertyContract.updateTenantInfo(user); wxPropertyContract.setAdjustPeriodHandle(); //第三步提交 SWITCH return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); @@ -116,7 +116,7 @@ public class WxPropertyContractController extends BaseController { public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setTenantId(super.getTenantId()); + wxBillProperty.updateTenantInfo(getTenantInfo()); wxBillPropertyService.updateBillStatus(wxBillProperty); try { Map data = wxPropertyContractService.getById(id); @@ -131,14 +131,14 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-下载") public void download(HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::download"); - wxPropertyContractService.download(request, response, getTenantId()); + wxPropertyContractService.download(request, response); } @GetMapping("/getPropertyContractStatusInfo") @SystemControllerLog(description = "物业合同-状态信息") public ResultData getPropertyContractStatusInfo(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo"); - wxPropertyContract.setTenantId(getTenantId()); + wxPropertyContract.updateTenantInfo(getTenantInfo()); return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(wxPropertyContract)); } @@ -154,7 +154,7 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-查询列表") public ResultData getRentContractList(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList"); - wxPropertyContract.setTenantId(getTenantId()); + wxPropertyContract.updateTenantInfo(getTenantInfo()); return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractList(wxPropertyContract)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index e541c7fd3..b892b92f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -104,7 +104,7 @@ public class WxRentContractController extends BaseController { if (null == wxRentContract) { wxRentContract = new WxRentContract(); } - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); return new ResultData(result); } @@ -145,7 +145,7 @@ public class WxRentContractController extends BaseController { } MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.updateTenantInfo(user); wxRentContract.setAdjustPeriodHandle(); Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ @@ -165,7 +165,7 @@ public class WxRentContractController extends BaseController { rentContract.setRentalStartDate(rentContract.getStartDate()); } MallUserInfo user = getUser(); - rentContract.setTenantId(user.getTenantId()); + rentContract.updateTenantInfo(user); rentContract.setAdjustPeriodHandle(); rentContract.setRentStartType(wxRentContract.getRentStartType()); return wxRentContractService.update(rentContract, user.getId(),user.getName(), EnumFromType.SWITCH.getCode(),oldDate); @@ -180,7 +180,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setBusDiscountTime(new Integer(0)); } MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.updateTenantInfo(user); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); Date oldDate = wxRentContract.getRentalStartDate(); @@ -209,7 +209,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setBusDiscountTime(new Integer(0)); } MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.updateTenantInfo(user); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); Date oldDate = wxRentContract.getRentalStartDate(); @@ -227,7 +227,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setBusDiscountTime(new Integer(0)); } MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.updateTenantInfo(user); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); Date oldDate = wxRentContract.getRentalStartDate(); @@ -252,7 +252,7 @@ public class WxRentContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); // 同步欠缴状态 WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setTenantId(getTenantId()); + wxBillRent.updateTenantInfo(getTenantInfo()); wxBillRentService.updateBillStatus(wxBillRent); try { Map data = wxRentContractService.getById(id); @@ -266,14 +266,14 @@ public class WxRentContractController extends BaseController { @RequestMapping("/download") public void download(HttpServletRequest request, HttpServletResponse response){ logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); - wxRentContractService.download(request,response,getTenantId()); + wxRentContractService.download(request,response); } @GetMapping("/getRentContractStatusInfo") @SystemControllerLog(description = "租赁合同-获取合同状态信息") public ResultData getRentContractStatusInfo(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(wxRentContract)); } @@ -301,7 +301,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-列表") public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } @@ -310,7 +310,7 @@ public class WxRentContractController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)}) @SystemControllerLog(description = "租赁合同-导出合同") public void exportContract(Long id,HttpServletRequest request, HttpServletResponse response){ - wxRentContractService.exportContract(request,response,getTenantId(),id); + wxRentContractService.exportContract(request,response,id); } @PostMapping("updateRentContractStatus") @@ -324,8 +324,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-获取甲方账户") public ResultData getPayAccountInfo() { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - String tenantId = getTenantId(); - WxPayAccountBill payAccountBill = payAccountBillService.getByTenantId(tenantId); + WxPayAccountBill payAccountBill = payAccountBillService.getByTenantInfo(getTenantInfo()); Map map = new HashMap<>(); if(StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { map.put("bankAccountName", payAccountBill.getBankAccountName()); @@ -352,8 +351,7 @@ public class WxRentContractController extends BaseController { if (payAccountBill.getServiceChargeRate() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "手续费费率未填写"); } - String tenantId = getTenantId(); - WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantId(tenantId); + WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantInfo(getTenantInfo()); payAccountBillNew.setBankAccountName(payAccountBill.getBankAccountName()); payAccountBillNew.setBankCardId(payAccountBill.getBankCardId()); payAccountBillNew.setServiceChargeRate(payAccountBill.getServiceChargeRate()); @@ -365,7 +363,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户") public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants"); - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); } @@ -373,7 +371,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "查询店铺租赁状态") public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); return wxRentContractService.hasRentStatus(wxRentContract); } @@ -381,7 +379,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-检查合同编号是否存在") public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); return wxRentContractService.hasContractNumber(wxRentContract); } @@ -397,7 +395,7 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-通过合同编号查询信息") public ResultData getContractByContractNumber(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getContractByContractNumber"); - wxRentContract.setTenantId(getTenantId()); + wxRentContract.updateTenantInfo(getTenantInfo()); return wxRentContractService.getContractByContractNumber(wxRentContract); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index e0094fd36..6866df06c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -39,7 +39,7 @@ public class WxRentPropertyContractController extends BaseController { if (null == wxRentPropertyContractVo) { wxRentPropertyContractVo = new WxRentPropertyContractVo(); } - wxRentPropertyContractVo.setTenantId(getTenantId()); + wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); final PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); return new ResultData(page); } @@ -67,7 +67,7 @@ public class WxRentPropertyContractController extends BaseController { public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::insertRentForCreate"); MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.updateTenantInfo(user); return wxRentPropertyContractService.insertRentForCreate(wxRentContract); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index 7846e99d3..05d4adb6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -29,7 +29,7 @@ public class DataTowerController extends BaseController { public ResultData queryRunningPotal() { logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningPotal"); - Map data = dataTowerService.queryRunningPotal(getTenantId()); + Map data = dataTowerService.queryRunningPotal(getTenantInfo()); return new ResultData(data); } @@ -40,7 +40,7 @@ public class DataTowerController extends BaseController { public ResultData queryRunningMobile() { logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningMobile"); - Map data = dataTowerService.queryRunningMobile(getTenantId()); + Map data = dataTowerService.queryRunningMobile(getTenantInfo()); return new ResultData(data); } @@ -52,7 +52,7 @@ public class DataTowerController extends BaseController { public ResultData queryRunning() { logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunning"); - Map data = dataTowerService.queryRunning(getTenantId()); + Map data = dataTowerService.queryRunning(getTenantInfo()); return new ResultData(data); } @@ -64,7 +64,7 @@ public class DataTowerController extends BaseController { public ResultData queryCar() { logger.debug("[" + getIpAddr() + "] DataTowerController::queryCar"); - Map data = dataTowerService.queryCar(getTenantId()); + Map data = dataTowerService.queryCar(getTenantInfo()); return new ResultData(data); } @@ -75,7 +75,7 @@ public class DataTowerController extends BaseController { public ResultData queryCustomer() { logger.debug("[" + getIpAddr() + "] DataTowerController::queryCustomer"); - Map data = dataTowerService.queryCustomer(getTenantId()); + Map data = dataTowerService.queryCustomer(getTenantInfo()); return new ResultData(data); } @@ -86,7 +86,7 @@ public class DataTowerController extends BaseController { public ResultData queryCustomerData(@RequestParam Map params) { logger.debug("[" + getIpAddr() + "] DataTowerController::queryCustomer"); - return dataTowerService.queryCustomerData(getTenantId(), params); + return dataTowerService.queryCustomerData(getTenantInfo(), params); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index 56a4bbd39..3af40399f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -32,10 +32,10 @@ public class WxChartDataController extends BaseController { "chart=45 卡营销数据:" + "saleHistory销售金额历史 paymentHistory核销历史 saleCardCount售出卡数量 tranCount转增数量 subsidyCount补贴金额"+ "--------------------------------------" + - "chart=46 卷营销数据:" + - "orderCountList卷购买数量历史 paymentCountList卷核销数量 priceCouponSaleCountList有价卷销售数量历史 " + - "priceCouponPaymentCountList有价卷核销数量历史 sumPriceSaleMoney有价券销售总额 sumPricePayMent有价卷核销总额 " + - "sumSubsidyMoney商场补贴金额 priceCouponCancelCount有价卷退款数量 priceCouponSaleCountListTotal有价券售出数量"+ + "chart=46 券营销数据:" + + "orderCountList券购买数量历史 paymentCountList券核销数量 priceCouponSaleCountList有价券销售数量历史 " + + "priceCouponPaymentCountList有价券核销数量历史 sumPriceSaleMoney有价券销售总额 sumPricePayMent有价券核销总额 " + + "sumSubsidyMoney商场补贴金额 priceCouponCancelCount有价券退款数量 priceCouponSaleCountListTotal有价券售出数量"+ "--------------------------------------" + "chart=47 砍价营销数据:" + "pressSendHistory砍价发起历史 pressSuccHistory砍价成功历史 pressPaymentHistory砍价核销历史 " + @@ -51,12 +51,12 @@ public class WxChartDataController extends BaseController { "ysje 应收金额 ssje 实收金额 zjsjl收缴率 rent*租赁收缴率 property*物业收缴率 deposit*押金收缴率 other*其他费用收缴率" + "rentOwe 租赁总额 propertyOwe物业总额 otherOwe其他总额 depositOwe押金总额 totalOwe欠缴总额"+ "--------------------------------------"+ - "chart=51首页场景发卷:" + - "carStopHistory停车发卷 couponVerifyHistory核销发卷 orderHistory交易发卷 micropayHistory收银台发卷 merchantHistory商户发券"+ + "chart=51首页场景发券:" + + "carStopHistory停车发券 couponVerifyHistory核销发券 orderHistory交易发券 micropayHistory收银台发券 merchantHistory商户发券"+ "--------------------------------------"+ "chart=52营销数据:" + - "当前”券交易数据“替换为”营销数据“:cardHistory卡营销历史 pressSendHistory砍价营销历史 groupHistory拼团营销历史 couponHistory卷营销历史," + - "卡、卷、砍价、拼团走势以及右边的数据总览,对应原来 营销系统->卡、卷、砍价、拼团营销数据" + + "当前”券交易数据“替换为”营销数据“:cardHistory卡营销历史 pressSendHistory砍价营销历史 groupHistory拼团营销历史 couponHistory券营销历史," + + "卡、券、砍价、拼团走势以及右边的数据总览,对应原来 营销系统->卡、券、砍价、拼团营销数据" + "--------------------------------------" + "触达用户=数据总览的活跃用户数据" + "------------------------------" + "chart=48拼团营销数据:拼团成功次数successList verifyList核销量 拼团发起次数groupCount 拼团成功successCount 参与拼团人次peopleCount" + diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 28077203a..68e2ac5d4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -44,7 +44,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (wxMerchantTradeDaily == null) wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); @@ -73,7 +73,7 @@ public class WxMerchantTradeDailyController extends BaseController { @SystemControllerLog(description = "商户-获得商场近30日解单") public ResultData listMonth() { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listMonth"); - return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantId()); + return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantInfo()); } @ApiOperation("更新解单数据") @@ -85,7 +85,7 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily.getMerchantId() == null || wxMerchantTradeDaily.getTradeAmt() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - wxMerchantTradeDaily.setTenantId(getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); if (wxMerchantTradeDaily.getReportDate() == null) { SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); @@ -98,7 +98,7 @@ public class WxMerchantTradeDailyController extends BaseController { @SystemControllerLog(description = "商户-查询解单数据") public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::queryTradeDaily"); - wxMerchantTradeDaily.setTenantId(getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); } @@ -110,7 +110,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null == wxMerchantTradeDaily) { wxMerchantTradeDaily = new WxMerchantTradeDaily(); } - wxMerchantTradeDaily.setTenantId(getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 95971b86c..7eadb5302 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.UserCountVo; import com.iformall.domain.vo.UserStructureVo; import com.iformall.enums.*; @@ -62,7 +63,7 @@ public class WxUserStructureController extends BaseController { public ResultData findUserSexStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserSexStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); //保密 @@ -86,7 +87,7 @@ public class WxUserStructureController extends BaseController { public ResultData findUserAgeStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); long all = wxCUserBasicInfoService.findCount(dto); @@ -110,14 +111,14 @@ public class WxUserStructureController extends BaseController { public ResultData findUserLevelStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(getTenantId()); + wxLevelConfig.updateTenantInfo(getTenantInfo()); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigService.findList(wxLevelConfig); for( int i = 0; i < levelList.size(); i++) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); if (i + 1 < levelList.size()) { @@ -151,7 +152,7 @@ public class WxUserStructureController extends BaseController { public ResultData findCarLevelStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findCarLevelStructure"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoService.findCount(dto); @@ -192,8 +193,9 @@ public class WxUserStructureController extends BaseController { @SystemControllerLog(description = "会员管理-查询会员手机品牌结构") public ResultData findUserPhoneBandStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserPhoneBandStructure"); + TenantEntity tenantEntity = getTenantInfo(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(tenantEntity); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoService.findCount(dto); @@ -210,7 +212,7 @@ public class WxUserStructureController extends BaseController { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsService.countUser(getTenantId(), tags[i].getCode(), startTime, endTime)); + tag.setCount(wxCUserTagsService.countUser(tenantEntity, tags[i].getCode(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -229,8 +231,9 @@ public class WxUserStructureController extends BaseController { @SystemControllerLog(description = "会员管理-查询会员活跃结构") public ResultData findUserActivityStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserActivityStructure"); + TenantEntity tenantEntity = getTenantInfo(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(tenantEntity); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoService.findCount(dto); @@ -246,7 +249,7 @@ public class WxUserStructureController extends BaseController { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsService.countUser(getTenantId(), tags[i].getCode(), startTime, endTime)); + tag.setCount(wxCUserTagsService.countUser(tenantEntity, tags[i].getCode(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -296,7 +299,7 @@ public class WxUserStructureController extends BaseController { Map map = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); dto.setEndTime(new Date()); //微信用户数据 long wxTotalCount = wxCUserService.findCount(dto);//总量 @@ -349,7 +352,7 @@ public class WxUserStructureController extends BaseController { reportType = EnumUserCountReportType.DAY.getCode(); } - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); dto.setReportType(reportType); @@ -421,7 +424,7 @@ public class WxUserStructureController extends BaseController { && wxCountList.get(0).getTotalCount() != null && wxCountList.get(0).getTotalCount() == 0) { WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); - pdto.setTenantId(getTenantId()); + pdto.updateTenantInfo(getTenantInfo()); pdto.setEndTime(startTime); wxCountList.get(0).setTotalCount(wxCUserService.findCount(pdto)); } @@ -437,7 +440,7 @@ public class WxUserStructureController extends BaseController { && memCountList.get(0).getTotalCount() != null && memCountList.get(0).getTotalCount() == 0) { WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); - pdto.setTenantId(getTenantId()); + pdto.updateTenantInfo(getTenantInfo()); pdto.setEndTime(startTime); memCountList.get(0).setTotalCount(wxCUserBasicInfoService.findCount(pdto)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java index 3cf53f5c2..fef2ae82c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java @@ -43,7 +43,7 @@ public class KwBoxController extends BaseController { @SystemControllerLog(description = "开物盒子-设备列表") public Result list(@ModelAttribute KwBox kwBox, Integer pageNum, Integer pageSize) { if (kwBox == null) kwBox = new KwBox(); - kwBox.setTenantId(getTenantId()); + kwBox.updateTenantInfo(getTenantInfo()); kwBox.setStatus(EnumBoxStatus.VALID.getCode()); return new ResultData(kwBoxService.listAsPage(kwBox, pageNum,pageSize)); } @@ -59,7 +59,7 @@ public class KwBoxController extends BaseController { List list = kwBoxService.findList(record); if (list.size() > 0) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); - kwBox.setTenantId(getTenantId()); + kwBox.updateTenantInfo(getTenantInfo()); kwBox.setStatus(EnumBoxStatus.VALID.getCode()); kwBoxService.saveOrUpdate(kwBox); return new ResultData(kwBox); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java index 246f5baa0..3c6d4abf9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -41,7 +41,7 @@ public class KwMerchantMeterController extends BaseController { @SystemControllerLog(description = "商户列表") public Result list(@ModelAttribute KwMerchantMeterDto kwMerchantMeterDto, Integer pageNum, Integer pageSize) { if (kwMerchantMeterDto == null) kwMerchantMeterDto = new KwMerchantMeterDto(); - kwMerchantMeterDto.setTenantId(getTenantId()); + kwMerchantMeterDto.updateTenantInfo(getTenantInfo()); return new ResultData(kwMerchantMeterService.listVoAsPage(kwMerchantMeterDto, pageNum, pageSize)); } @@ -106,7 +106,7 @@ public class KwMerchantMeterController extends BaseController { @GetMapping("getMechantMeter") @SystemControllerLog(description = "商户列表") public ResultData getMechantMeter() { - return new ResultData(kwMerchantMeterService.getMerchantMeter(getTenantId())); + return new ResultData(kwMerchantMeterService.getMerchantMeter(getTenantInfo())); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 2f6b3d745..0f6d2dd9a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -7,6 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.ExcelService; @@ -75,7 +76,7 @@ public class KwMeterController extends BaseController { @SystemControllerLog(description = "电表设备-设备列表") public Result list(@ModelAttribute KwMeter kwMeter, Integer pageNum, Integer pageSize) { if (kwMeter == null) kwMeter = new KwMeter(); - kwMeter.setTenantId(getTenantId()); + kwMeter.updateTenantInfo(getTenantInfo()); kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); return new ResultData(kwMeterService.listAsPage(kwMeter, pageNum,pageSize)); } @@ -89,15 +90,15 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (kwMeter.getAddress() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - + TenantEntity tenantEntity = getTenantInfo(); KwMeter record = new KwMeter(); - record.setTenantId(getTenantId()); + record.updateTenantInfo(tenantEntity); record.setAddress(kwMeter.getAddress()); record.setStatus(EnumMeterStatus.VALID.getCode()); List KwMeters = kwMeterService.findList(record); if (KwMeters.size() > 0) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); - kwMeter.setTenantId(getTenantId()); + kwMeter.updateTenantInfo(tenantEntity); kwMeter.setBoxId(0L); kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); @@ -155,7 +156,7 @@ public class KwMeterController extends BaseController { record.setStatus(EnumBoxStatus.VALID.getCode()); List list = kwBoxService.findList(record); if (list.size() > 0) return list.get(0); - kwBox.setTenantId(getTenantId()); + kwBox.updateTenantInfo(getTenantInfo()); kwBox.setStatus(EnumBoxStatus.VALID.getCode()); kwBoxService.saveOrUpdate(kwBox); return kwBox; @@ -178,7 +179,7 @@ public class KwMeterController extends BaseController { private void addOrUpdate(KwMeter kwMeter) { KwMeter record = new KwMeter(); - record.setTenantId(getTenantId()); + record.updateTenantInfo(getTenantInfo()); record.setAddress(kwMeter.getAddress()); record.setStatus(EnumMeterStatus.VALID.getCode()); List kwMeters = kwMeterService.findList(record); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java index 04a066e83..2ed579d25 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java @@ -47,7 +47,7 @@ public class KwMeterDataController extends BaseController { @SystemControllerLog(description = "电表设备-电表数据") public Result list(@ModelAttribute KwMeterDataDto kwMeterDataDto, Integer pageNum, Integer pageSize) { if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto(); - kwMeterDataDto.setTenantId(getTenantId()); + kwMeterDataDto.updateTenantInfo(getTenantInfo()); return new ResultData(kwMeterDataService.listVoAsPage(kwMeterDataDto, pageNum, pageSize)); } @@ -57,7 +57,7 @@ public class KwMeterDataController extends BaseController { @SystemControllerLog(description = "电表设备-电表数据") public Result listPower(@ModelAttribute KwMeterDataDto kwMeterDataDto) { if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto(); - kwMeterDataDto.setTenantId(getTenantId()); + kwMeterDataDto.updateTenantInfo(getTenantInfo()); List kwMeterDataVos = kwMeterDataService.findVoList(kwMeterDataDto); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java index dabbf67e1..f94ef98ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java @@ -38,7 +38,7 @@ public class WxDeviceController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "IOT设备-设备列表") public Result list(@ModelAttribute WxDevice wxDevice, Integer pageNum, Integer pageSize) { - wxDevice.setTenantId(getTenantId()); + wxDevice.updateTenantInfo(getTenantInfo()); wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); return new ResultData(wxDeviceService.listAsPage(wxDevice, pageNum,pageSize)); } @@ -56,7 +56,7 @@ public class WxDeviceController extends BaseController { return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); wxDevice.setOnlineStatus(EnumDeviceOnlineStatus.OFFLINE.getCode()); - wxDevice.setTenantId(getTenantId()); + wxDevice.updateTenantInfo(getTenantInfo()); return wxDeviceService.saveOrUpdate(wxDevice); } @@ -69,7 +69,7 @@ public class WxDeviceController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (wxDevice.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - wxDevice.setTenantId(getTenantId()); + wxDevice.updateTenantInfo(getTenantInfo()); return wxDeviceService.saveOrUpdate(wxDevice); } @@ -95,7 +95,7 @@ public class WxDeviceController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); WxDevice wxDevice = new WxDevice(); wxDevice.setId(id); - wxDevice.setTenantId(getTenantId()); + wxDevice.updateTenantInfo(getTenantInfo()); wxDevice.setStatus(EnumDeviceStatus.INVALID.getCode()); return wxDeviceService.saveOrUpdate(wxDevice); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java index a7229b9ae..a7ed5ce27 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java @@ -44,7 +44,7 @@ public class WxScreenAdController extends BaseController { @SystemControllerLog(description = "广告屏-广告列表") public Result list(@ModelAttribute WxScreenAd wxScreenAd, Integer pageNum, Integer pageSize) { if (wxScreenAd == null) wxScreenAd = new WxScreenAd(); - wxScreenAd.setTenantId(getTenantId()); + wxScreenAd.updateTenantInfo(getTenantInfo()); wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); return new ResultData(wxScreenAdService.listAsPage(wxScreenAd,pageNum,pageSize)); } @@ -55,7 +55,7 @@ public class WxScreenAdController extends BaseController { public Result add(@RequestBody WxScreenAd wxScreenAd) { if (wxScreenAd == null) wxScreenAd = new WxScreenAd(); wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); - wxScreenAd.setTenantId(getTenantId()); + wxScreenAd.updateTenantInfo(getTenantInfo()); return wxScreenAdService.saveOrUpdate(wxScreenAd); } @@ -67,7 +67,7 @@ public class WxScreenAdController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (wxScreenAd.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - wxScreenAd.setTenantId(getTenantId()); + wxScreenAd.updateTenantInfo(getTenantInfo()); wxScreenAdService.saveOrUpdate(wxScreenAd); return new ResultData(); } @@ -100,7 +100,7 @@ public class WxScreenAdController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); WxScreenAd wxScreenAd = new WxScreenAd(); wxScreenAd.setId(id); - wxScreenAd.setTenantId(getTenantId()); + wxScreenAd.updateTenantInfo(getTenantInfo()); wxScreenAd.setStatus(EnumScreenAdStatus.INVALID.getCode()); wxScreenAdService.saveOrUpdate(wxScreenAd); return new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java index f6373dd8b..9ee80cadf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -37,7 +37,7 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-查询券数据") public ResultData findCouponData() { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponData"); - return new ResultData(markingDataReportService.getCouponData(getTenantId())); + return new ResultData(markingDataReportService.getCouponData(getTenantInfo())); } @ApiOperation("查询券数据列表") @@ -48,7 +48,7 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCouponDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponDataList"); - return new ResultData(markingDataReportService.getCouponDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); + return new ResultData(markingDataReportService.getCouponDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询场景投放券数据") @@ -56,7 +56,7 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-查询场景投放券数据") public ResultData findSceneData() { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneData"); - return new ResultData(markingDataReportService.getSceneData(getTenantId())); + return new ResultData(markingDataReportService.getSceneData(getTenantInfo())); } @ApiOperation("查询场景营销数据列表") @@ -67,7 +67,7 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findSceneDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneDataList"); - return new ResultData(markingDataReportService.getSceneDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); + return new ResultData(markingDataReportService.getSceneDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询触达用户数数据") @@ -75,7 +75,7 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-查询触达用户数数据") public ResultData touchUsersData() { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersData"); - return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantId())); + return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantInfo())); } @ApiOperation("查询触达用户数数据列表") @@ -86,14 +86,14 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersDataList"); - return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); + return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("触达用户数数据导出") @GetMapping("/exportTouchUsersData") @SystemControllerLog(description = "券数据-触达用户数数据导出") public void exportTouchUsersData(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, HttpServletRequest request, HttpServletResponse response) { - markingCouponDataReportDto.setTenantId(getTenantId()); + markingCouponDataReportDto.updateTenantInfo(getTenantInfo()); markingDataReportService.exportTouchUsersData(request, response, markingCouponDataReportDto); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java index 73f8d51d0..aebd78302 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java @@ -26,7 +26,7 @@ public class PushLimitController extends BaseController { @SystemControllerLog(description = "疲劳度-配置获取") public ResultData list() { logger.debug("[" + getIpAddr() + "] PushLimitController::list"); - PushLimit pushLimit = pushLimitService.getPushLimit(getTenantId()); + PushLimit pushLimit = pushLimitService.getPushLimit(getTenantInfo()); return new ResultData(pushLimit); } @@ -35,7 +35,7 @@ public class PushLimitController extends BaseController { @SystemControllerLog(description = "疲劳度-配置更新") public ResultData update(@RequestBody PushLimit pushLimit) { logger.debug("[" + getIpAddr() + "] PushLimitController::update"); - pushLimit.setTenantId(getTenantId()); + pushLimit.updateTenantInfo(getTenantInfo()); pushLimitService.saveOrUpdate(pushLimit); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index 03c6a44a8..5ef94bdb3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -43,7 +43,7 @@ public class WxActivityController extends BaseController { if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) { wxActivity.setStatus(null); } - wxActivity.setTenantId(getTenantId()); + wxActivity.updateTenantInfo(getTenantInfo()); wxActivity.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); return new ResultData(page); @@ -55,7 +55,7 @@ public class WxActivityController extends BaseController { public ResultData add(@RequestBody WxActivity wxActivity) { logger.debug("[" + getIpAddr() + "] WxActivityController::add"); wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); - wxActivity.setTenantId(getTenantId()); + wxActivity.updateTenantInfo(getTenantInfo()); try { wxActivityService.saveOrUpdate(wxActivity); } catch (MallinkException e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index 8737b30d2..f53198f9b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -44,7 +44,7 @@ public class WxActivityJoinController extends BaseController { if (null == wxActivityJoin) { wxActivityJoin = new WxActivityJoin(); } - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); return new ResultData(page); @@ -76,7 +76,7 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getActivityId() == null) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); wxActivityJoinService.exportData(request, response, wxActivityJoin); } @@ -90,7 +90,7 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getActivityId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); return wxActivityJoinService.queryJoinInfo(wxActivityJoin); } @@ -103,7 +103,7 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getActivityId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); return wxActivityJoinService.sendMsg(wxActivityJoin); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index ff13586bf..9a26cd30b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { if (wxCampaign.getStatus() != null && wxCampaign.getStatus() == -1) { wxCampaign.setStatus(null); } - wxCampaign.setTenantId(getTenantId()); + wxCampaign.updateTenantInfo(getTenantInfo()); wxCampaign.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); @@ -78,7 +78,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setCouponIds(JSONArray.toJSONString(new String[0])); } wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.setTenantId(getTenantId()); + wxCampaign.updateTenantInfo(getTenantInfo()); wxCampaignService.saveOrUpdate(wxCampaign); return new ResultData(); } @@ -89,7 +89,7 @@ public class WxCampaignController extends BaseController { public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.setTenantId(getTenantId()); + wxCampaign.updateTenantInfo(getTenantInfo()); wxCampaignService.addForPath(wxCampaign); return new ResultData(); } @@ -159,7 +159,7 @@ public class WxCampaignController extends BaseController { WxCampaign wxCampaign = wxCampaignService.getById(id); if (wxCampaign != null) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 02e6162a4..d92b44efb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardVo; import com.iformall.exception.MallinkException; @@ -66,7 +67,7 @@ public class WxCardPayController extends BaseController { wxCardVo.setOuPhone(null); } } - wxCardVo.setTenantId(getTenantId()); + wxCardVo.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { String [] statusAttr = wxCardVo.getStatusStr().split(","); List tmpList = new ArrayList(); @@ -93,7 +94,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpendVo == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxCardSpendVo.setTenantId(getTenantId()); + wxCardSpendVo.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); List tmpList = new ArrayList(); @@ -117,7 +118,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxCardSpend.setTenantId(getTenantId()); + wxCardSpend.updateTenantInfo(getTenantInfo()); final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); return new ResultData(mapList); } @@ -130,7 +131,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpendVo == null) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxCardSpendVo.setTenantId(getTenantId()); + wxCardSpendVo.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); List tmpList = new ArrayList(); @@ -153,7 +154,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpend == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxCardSpend.setTenantId(getTenantId()); + wxCardSpend.updateTenantInfo(getTenantInfo()); wxCardSpendService.update(wxCardSpend); return new ResultData(); } @@ -170,9 +171,8 @@ public class WxCardPayController extends BaseController { if (wxCardInfo.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件ID为空"); } - String tenantId = getTenantId(); - wxCardInfo.setTenantId(tenantId); - int remainShareAmount = wxCardSpendService.finishCard(tenantId, wxCardInfo.getId()); + wxCardInfo.updateTenantInfo(getTenantInfo()); + int remainShareAmount = wxCardSpendService.finishCard(wxCardInfo); return new ResultData(remainShareAmount); } @@ -188,7 +188,7 @@ public class WxCardPayController extends BaseController { wxCardVo.setOuPhone(null); } } - wxCardVo.setTenantId(getTenantId()); + wxCardVo.updateTenantInfo(getTenantInfo()); if (StringUtils.isNotBlank(wxCardVo.getStatusStr())) { String[] statusAttr = wxCardVo.getStatusStr().split(","); List tmpList = new ArrayList(); @@ -211,7 +211,7 @@ public class WxCardPayController extends BaseController { if (wxCardSpendVo == null) { wxCardSpendVo = new WxCardSpendVo(); } - wxCardSpendVo.setTenantId(getTenantId()); + wxCardSpendVo.updateTenantInfo(getTenantInfo()); if (StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) { String[] statusAttr = wxCardSpendVo.getPayStatusStr().split(","); List tmpList = new ArrayList(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 56808b53c..555c394e9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -62,7 +62,7 @@ public class WxCouponChannelController extends BaseController { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { wxCouponChannel.setStatus(null); } - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); @@ -73,7 +73,7 @@ public class WxCouponChannelController extends BaseController { @SystemControllerLog(description = "券投放-更新") public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update"); - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); ResultData resultData = wxCouponChannelService.saveOrUpdate(wxCouponChannel); WxCouponChannel couponChannel = (WxCouponChannel)resultData.data; @@ -81,7 +81,7 @@ public class WxCouponChannelController extends BaseController { if(couponChannel!=null){ String pageUrl = "pages/index/index"; String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(couponChannel.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(couponChannel,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -110,7 +110,7 @@ public class WxCouponChannelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponChannelController::addbatch"); String[] ids = wxCouponChannelDto.getCouponIds().split(","); String[] channelId = wxCouponChannelDto.getChannelId().split(","); - ResultData resultData = wxCouponChannelService.addBatch(ids, channelId, getTenantId(), wxCouponChannelDto.getBeginTime(), wxCouponChannelDto.getEndTime()); + ResultData resultData = wxCouponChannelService.addBatch(ids, channelId, getTenantInfo(), wxCouponChannelDto.getBeginTime(), wxCouponChannelDto.getEndTime()); return resultData; } @@ -122,7 +122,7 @@ public class WxCouponChannelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponChannelController::findChannelByCouponId"); List channellist = new ArrayList<>(); WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setStatus(0); wxCouponChannel.setCouponId(id); List list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 0c2f3d9d3..fd92888e1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -9,6 +9,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.*; import com.iformall.mapper.WxCouponChannelMapper; @@ -55,7 +56,7 @@ public class WxCouponController extends BaseController { public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(getTenantId()); + wxCoupon.updateTenantInfo(getTenantInfo()); return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } @@ -68,7 +69,7 @@ public class WxCouponController extends BaseController { public ResultData listWithTypePress(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(getTenantId()); + wxCoupon.updateTenantInfo(getTenantInfo()); Integer[] typeArray = { EnumCouponType.COUPON_MANJIAN.getCode(), EnumCouponType.COUPON_DAIJIN.getCode(), @@ -87,7 +88,8 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-新增") public ResultData add(@RequestBody WxCoupon wxCoupon) { logger.debug("[" + getIpAddr() + "] WxCouponController::add"); - wxCoupon.setTenantId(getTenantId()); + TenantEntity tenantEntity = getTenantInfo(); + wxCoupon.updateTenantInfo(tenantEntity); ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); if (resultData.code != 200) { @@ -95,9 +97,9 @@ public class WxCouponController extends BaseController { } //启动投放审批 - if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) { - wxCoupon.getFlowParams().put("businessId", wxCoupon.getId()); - wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); + if(wxCoupon.getFlowParams() !=null && wxCoupon.getFlowParams().size()>0) { + wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); + wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), tenantEntity); //修改coupon applyStatus状态为审核中 wxCoupon.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); } @@ -112,22 +114,22 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - if (EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())) { + wxCoupon.updateTenantInfo(getTenantInfo()); + if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ WxCouponChannel query = new WxCouponChannel(); - query.setTenantId(wxCoupon.getTenantId()); + query.updateTenantInfo(wxCoupon); query.setCouponId(wxCoupon.getId()); query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) { return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); } } - wxCoupon.setTenantId(getTenantId()); //启动审批流 if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) { - logger.info("------coupon.update().businessType:" + wxCoupon.getFlowParams().get("businessType")); - wxCoupon.getFlowParams().put("businessId", wxCoupon.getId()); - wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); + logger.info("------coupon.update().businessType:"+wxCoupon.getFlowParams().get("businessType")); + wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); + wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantInfo()); //作废审批 if (EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())) { wxCoupon.setCancleApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); @@ -181,7 +183,7 @@ public class WxCouponController extends BaseController { logger.error("券库存有效期不支持停车券"); return new ResultData(ErrorCode.COUPON_STOCK_DATE_NO_CAR); } - wxCoupon.setTenantId(getTenantId()); + wxCoupon.updateTenantInfo(getTenantInfo()); WxCoupon coupon = wxCouponService.findById(wxCoupon); if (coupon != null) { @@ -235,11 +237,11 @@ public class WxCouponController extends BaseController { map.put("key", "validDays"); map.put("value", wxCoupon.getValidDays()); variables.add(map); - wxCoupon.getFlowParams().put("businessId", wxCoupon.getId()); - wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); + wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); + wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), wxCoupon); //更新状态 WxCoupon updateCoupon = new WxCoupon(); - updateCoupon.setTenantId(wxCoupon.getTenantId()); + updateCoupon.updateTenantInfo(wxCoupon); updateCoupon.setId(wxCoupon.getId()); updateCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); updateCoupon.setUpdateDate(new Date()); @@ -337,16 +339,16 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "券投放-砍价营销列表") public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { - Map result = new HashedMap(); - wxCoupon.setTenantId(getTenantId()); - PageInfo pages = wxCouponService.findPressData(wxCoupon, pageNum, pageSize); + Map result = new HashedMap(); + wxCoupon.updateTenantInfo(getTenantInfo()); + PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); return new ResultData(pages); } @GetMapping("exportCouponPassword") @SystemControllerLog(description = "卡券兑换码-导出数据") public void exportCouponPassword(@ModelAttribute WxCouponPassword wxCouponPassword, HttpServletRequest request, HttpServletResponse response) { - wxCouponPassword.setTenantId(getTenantId()); + wxCouponPassword.updateTenantInfo(getTenantInfo()); if (wxCouponPassword.getCouponId() == null) { wxCouponPassword.setCouponId(0L); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index 9a99b4e11..737f842e7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -46,7 +46,7 @@ public class WxCouponInjectController extends BaseController { if (couponInject.getStatus() != null && couponInject.getStatus() == -1) { couponInject.setStatus(null); } - couponInject.setTenantId(getTenantId()); + couponInject.updateTenantInfo(getTenantInfo()); couponInject.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxCouponInjectService.listAsPage(couponInject, pageNum, pageSize); return new ResultData(page); @@ -59,7 +59,7 @@ public class WxCouponInjectController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponInjectController::add"); MallUserInfo user = getUser(); - couponInject.setTenantId(user.getTenantId()); + couponInject.updateTenantInfo(user); couponInject.setMUserId(user.getId()); return wxCouponInjectService.add(couponInject); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 9b233ac57..19f279e4a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -51,7 +51,7 @@ public class WxCouponOrderController extends BaseController { public ResultData list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponOrderController::list"); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); - wxCouponOrder.setTenantId(getTenantId()); + wxCouponOrder.updateTenantInfo(getTenantInfo()); if (wxCouponOrder.getMerchantName() != null && wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); @@ -94,7 +94,7 @@ public class WxCouponOrderController extends BaseController { } WxAppinfo appinfoQ = new WxAppinfo(); - appinfoQ.setTenantId(getTenantId()); + appinfoQ.updateTenantInfo(getTenantInfo()); appinfoQ.setType(EnumAppType.B.getCode()); PageInfo appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); if (appinfoPageInfo.getList().size() > 0) { @@ -120,7 +120,7 @@ public class WxCouponOrderController extends BaseController { public void exportData(@ModelAttribute WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxCouponOrderController::exportData"); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); - wxCouponOrder.setTenantId(getTenantId()); + wxCouponOrder.updateTenantInfo(getTenantInfo()); if (wxCouponOrder.getMerchantName() != null && wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index c481c3341..849c859e1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -40,7 +40,7 @@ public class WxCouponPasswordController extends BaseController { @SystemControllerLog(description = "列表") public ResultData list(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::list"); - wxCouponPassword.setTenantId(getTenantId()); + wxCouponPassword.updateTenantInfo(getTenantInfo()); wxCouponPassword.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); final PageInfo page = wxCouponPasswordService.listAsPage(wxCouponPassword, pageNum, pageSize); return new ResultData(page); @@ -54,7 +54,7 @@ public class WxCouponPasswordController extends BaseController { @SystemControllerLog(description = "可发送卡数据") public ResultData findCouponList(@ModelAttribute WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::findCouponList"); - wxCouponPassword.setTenantId(getTenantId()); + wxCouponPassword.updateTenantInfo(getTenantInfo()); final PageInfo page = wxCouponPasswordService.findCouponList(wxCouponPassword, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java index 626d43103..fb8f881e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java @@ -58,7 +58,7 @@ public class WxCouponPresentController extends BaseController { @SystemControllerLog(description = "列表") public ResultData list(@ModelAttribute WxCouponPresent wxCouponPresent, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponPresentController::list"); - wxCouponPresent.setTenantId(getTenantId()); + wxCouponPresent.updateTenantInfo(getTenantInfo()); wxCouponPresent.setSortColumns(BaseEntity.SortField.CreateTime_DESC, BaseEntity.SortField.Id_DESC); final PageInfo page = wxCouponPresentService.listAsPage(wxCouponPresent, pageNum, pageSize); return new ResultData(page); @@ -89,9 +89,9 @@ public class WxCouponPresentController extends BaseController { } MallUserInfo user = getUser(); wxCouponPresent.setUserId(user.getId()); - wxCouponPresent.setTenantId(user.getTenantId()); + wxCouponPresent.updateTenantInfo(user); try { - pushLimitService.checkSendTime(user.getTenantId()); + pushLimitService.checkSendTime(user); } catch (MallinkException e) { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); @@ -117,7 +117,7 @@ public class WxCouponPresentController extends BaseController { } //查询有效券数量 WxCouponPassword wxCouponPassword = new WxCouponPassword(); - wxCouponPassword.setTenantId(user.getTenantId()); + wxCouponPassword.updateTenantInfo(user); wxCouponPassword.setCouponId(wxCouponPresent.getCouponId()); wxCouponPassword.setStatus(EnumCouponPasswordStatus.INIT.getCode()); List list = wxCouponPasswordService.findList(wxCouponPassword); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java index fd0b16605..6b2c77c38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java @@ -35,7 +35,7 @@ public class WxCouponSendConfigController extends BaseController { if (wxCouponSendConfig == null || wxCouponSendConfig.getSendType() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - wxCouponSendConfig.setTenantId(getTenantId()); + wxCouponSendConfig.updateTenantInfo(getTenantInfo()); PageInfo page = wxCouponSendConfigService.listAsPage(wxCouponSendConfig, 1, 1); if (page.getSize() > 0) { return new ResultData(page.getList().get(0)); @@ -62,7 +62,7 @@ public class WxCouponSendConfigController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (wxCouponSendConfig.getValue() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - wxCouponSendConfig.setTenantId(getTenantId()); + wxCouponSendConfig.updateTenantInfo(getTenantInfo()); wxCouponSendConfig.setUpdateTime(new Date()); wxCouponSendConfigService.update(wxCouponSendConfig); return new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 02577c779..7251a339d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -53,7 +53,7 @@ public class WxCouponSendController extends BaseController { public ResultData list(@ModelAttribute WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); - wxCouponSend.setTenantId(getTenantId()); + wxCouponSend.updateTenantInfo(getTenantInfo()); // if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSend.getSendType())) { // if (Objects.nonNull(wxCouponSend.getStatus())) { @@ -78,7 +78,7 @@ public class WxCouponSendController extends BaseController { return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); } try { - wxCouponSendService.saveOrUpdateConfig(beforeDays, sendType, getTenantId()); + wxCouponSendService.saveOrUpdateConfig(beforeDays, sendType, getTenantInfo()); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { @@ -93,7 +93,7 @@ public class WxCouponSendController extends BaseController { @ApiImplicitParam(name = "sendType", value = "注券类型(生日券=8)", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "注券-获取配置") public ResultData getConfig(Integer sendType) { - WxCouponSend wxCouponSend = wxCouponSendService.getConfig(sendType, getTenantId()); + WxCouponSend wxCouponSend = wxCouponSendService.getConfig(sendType, getTenantInfo()); return new ResultData(Objects.isNull(wxCouponSend) ? null : wxCouponSend.getConditions()); } @@ -115,7 +115,7 @@ public class WxCouponSendController extends BaseController { return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE); } - wxCouponSend.setTenantId(wxCoupon.getTenantId()); + wxCouponSend.updateTenantInfo(wxCoupon); wxCouponSend.setTitle(wxCoupon.getTitle()); wxCouponSend.setCreateDate(new Date()); @@ -135,7 +135,7 @@ public class WxCouponSendController extends BaseController { // @SystemControllerLog(description = "注券-更新") // public ResultData update(@RequestBody WxCouponSend wxCouponSend) { // logger.debug("[" + getIpAddr() + "] WxCouponSendController::update"); -// wxCouponSend.setTenantId(getTenantId()); +// wxCouponSend.updateTenantInfo(getTenantInfo()); // wxCouponSendService.saveOrUpdate(wxCouponSend); // return new ResultData(); // } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java index 1f8229473..e43687707 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFloatingLayerController.java @@ -41,7 +41,7 @@ public class WxFloatingLayerController extends BaseController { @SystemControllerLog(description = "列表") public ResultData list(@ModelAttribute WxFloatingLayer wxFloatingLayer, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::list"); - wxFloatingLayer.setTenantId(getTenantId()); + wxFloatingLayer.updateTenantInfo(getTenantInfo()); wxFloatingLayer.setSortColumns(BaseEntity.SortField.CreateTime_DESC, BaseEntity.SortField.Id_DESC); final PageInfo page = wxFloatingLayerService.listAsPage(wxFloatingLayer, pageNum, pageSize); return new ResultData(page); @@ -53,7 +53,7 @@ public class WxFloatingLayerController extends BaseController { public ResultData add(@RequestBody WxFloatingLayer wxFloatingLayer) { logger.debug("[" + getIpAddr() + "] WxFloatingLayerController::add"); wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode()); - wxFloatingLayer.setTenantId(getTenantId()); + wxFloatingLayer.updateTenantInfo(getTenantInfo()); try { return wxFloatingLayerService.saveOrUpdate(wxFloatingLayer); } catch (MallinkException e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index d69548acb..ba1135ad1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -38,7 +38,7 @@ public class WxGameController extends BaseController { public ResultData list(@ModelAttribute WxGame wxGame, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxGameController::list"); if (null == wxGame) wxGame = new WxGame(); - wxGame.setTenantId(getTenantId()); + wxGame.updateTenantInfo(getTenantInfo()); wxGame.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxGameService.listAsPage(wxGame, pageNum, pageSize); return new ResultData(page); @@ -55,7 +55,7 @@ public class WxGameController extends BaseController { wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); } wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); - wxGame.setTenantId(getTenantId()); + wxGame.updateTenantInfo(getTenantInfo()); wxGameService.saveOrUpdate(wxGame); return new ResultData(); } @@ -68,7 +68,7 @@ public class WxGameController extends BaseController { if (StringUtils.isBlank(wxGame.getCouponIds())) { wxGame.setCouponIds(JSONArray.toJSONString(new String[0])); } - wxGame.setTenantId(getTenantId()); + wxGame.updateTenantInfo(getTenantInfo()); wxGameService.saveOrUpdate(wxGame); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index adab71275..858f572bd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -32,7 +32,7 @@ public class WxMerchantMicroPayController extends BaseController { public ResultData listMonth() { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); - wxOrderReportDto.setTenantId(getTenantId()); + wxOrderReportDto.updateTenantInfo(getTenantInfo()); wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); @@ -45,7 +45,7 @@ public class WxMerchantMicroPayController extends BaseController { public ResultData detail(@RequestParam Long merchantId) { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); - wxOrderReportDto.setTenantId(getTenantId()); + wxOrderReportDto.updateTenantInfo(getTenantInfo()); wxOrderReportDto.setMerchantId(merchantId); return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); } @@ -57,7 +57,7 @@ public class WxMerchantMicroPayController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); if (wxOrderReportDto == null) wxOrderReportDto = new WxOrderReportDto(); - wxOrderReportDto.setTenantId(getTenantId()); + wxOrderReportDto.updateTenantInfo(getTenantInfo()); final PageInfo page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java index a5bbe51cc..9c58585d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantPowerBillConfigController.java @@ -39,7 +39,7 @@ public class WxMerchantPowerBillConfigController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCouponDataList(@ModelAttribute WxMerchantPowerBillConfig wxMerchantPowerBillConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantPowerBillConfigController::list"); - wxMerchantPowerBillConfig.setTenantId(getTenantId()); + wxMerchantPowerBillConfig.updateTenantInfo(getTenantInfo()); wxMerchantPowerBillConfig.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxMerchantPowerBillConfigService.listAsPage(wxMerchantPowerBillConfig, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 1a271876d..a0b8a94eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -45,7 +45,7 @@ public class WxMerchantSubsidyController extends BaseController { if (wxMerchantSubsidy == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxMerchantSubsidy.setTenantId(getTenantId()); + wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); List tmpList = new ArrayList(); @@ -72,7 +72,7 @@ public class WxMerchantSubsidyController extends BaseController { if (wxMerchantSubsidy == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxMerchantSubsidy.setTenantId(getTenantId()); + wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); List tmpList = new ArrayList(); @@ -96,7 +96,7 @@ public class WxMerchantSubsidyController extends BaseController { if (null == wxMerchantSubsidy) { wxMerchantSubsidy = new WxMerchantSubsidyVo(); } - wxMerchantSubsidy.setTenantId(getTenantId()); + wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); Map data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); return new ResultData(data); } @@ -110,7 +110,7 @@ public class WxMerchantSubsidyController extends BaseController { if (wxMerchantSubsidy == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } - wxMerchantSubsidy.setTenantId(getTenantId()); + wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.MANUAL_SUBSIDIED.getCode()); wxMerchantSubsidy.setUpdateDate(new Date()); if(StringUtils.isNotBlank(wxMerchantSubsidy.getIdStr())) { @@ -134,7 +134,7 @@ public class WxMerchantSubsidyController extends BaseController { if (wxMerchantSubsidy == null) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件不能为空"); } - wxMerchantSubsidy.setTenantId(getTenantId()); + wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) { String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(","); List tmpList = new ArrayList(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 608f37d74..ed3167048 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -70,7 +70,7 @@ public class WxOrderController extends BaseController { if (null == wxOrder) { wxOrder = new WxOrder(); } - wxOrder.setTenantId(getTenantId()); + wxOrder.updateTenantInfo(getTenantInfo()); wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); @@ -128,7 +128,7 @@ public class WxOrderController extends BaseController { if (null == wxOrderQueryVo) { wxOrderQueryVo = new WxOrderQueryVo(); } - wxOrderQueryVo.setTenantId(getTenantId()); + wxOrderQueryVo.updateTenantInfo(getTenantInfo()); final PageInfo page = wxOrderService.listOrderAsPage(wxOrderQueryVo, pageNum, pageSize); return new ResultData(page); } @@ -139,7 +139,7 @@ public class WxOrderController extends BaseController { public ResultData queryOrderSummary() { logger.debug("[" + getIpAddr() + "] WxOrderController::queryOrderSummary"); - Map data = wxOrderService.queryOrderSummary(getTenantId()); + Map data = wxOrderService.queryOrderSummary(getTenantInfo()); return new ResultData(data); } @@ -222,7 +222,7 @@ public class WxOrderController extends BaseController { logger.debug("[" + getIpAddr() + "] WxOrderController::detail"); WxOrder order = new WxOrder(); order.setId(id); - order.setTenantId(getTenantId()); + order.updateTenantInfo(getTenantInfo()); return new ResultData(Result.SUCCESS, "查询成功", wxOrderService.detailCUserVo(order)); } @@ -234,7 +234,7 @@ public class WxOrderController extends BaseController { if (null == wxOrderQueryVo) { wxOrderQueryVo = new WxOrderQueryVo(); } - wxOrderQueryVo.setTenantId(getTenantId()); + wxOrderQueryVo.updateTenantInfo(getTenantInfo()); Map data = wxOrderService.summary(wxOrderQueryVo); return new ResultData(data); } @@ -247,7 +247,7 @@ public class WxOrderController extends BaseController { if (null == wxOrderQueryVo) { wxOrderQueryVo = new WxOrderQueryVo(); } - wxOrderQueryVo.setTenantId(getTenantId()); + wxOrderQueryVo.updateTenantInfo(getTenantInfo()); wxOrderService.exportData(wxOrderQueryVo, request, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 2c17284f9..2d22efff8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -36,7 +36,7 @@ public class WxOrderGroupController extends BaseController { }) @SystemControllerLog(description = "订单管理-拼团营销分析") public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { - wxOrderGroupMarketing.setTenantId(getTenantId()); + wxOrderGroupMarketing.updateTenantInfo(getTenantInfo()); final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java index 0b0176165..3e1d988a0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPowerBillAutoConfigController.java @@ -39,7 +39,7 @@ public class WxPowerBillAutoConfigController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCouponDataList(@ModelAttribute WxPowerBillAutoConfig wxPowerBillAutoConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxPowerBillAutoConfigController::list"); - wxPowerBillAutoConfig.setTenantId(getTenantId()); + wxPowerBillAutoConfig.updateTenantInfo(getTenantInfo()); wxPowerBillAutoConfig.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxPowerBillAutoConfigService.listAsPage(wxPowerBillAutoConfig, pageNum, pageSize); return new ResultData(page); @@ -60,7 +60,7 @@ public class WxPowerBillAutoConfigController extends BaseController { @SystemControllerLog(description = "id查询") public ResultData getConfig() { logger.debug("[" + getIpAddr() + "] WxPowerBillAutoConfigController::getConfig"); - return new ResultData(Result.SUCCESS, "查询成功", wxPowerBillAutoConfigService.getConfig(getTenantId())); + return new ResultData(Result.SUCCESS, "查询成功", wxPowerBillAutoConfigService.getConfig(getTenantInfo())); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java index fcc56996a..9e672567d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPrepaymentController.java @@ -68,7 +68,7 @@ public class WxPrepaymentController extends BaseController { @SystemControllerLog(description = "预付费-交费") public ResultData payFirst(@RequestBody WxPrepayment wxPrepayment) { logger.debug("[" + getIpAddr() + "] prepayment::add"); - wxPrepayment.setTenantId(getTenantId()); + wxPrepayment.updateTenantInfo(getTenantInfo()); wxPrepayment.setOperationType(EnumUserType.MALLUSER.getCode()); wxPrepayment.setOperator(getUserId()); wxPrepaymentService.payFirst(wxPrepayment); @@ -80,7 +80,7 @@ public class WxPrepaymentController extends BaseController { @SystemControllerLog(description = "预付费-交费或扣费") public ResultData payAgain(@RequestBody WxPrepayment wxPrepayment) { logger.debug("[" + getIpAddr() + "] prepayment::update"); - wxPrepayment.setTenantId(getTenantId()); + wxPrepayment.updateTenantInfo(getTenantInfo()); wxPrepayment.setOperationType(EnumUserType.MALLUSER.getCode()); wxPrepayment.setOperator(getUserId()); wxPrepaymentService.payAgain(wxPrepayment); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index 702af060a..bc0006d19 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -51,7 +51,7 @@ public class WxProfitSharingOrderController extends BaseController { public ResultData queryOrderSummary() { logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::queryOrderSummary"); - Map data = wxProfitSharingOrderService.queryOrderSummary(getTenantId()); + Map data = wxProfitSharingOrderService.queryOrderSummary(getTenantInfo()); return new ResultData(data); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java index 0114cf5d3..c3847e5bc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java @@ -37,8 +37,8 @@ public class WxQuestionController extends BaseController { logger.debug("[" + getIpAddr() + "] WxQuestionController::getQuestionConfig"); WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); WxQuestion wxQuestion = new WxQuestion(); - wxQuestionConfig.setTenantId(getTenantId()); - wxQuestion.setTenantId(getTenantId()); + wxQuestionConfig.updateTenantInfo(getTenantInfo()); + wxQuestion.updateTenantInfo(getTenantInfo()); List list = wxQuestionService.findConfigList(wxQuestionConfig); if (list.size() > 0) { @@ -79,7 +79,7 @@ public class WxQuestionController extends BaseController { } wxQuestionConfig.setQuestionList(JSONObject.toJSONString(qs)); wxQuestionConfig.setCouponTypeList(JSONObject.toJSONString(ct)); - wxQuestionConfig.setTenantId(getTenantId()); + wxQuestionConfig.updateTenantInfo(getTenantInfo()); wxQuestionService.saveOrUpdateConfig(wxQuestionConfig); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index bd38f62d8..3a730c4d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -31,8 +31,7 @@ public class WxTopicController extends BaseController { @SystemControllerLog(description = "专题-列表") public ResultData list(WxTopic wxTopic, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxTopicController::list"); - String tenantId = getTenantId(); - wxTopic.setTenantId(tenantId); + wxTopic.updateTenantInfo(getTenantInfo()); PageInfo page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); //可投放、已上线,时间区间查的是活动开始时间 @@ -41,7 +40,10 @@ public class WxTopicController extends BaseController { //设置正在上架的专题 Date now = new Date(); page.getList().stream().forEach(cc->{ - if (cc.getStatus().equals(EnumWxTopicStatus.VAILD.getCode()) && cc.getEndTime()!=null && cc.getBeginTime()!=null && now.getTime() >= cc.getBeginTime().getTime() && now.getTime() <= cc.getEndTime().getTime()) { + if (cc.getStatus().equals(EnumWxTopicStatus.VAILD.getCode()) && + cc.getEndTime()!=null && cc.getBeginTime()!=null && + now.getTime() >= cc.getBeginTime().getTime() && + now.getTime() <= cc.getEndTime().getTime()) { cc.setIsOnline(1); } }); @@ -52,8 +54,7 @@ public class WxTopicController extends BaseController { @SystemControllerLog(description = "专题-获取详情") public ResultData findById(WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); - String tenantId = getTenantId(); - wxTopic.setTenantId(tenantId); + wxTopic.updateTenantInfo(getTenantInfo()); WxTopic queryTopic = wxTopicService.findById(wxTopic); return new ResultData(queryTopic); } @@ -62,7 +63,7 @@ public class WxTopicController extends BaseController { @SystemControllerLog(description = "专题-保存更新") public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); - wxTopic.setTenantId(super.getTenantId()); + wxTopic.updateTenantInfo(getTenantInfo()); return wxTopicService.saveOrUpdate(wxTopic); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index c32da0048..09c55d94f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -7,6 +7,7 @@ import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxTags; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.CUserBaseInfoT; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxTagsService; @@ -58,7 +59,7 @@ public class AsyncTask { } @Async - public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { + public void importExcelData(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值", "积分"}); @@ -106,7 +107,7 @@ public class AsyncTask { try { successList.parallelStream().forEach(uBase -> { try { - wxCUserBasicInfoService.importOneMem(tenantId, importKey, tagList, uBase,user); + wxCUserBasicInfoService.importOneMem(importKey, tagList, uBase, user); } catch (UnknownSessionException ue) { logger.error("session :"+ue.getMessage()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java index 42c84de62..09016f584 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/BillDailyAsyncTask.java @@ -8,6 +8,7 @@ import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.EnumDelStatus; import com.iformall.enums.EnumShopStatus; @@ -63,7 +64,7 @@ public class BillDailyAsyncTask { } @Async - public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { + public void importExcelData(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"}); @@ -101,7 +102,7 @@ public class BillDailyAsyncTask { //店铺 WxShop shop = new WxShop(); shop.setShopNumber(vo.getShopNumber()); - shop.setTenantId(tenantId); + shop.updateTenantInfo(user); shop.setType(vo.getRentShopType()); shop.setStatus(EnumShopStatus.RENT.getCode()); shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); @@ -133,7 +134,7 @@ public class BillDailyAsyncTask { } vo.setReceivePay(receivePay); vo.setPay(pay); - vo.setTenantId(tenantId); + vo.updateTenantInfo(user); vo.setShopId(wxShop.getId()); vo.setRentShopType(wxShop.getType()); processList.add(vo); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index ad5e23619..430ba2087 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -56,7 +56,7 @@ public class ImportTemplateTask { @Async - public void importBillData(File file, MallUserInfo user, String importKey, String tenantId) { + public void importBillData(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 params.setImportFields(new String[]{"商户名*", "费用类型*", "费用属性*", "费用所属期-开始时间*", "费用所属期-结束时间*", "收款金额(元)*", "收款日期*", "截止缴款日*", "收款方式"}); @@ -94,7 +94,7 @@ public class ImportTemplateTask { Map merchantMap = new HashMap<>(); merchantSet.parallelStream().forEach(merchantName -> { WxMerchant wxMerchantQuery = new WxMerchant(); - wxMerchantQuery.setTenantId(tenantId); + wxMerchantQuery.updateTenantInfo(user); wxMerchantQuery.setName(merchantName); wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); @@ -139,7 +139,7 @@ public class ImportTemplateTask { try { billSuccessList.stream().forEach(bill -> { try { - wxBillAllService.importBill(tenantId, importKey, bill, user); + wxBillAllService.importBill(importKey, bill, user); } catch (UnknownSessionException ue) { logger.error("session :" + ue.getMessage()); } @@ -152,7 +152,7 @@ public class ImportTemplateTask { } } - public void importBillDataOther(File file, MallUserInfo user, String importKey, String tenantId) { + public void importBillDataOther(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 params.setImportFields(new String[]{"商户名*", "费用类型*", "费用名称*", "费用所属期-开始时间*", "费用所属期-结束时间*", "实际应收金额(元)*", "收款金额(元)*", "收款日期", "截止缴款日*", "收款方式"}); @@ -190,7 +190,7 @@ public class ImportTemplateTask { Map merchantMap = new HashMap<>(); merchantSet.parallelStream().forEach(merchantName -> { WxMerchant wxMerchantQuery = new WxMerchant(); - wxMerchantQuery.setTenantId(tenantId); + wxMerchantQuery.updateTenantInfo(user); wxMerchantQuery.setName(merchantName); wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); @@ -241,7 +241,7 @@ public class ImportTemplateTask { try { billSuccessList.stream().forEach(bill -> { try { - wxBillAllService.importBillOther(tenantId, importKey, bill, user); + wxBillAllService.importBillOther(importKey, bill, user); } catch (UnknownSessionException ue) { logger.error("session :" + ue.getMessage()); } @@ -277,7 +277,7 @@ public class ImportTemplateTask { } @Async - public void importMemberData(File file, MallUserInfo user, String importKey, String tenantId) { + public void importMemberData(File file, MallUserInfo user, String importKey) { ImportParams params = new ImportParams(); // 需要验证 params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值", "积分"}); @@ -325,7 +325,7 @@ public class ImportTemplateTask { try { successList.parallelStream().forEach(uBase -> { try { - wxCUserBasicInfoService.importOneMem(tenantId, importKey, tagList, uBase, user); + wxCUserBasicInfoService.importOneMem(importKey, tagList, uBase, user); } catch (UnknownSessionException ue) { logger.error("session :" + ue.getMessage()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 8486abb00..fafbcf6d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -12,6 +12,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.UserTradeRecordVo; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumCouponOrderStatus; @@ -94,7 +95,7 @@ public class WxCUserBasicInfoController extends BaseController { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); } else { info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); - List levelList = wxLevelConfigService.getByTenantId(info.getTenantId()); + List levelList = wxLevelConfigService.getByTenantInfo(info.getTenantInfo()); for (WxLevelConfig levelConfig : levelList) { if (info.getPoins() >= levelConfig.getPoints()) { info.setLevel(levelConfig.getLevel()); @@ -109,7 +110,7 @@ public class WxCUserBasicInfoController extends BaseController { WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(), Long.class); - info.setTagsList(wxCUserTagsService.findTagList(getTenantId(), ids)); + info.setTagsList(wxCUserTagsService.findTagList(info.getTenantInfo(), ids)); } } } @@ -149,8 +150,7 @@ public class WxCUserBasicInfoController extends BaseController { wxCUserBasicInfo.setName(null); } } - String tenantId = getTenantId(); - wxCUserBasicInfo.setTenantId(tenantId); + wxCUserBasicInfo.updateTenantInfo(getTenantInfo()); wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); PageInfo page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); @@ -163,10 +163,10 @@ public class WxCUserBasicInfoController extends BaseController { return new ResultData(page); } - private int checkUniquePhone(String phone, String tenantId) { + private int checkUniquePhone(String phone, TenantEntity tenantEntity) { WxCUserBasicInfo baseInfoQ = new WxCUserBasicInfo(); baseInfoQ.setPhone(phone); - baseInfoQ.setTenantId(tenantId); + baseInfoQ.updateTenantInfo(tenantEntity); return wxCUserBasicInfoService.countUser(baseInfoQ); } @@ -177,15 +177,15 @@ public class WxCUserBasicInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update"); WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId()); if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) { - if (checkUniquePhone(wxCUserBasicInfo.getPhone(), getTenantId()) > 0) { + if (checkUniquePhone(wxCUserBasicInfo.getPhone(), getTenantInfo()) > 0) { return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在"); } } - wxCUserBasicInfo.setTenantId(getTenantId()); + wxCUserBasicInfo.updateTenantInfo(getTenantInfo()); if (StringUtils.isNotBlank(wxCUserBasicInfo.getTagIds())) { WxCUserTags record = new WxCUserTags(); record.setUserId(oldInfo.getId()); - record.setTenantId(getTenantId()); + record.updateTenantInfo(getTenantInfo()); PageInfo page = wxCUserTagsService.listAsPage(record, 1, 1); if (page.getSize() > 0) { WxCUserTags t = page.getList().get(0); @@ -225,6 +225,7 @@ public class WxCUserBasicInfoController extends BaseController { if (info == null) return new ResultData(ErrorCode.USER_IS_EMPTY); + info.updateTenantInfo(getTenantInfo()); setUserInfoTag(info); setUserInfoLevel(info); @@ -240,7 +241,7 @@ public class WxCUserBasicInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findOrderCouponByUserId"); WxCouponOrder corder = new WxCouponOrder(); corder.setCUserId(userId); - corder.setTenantId(getTenantId()); + corder.updateTenantInfo(getTenantInfo()); corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); if (page.getSize() > 0) { @@ -270,7 +271,7 @@ public class WxCUserBasicInfoController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportOrderCouponByUserId"); WxCouponOrder corder = new WxCouponOrder(); corder.setCUserId(userId); - corder.setTenantId(getTenantId()); + corder.updateTenantInfo(getTenantInfo()); corder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxCouponOrderService.listAsPage(corder, 1, Integer.MAX_VALUE); if (page.getSize() > 0) { @@ -315,7 +316,7 @@ public class WxCUserBasicInfoController extends BaseController { } } - basicInfo.setTenantId(getTenantId()); + basicInfo.updateTenantInfo(getTenantInfo()); int exportDataCount = wxCUserBasicInfoService.exportDataCount(basicInfo); return new ResultData(exportDataCount); @@ -338,7 +339,7 @@ public class WxCUserBasicInfoController extends BaseController { } } - basicInfo.setTenantId(getTenantId()); + basicInfo.updateTenantInfo(getTenantInfo()); wxCUserBasicInfoService.exportData(basicInfo, request, response); } @@ -348,7 +349,7 @@ public class WxCUserBasicInfoController extends BaseController { public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportTemplate"); - wxCUserBasicInfoService.exportTemplate(request, response, getTenantId()); + wxCUserBasicInfoService.exportTemplate(request, response); } @@ -373,7 +374,6 @@ public class WxCUserBasicInfoController extends BaseController { final MallUserInfo user = getUser(); String userId = "" + user.getId(); String importKey = Constant.importMemPrev + userId; - final String tenantId = getTenantId(); //查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 Boolean allCount = stringRedisTemplate.opsForHash().hasKey(importKey, "allCount"); @@ -441,7 +441,7 @@ public class WxCUserBasicInfoController extends BaseController { } } - asyncTask.importExcelData(lFile, user, importKey, tenantId); + asyncTask.importExcelData(lFile, user, importKey); return new ResultData(Result.SUCCESS, "模板正在导入"); } @@ -494,7 +494,7 @@ public class WxCUserBasicInfoController extends BaseController { }) @SystemControllerLog(description = "会员管理-进出场车辆分页列表") public ResultData carPayList(@ModelAttribute WxCarPayRecord record, Integer pageNum, Integer pageSize){ - record.setTenantId(super.getTenantId()); + record.updateTenantInfo(getTenantInfo()); return new ResultData(wxCarPayRecordService.findCarPayListByPage(record,pageNum,pageSize)); } @@ -508,7 +508,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-停车会员记录导出") public void exportCarPayData(@ModelAttribute WxCarPayRecord record,HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportData"); - record.setTenantId(getTenantId()); + record.updateTenantInfo(getTenantInfo()); wxCUserBasicInfoService.exportCarPayData(record, request, response); } @@ -522,7 +522,7 @@ public class WxCUserBasicInfoController extends BaseController { if (StringUtils.isEmpty(phone)) { return new ResultData(new ArrayList()); } - List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); + List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantInfo(),phone); WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { wxCUserBasicInfo = wxCUserBasicInfoList.get(0); @@ -535,7 +535,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-获取会员过滤器") public ResultData listFilter() { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); - return new ResultData(wxCUserBasicInfoService.listFilters(getTenantId())); + return new ResultData(wxCUserBasicInfoService.listFilters(getTenantInfo())); } @@ -544,7 +544,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-会员过滤器获取数量") public ResultData countByFilter(@RequestBody List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); - return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantId(),filterList)); + return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantInfo(),filterList)); } @ApiOperation("获取会员过滤器") @@ -552,7 +552,7 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-会员过滤器获取") public ResultData listByFilter(@RequestParam List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); - return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList)); + return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantInfo(),filterList)); } @ApiOperation("根据ID锁定") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 19eaf3379..6bfecb2a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -14,6 +14,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.DataUtil; @@ -58,7 +59,7 @@ public class WxCUserDataController extends BaseController { public ResultData findUserCountData() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserCountData"); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(getTenantId()); + dto.updateTenantInfo(getTenantInfo()); long allCount = wxCUserService.findCount(dto);//总数 Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -138,7 +139,7 @@ public class WxCUserDataController extends BaseController { //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(getTenantId()); + wxCUserBasicInfoDto.updateTenantInfo(getTenantInfo()); wxCUserBasicInfoDto.setStartTime(null); wxCUserBasicInfoDto.setEndTime(null); map.put("growCount", wxCUserBasicInfoService.findGrowUserCount(wxCUserBasicInfoDto)); @@ -167,7 +168,7 @@ public class WxCUserDataController extends BaseController { params.put("endTime", endTime); params.put("tenantId", getTenantId()); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(getTenantId()); + markingCouponDataReportDto.updateTenantInfo(getTenantInfo()); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitService.touchUsersReportList(markingCouponDataReportDto); @@ -261,7 +262,7 @@ public class WxCUserDataController extends BaseController { @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") public ResultData findUserAmountData() { logger.debug("[" + getIpAddr() + "] WxCUserDataController::findUserAmountData"); - String tenantId = getTenantId(); + TenantEntity tenantEntity = getTenantInfo(); Calendar c = Calendar.getInstance(); Date today = c.getTime(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -272,7 +273,7 @@ public class WxCUserDataController extends BaseController { c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 Date startTime = c.getTime(); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder);//月消费金额 @@ -281,7 +282,7 @@ public class WxCUserDataController extends BaseController { Date eTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -30); Date sTime = c.getTime(); - List datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderService.queryPriceTotalGroup(tenantEntity, sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 102c8cf90..e7ff6b36b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -60,7 +60,7 @@ public class WxCreditHistoryController extends BaseController { } try { - Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId,getTenantId()) ; + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo()) ; return new ResultData(result); } catch (MallinkException e) { return new ResultData(e.getErrorCode(),e.getMessage()); @@ -75,7 +75,7 @@ public class WxCreditHistoryController extends BaseController { public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); MallUserInfo user = getUser(); - wxCreditHistory.setTenantId(user.getTenantId()); + wxCreditHistory.updateTenantInfo(user); wxCreditHistory.setOperatorId(user.getId()); try { wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId()) ; @@ -110,7 +110,7 @@ public class WxCreditHistoryController extends BaseController { @GetMapping("exportData") @SystemControllerLog(description = "积分历史-导出数据") public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) { - wxCreditHistory.setTenantId(getTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); wxCreditHistoryService.exportData(request, response, wxCreditHistory); } @@ -119,7 +119,7 @@ public class WxCreditHistoryController extends BaseController { @SystemControllerLog(description = "积分历史-积分统计概览") public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); - wxCreditHistory.setTenantId(getTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); return wxCreditHistoryService.getCreditSummary(wxCreditHistory); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 78290721e..b0207201d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -45,7 +45,7 @@ public class WxLevelConfigController extends BaseController { public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(getTenantId()); + wxLevelConfig.updateTenantInfo(getTenantInfo()); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); return new ResultData(page); @@ -56,9 +56,8 @@ public class WxLevelConfigController extends BaseController { @SystemControllerLog(description = "会员等级权益-新增") public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); - String tenantId = getTenantId(); try { - wxLevelConfigService.batchSave(tenantId, levelConfigs); + wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); } catch (Exception e) { logger.error(e.getMessage()); return new ResultData(ErrorCode.DB_FAIL); @@ -71,9 +70,8 @@ public class WxLevelConfigController extends BaseController { @SystemControllerLog(description = "会员等级权益-更改会员权益") public ResultData updateCapabilities(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); - String tenantId = getTenantId(); try { - wxLevelConfigService.batchUpdateCapabilities(tenantId, levelConfigs); + wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); } catch (Exception e) { logger.error(e.getMessage()); return new ResultData(ErrorCode.DB_FAIL); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index 36de57845..80c98bb6c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -28,7 +28,7 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "成长值-配置") public ResultData list() { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantInfo()); if (scoreRules.getCreditLocked() == null) { scoreRules.setCreditLocked(EnumCreditLockedStatus.OPEN.getCode()); } @@ -40,7 +40,7 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "成长值-积分-配置-新增") public ResultData add(@RequestBody WxScoreRules wxScoreRules) { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::add"); - wxScoreRules.setTenantId(getTenantId()); + wxScoreRules.updateTenantInfo(getTenantInfo()); wxScoreRulesService.saveOrUpdate(wxScoreRules); return new ResultData(); } @@ -50,7 +50,7 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "积分-配置") public ResultData creditRulesList() { logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list"); - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(getTenantInfo()); return new ResultData(scoreRules); } @@ -65,7 +65,7 @@ public class WxScoreRulesController extends BaseController { if (null == wxScoreRules.getCreditLocked()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "creditLocked不能为空"); } - wxScoreRules.setTenantId(getTenantId()); + wxScoreRules.updateTenantInfo(getTenantInfo()); try { wxScoreRulesService.updateCreditLocked(wxScoreRules); } catch (Exception e) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index e3f530038..2a7770e4f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -33,7 +33,7 @@ public class WxMsgCallbackController extends BaseController { public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); - wxMsgCallback.setTenantId(getTenantId()); + wxMsgCallback.updateTenantInfo(getTenantInfo()); wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); @@ -46,7 +46,7 @@ public class WxMsgCallbackController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgCallback.setTenantId(getTenantId()); + wxMsgCallback.updateTenantInfo(getTenantInfo()); wxMsgCallbackService.saveOrUpdate(wxMsgCallback); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 24e6e361e..953983694 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -45,7 +45,7 @@ public class WxMsgController extends BaseController { public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxMsg) wxMsg = new WxMsg(); - wxMsg.setTenantId(getTenantId()); + wxMsg.updateTenantInfo(getTenantInfo()); //wxMsg.setWay(EnumSendWay.TAG.getCode()); wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); @@ -57,7 +57,7 @@ public class WxMsgController extends BaseController { @SystemControllerLog(description = "标签短信-新增") public ResultData add(@RequestBody WxMsg wxMsg) { logger.debug("[" + getIpAddr() + "] WxMsgController::add"); - wxMsg.setTenantId(getTenantId()); + wxMsg.updateTenantInfo(getTenantInfo()); return wxMsgService.add(wxMsg); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index 5db428975..9ebc89d08 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -33,7 +33,7 @@ public class WxMsgModelController extends BaseController { public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); - wxMsgModel.setTenantId(getTenantId()); + wxMsgModel.updateTenantInfo(getTenantInfo()); wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); @@ -46,7 +46,7 @@ public class WxMsgModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgModel.setTenantId(getTenantId()); + wxMsgModel.updateTenantInfo(getTenantInfo()); return wxMsgModelService.saveOrUpdate(wxMsgModel); } @@ -83,7 +83,7 @@ public class WxMsgModelController extends BaseController { @SystemControllerLog(description = "短信模板-获取所有数据") public ResultData getmodellist() { logger.debug("[" + getIpAddr() + "] WxMsgModelController::getmodellist"); - return wxMsgModelService.getmodellist(getTenantId()); + return wxMsgModelService.getModelList(getTenantInfo()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index 6b88ea702..810a9a14b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -2,6 +2,7 @@ package com.iformall.controller.msg; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.*; import com.iformall.enums.*; import com.iformall.mapper.WxMsgMapper; @@ -64,9 +65,10 @@ public class WxMsgRecordController extends BaseController { public ResultData resendMsg(String x, Integer msgType) { logger.debug("[" + getIpAddr() + "] WxMsgRecordController::resendMsg"); if("xll1dxx1314".equals(x)){ + TenantEntity tenantEntity = getTenantInfo(); WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgType(msgType); - msgRecord.setTenantId(getTenantId()); + msgRecord.updateTenantInfo(tenantEntity); msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); List recordList = wxMsgRecordService.findList(msgRecord); for (WxMsgRecord wxMsgRecord:recordList) { @@ -78,28 +80,28 @@ public class WxMsgRecordController extends BaseController { WxMsg wxMsg = (WxMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),WxMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); wxMsg.setReceiver(wxMsgRecord.getReceiver()); - wxMsg.setTenantId(wxMsgRecord.getTenantId()); + wxMsg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.EMAIL.getCode().equals(wxMsgRecord.getMsgType())){ //邮件 MailMsg wxMsg = (MailMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),MailMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); wxMsg.setReceiver(wxMsgRecord.getReceiver()); - wxMsg.setTenantId(wxMsgRecord.getTenantId()); + wxMsg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.SMART_APP.getCode().equals(wxMsgRecord.getMsgType())){ //微信小程序 SmartAppMsg wxMsg = (SmartAppMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),SmartAppMsg.class); wxMsg.setMsgType(wxMsgRecord.getMsgType()); wxMsg.setReceiver(wxMsgRecord.getReceiver()); - wxMsg.setTenantId(wxMsgRecord.getTenantId()); + wxMsg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ //内部消息 - 下订单成功 FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); msg.setMsgType(wxMsgRecord.getMsgType()); msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index c8c480276..a63a75db7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -33,7 +33,7 @@ public class WxMsgSignatureController extends BaseController { public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); - wxMsgSignature.setTenantId(getTenantId()); + wxMsgSignature.updateTenantInfo(getTenantInfo()); wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); @@ -46,7 +46,7 @@ public class WxMsgSignatureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgSignature.setTenantId(getTenantId()); + wxMsgSignature.updateTenantInfo(getTenantInfo()); wxMsgSignatureService.saveOrUpdate(wxMsgSignature); return new ResultData(); } @@ -84,7 +84,7 @@ public class WxMsgSignatureController extends BaseController { @SystemControllerLog(description = "消息签名-获取所有") public ResultData getmodellist() { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::getmodellist"); - return wxMsgSignatureService.getsignaturelist(getTenantId()); + return wxMsgSignatureService.getSignatureList(getTenantInfo()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index 4ecdcb5c7..3fbb7571c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -6,6 +6,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.WxMsgValidationcodeService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -79,7 +80,9 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData sendvalidationcode(String tenantId, String phone, Integer type, String appid) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::sendvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setAppid(appid); @@ -96,7 +99,9 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData hasvalidationcode(String tenantId, String phone, Integer type, String code, String appid) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::hasvalidationcode"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index 2c642b3f4..302b337b4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -33,7 +33,7 @@ public class WxMsgValidationcodeModelController extends BaseController { public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); - wxMsgValidationcodeModel.setTenantId(getTenantId()); + wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); page.getList().forEach(m -> { for (EnumMsgModelReplace e : EnumMsgModelReplace.values()) { @@ -50,7 +50,7 @@ public class WxMsgValidationcodeModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgValidationcodeModel.setTenantId(getTenantId()); + wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index cfa0f10ef..fdc2603ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -42,7 +42,7 @@ public class WxBillActionController extends BaseController { if (null == wxBillAction) { wxBillAction = new WxBillAction(); } - wxBillAction.setTenantId(getTenantId()); + wxBillAction.updateTenantInfo(getTenantInfo()); PageInfo result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 4d9718cd5..224987237 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -56,7 +56,7 @@ public class WxBillAllController extends BaseController { if (null == wxBillAll) { wxBillAll = new WxBillAll(); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ wxBillAll.setStatusList(new ArrayList<>()); JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); @@ -84,21 +84,21 @@ public class WxBillAllController extends BaseController { if (null == wxBillAll) { wxBillAll = new WxBillAll(); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); return new ResultData(wxBillAllService.allDepositList(wxBillAll)); } @GetMapping("exportBill") @SystemControllerLog(description = "账单总览-导出") public void exportBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); wxBillAllService.exportBill(request, response, wxBillAll); } @GetMapping("getBillInfo") @SystemControllerLog(description = "账单总览-获取账单信息") public ResultData getBillInfo(@ModelAttribute WxBillAll wxBillAll) { - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); Object billInfo = wxBillAllService.getBillInfo(wxBillAll); return new ResultData(billInfo); } @@ -125,7 +125,7 @@ public class WxBillAllController extends BaseController { if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); Map result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); return new ResultData(result); } @@ -148,7 +148,7 @@ public class WxBillAllController extends BaseController { if (null == wxBillAll) { wxBillAll = new WxBillAll(); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); Map result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); return new ResultData(result); } @@ -166,7 +166,7 @@ public class WxBillAllController extends BaseController { if (null == wxBillAll) { wxBillAll = new WxBillAll(); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); } @@ -183,7 +183,7 @@ public class WxBillAllController extends BaseController { if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); wxBillAllService.exportOweMerchant(wxBillAll, request, response); } @@ -199,7 +199,7 @@ public class WxBillAllController extends BaseController { if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); wxBillAllService.exportWaitMerchant(wxBillAll, request, response); } @@ -215,7 +215,7 @@ public class WxBillAllController extends BaseController { if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); } - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); wxBillAllService.exportOweBill(wxBillAll, request, response); } @@ -223,7 +223,7 @@ public class WxBillAllController extends BaseController { @SystemControllerLog(description = "账单-更新") public ResultData updateReceivePay(@RequestBody WxBillAll wxBillAll) { logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); - wxBillAll.setTenantId(getTenantId()); + wxBillAll.updateTenantInfo(getTenantInfo()); return wxBillAllService.updateReceivePay(wxBillAll, getUser()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 43212161b..a177d36df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -64,7 +64,7 @@ public class WxBillDailyController extends BaseController { if (null == wxBillDaily) { wxBillDaily = new WxBillDaily(); } - wxBillDaily.setTenantId(getTenantId()); + wxBillDaily.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); return new ResultData(page); } @@ -74,7 +74,7 @@ public class WxBillDailyController extends BaseController { public ResultData add(@RequestBody WxBillDaily wxBillDaily) { logger.debug("[" + getIpAddr() + "] WxBillDailyController::add"); MallUserInfo user = getUser(); - wxBillDaily.setTenantId(user.getTenantId()); + wxBillDaily.updateTenantInfo(user); wxBillDaily.setUserId(user.getId()); wxBillDaily.setBuildWay(EnumBillDailyBuildWay.HAND.getCode()); return wxBillDailyService.saveOrUpdate(wxBillDaily, user); @@ -118,7 +118,7 @@ public class WxBillDailyController extends BaseController { @SystemControllerLog(description = "日常账单-导出模板") public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] wxBillDailyService::exportTemplate"); - wxBillDailyService.exportTemplate(request, response, getTenantId()); + wxBillDailyService.exportTemplate(request, response, getUser()); } @@ -133,7 +133,6 @@ public class WxBillDailyController extends BaseController { final MallUserInfo user = getUser(); String userId = "bill_daily_" + user.getId(); String importKey = Constant.importMemPrev + userId; - final String tenantId = getTenantId(); //查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 Boolean allCount = stringRedisTemplate.opsForHash().hasKey(importKey, "allCount"); @@ -201,7 +200,7 @@ public class WxBillDailyController extends BaseController { } } - billDailyAsyncTask.importExcelData(lFile, user, importKey, tenantId); + billDailyAsyncTask.importExcelData(lFile, user, importKey); return new ResultData(Result.SUCCESS, "模板正在导入"); } @@ -245,7 +244,7 @@ public class WxBillDailyController extends BaseController { @GetMapping("exportBill") @SystemControllerLog(description = "日常费用账单-导出") public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) { - wxBillDaily.setTenantId(getTenantId()); + wxBillDaily.updateTenantInfo(getTenantInfo()); wxBillDailyService.exportBill(request, response, wxBillDaily); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index 2bc4ce597..a302e319b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -35,7 +35,7 @@ public class WxBillDepositController extends BaseController { if (null == wxBillDeposit) { wxBillDeposit = new WxBillDeposit(); } - wxBillDeposit.setTenantId(getTenantId()); + wxBillDeposit.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); return new ResultData(page); } @@ -44,7 +44,7 @@ public class WxBillDepositController extends BaseController { @SystemControllerLog(description = "租赁押金-新增") public ResultData add(@RequestBody WxBillDeposit wxBillDeposit) { logger.debug("[" + getIpAddr() + "] WxBillDepositController::add"); - wxBillDeposit.setTenantId(getTenantId()); + wxBillDeposit.updateTenantInfo(getTenantInfo()); return wxBillDepositService.saveOrUpdate(wxBillDeposit, getUser()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 5b8b6430f..6b78b4066 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -40,7 +40,7 @@ public class WxBillOtherController extends BaseController { if (null == wxBillOther) { wxBillOther = new WxBillOther(); } - wxBillOther.setTenantId(getTenantId()); + wxBillOther.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); return new ResultData(page); } @@ -50,7 +50,7 @@ public class WxBillOtherController extends BaseController { public ResultData add(@RequestBody WxBillOther wxBillOther) { logger.debug("[" + getIpAddr() + "] WxBillOtherController::add"); MallUserInfo user = getUser(); - wxBillOther.setTenantId(user.getTenantId()); + wxBillOther.updateTenantInfo(user); wxBillOther.setUserId(user.getId()); return wxBillOtherService.saveOrUpdate(wxBillOther, user); } @@ -97,7 +97,7 @@ public class WxBillOtherController extends BaseController { @GetMapping("exportBill") @SystemControllerLog(description = "其它账单-导出") public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) { - wxBillOther.setTenantId(getTenantId()); + wxBillOther.updateTenantInfo(getTenantInfo()); wxBillOtherService.exportBill(request, response, wxBillOther); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 9255a581c..3ef056a00 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -40,7 +40,7 @@ public class WxBillOtherDepositController extends BaseController { if (null == wxBillOtherDeposit) { wxBillOtherDeposit = new WxBillOtherDeposit(); } - wxBillOtherDeposit.setTenantId(getTenantId()); + wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); final PageInfo page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); return new ResultData(page); } @@ -50,7 +50,7 @@ public class WxBillOtherDepositController extends BaseController { public ResultData add(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::add"); MallUserInfo user = getUser(); - wxBillOtherDeposit.setTenantId(user.getTenantId()); + wxBillOtherDeposit.updateTenantInfo(user); wxBillOtherDeposit.setUserId(user.getId()); return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, user); } @@ -107,7 +107,7 @@ public class WxBillOtherDepositController extends BaseController { @GetMapping("exportBill") @SystemControllerLog(description = "其它押金账单-导出") public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) { - wxBillDeposit.setTenantId(getTenantId()); + wxBillDeposit.updateTenantInfo(getTenantInfo()); wxBillOtherDepositService.exportBill(request, response, wxBillDeposit); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 62921452c..2f499f786 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -40,7 +40,7 @@ public class WxBillPropertyController extends BaseController { if (null == wxBillProperty) { wxBillProperty = new WxBillProperty(); } - wxBillProperty.setTenantId(getTenantId()); + wxBillProperty.updateTenantInfo(getTenantInfo()); wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); PageInfo result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); @@ -50,7 +50,7 @@ public class WxBillPropertyController extends BaseController { @SystemControllerLog(description = "物业账单-新增") public ResultData add(@RequestBody WxBillProperty wxBillProperty) { logger.debug("[" + getIpAddr() + "] WxBillPropertyController::add"); - wxBillProperty.setTenantId(getTenantId()); + wxBillProperty.updateTenantInfo(getTenantInfo()); wxBillPropertyService.saveOrUpdate(wxBillProperty, getUser()); return new ResultData(); } @@ -111,7 +111,7 @@ public class WxBillPropertyController extends BaseController { @SystemControllerLog(description = "物业账单-根据商户获取") public ResultData findByPropertyContractId(Long propertyContractId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBillPropertyController::findByPropertyContractId"); - final PageInfo page = wxBillPropertyService.findByPropertyContractId(propertyContractId, getTenantId(), pageNum, pageSize); + final PageInfo page = wxBillPropertyService.findByPropertyContractId(propertyContractId, getTenantInfo(), pageNum, pageSize); return new ResultData(page); } @@ -126,7 +126,7 @@ public class WxBillPropertyController extends BaseController { @GetMapping("exportBill") @SystemControllerLog(description = "物业账单-导出") public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) { - wxBillProperty.setTenantId(getTenantId()); + wxBillProperty.updateTenantInfo(getTenantInfo()); wxBillPropertyService.exportBill(request, response, wxBillProperty); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index cfdc94f30..c825d3c10 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -35,7 +35,7 @@ public class WxBillPropertyDepositController extends BaseController { if (null == wxBillPropertyDeposit) { wxBillPropertyDeposit = new WxBillPropertyDeposit(); } - wxBillPropertyDeposit.setTenantId(getTenantId()); + wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); PageInfo result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); return new ResultData(result); } @@ -44,7 +44,7 @@ public class WxBillPropertyDepositController extends BaseController { @SystemControllerLog(description = "物业押金账单-新增") public ResultData add(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::add"); - wxBillPropertyDeposit.setTenantId(getTenantId()); + wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); wxBillPropertyDepositService.saveOrUpdate(wxBillPropertyDeposit, getUser()); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 874d12cf8..cfe7973e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -40,7 +40,7 @@ public class WxBillRentController extends BaseController { if (null == wxBillRent) { wxBillRent = new WxBillRent(); } - wxBillRent.setTenantId(getTenantId()); + wxBillRent.updateTenantInfo(getTenantInfo()); wxBillRent.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); return new ResultData(page); @@ -50,7 +50,7 @@ public class WxBillRentController extends BaseController { @SystemControllerLog(description = "租赁押金账单-新增") public ResultData add(@RequestBody WxBillRent wxBillRent) { logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); - wxBillRent.setTenantId(getTenantId()); + wxBillRent.updateTenantInfo(getTenantInfo()); return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); } @@ -94,7 +94,10 @@ public class WxBillRentController extends BaseController { @SystemControllerLog(description = "租赁押金账单-根据商户获取") public ResultData findByRentContractId(Long rentContractId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBillRentController::findByRentContractId"); - final PageInfo page = wxBillRentService.findByRentContractId(rentContractId, getTenantId(), pageNum, pageSize); + WxBillRent record = new WxBillRent(); + record.setRentContractId(rentContractId); + record.updateTenantInfo(getTenantInfo()); + final PageInfo page = wxBillRentService.findByRentContractId(record, pageNum, pageSize); return new ResultData(page); } @@ -132,7 +135,7 @@ public class WxBillRentController extends BaseController { @GetMapping("exportBill") @SystemControllerLog(description = "租赁押金账单-导出") public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { - wxBillRent.setTenantId(getTenantId()); + wxBillRent.updateTenantInfo(getTenantInfo()); wxBillRentService.exportBill(request, response, wxBillRent); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java index d3a110a52..d59bc76f3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java @@ -48,7 +48,7 @@ public class WxBillSettleController extends BaseController { if (null == wxBillSettle) { wxBillSettle = new WxBillSettle(); } - wxBillSettle.setTenantId(getTenantId()); + wxBillSettle.updateTenantInfo(getTenantInfo()); wxBillSettle.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = wxBillSettleService.listAsPage(wxBillSettle, pageNum, pageSize); return new ResultData(page); @@ -68,7 +68,7 @@ public class WxBillSettleController extends BaseController { @SystemControllerLog(description = "账单管理-结算单-新增或编辑") public ResultData addOrUpdate(@RequestBody WxBillSettle wxBillSettle) { logger.debug("[" + getIpAddr() + "] WxBillSettleController::addOrUpdate"); - wxBillSettle.setTenantId(getTenantId()); + wxBillSettle.updateTenantInfo(getTenantInfo()); return wxBillSettleService.saveOrUpdate(wxBillSettle,getUser()); } @@ -77,21 +77,21 @@ public class WxBillSettleController extends BaseController { @SystemControllerLog(description = "账单管理-结算单-结算") public ResultData settle(@RequestBody WxBillSettleRecord wxBillSettleRecord) { logger.debug("[" + getIpAddr() + "] WxBillSettleController::settle"); - wxBillSettleRecord.setTenantId(getTenantId()); + wxBillSettleRecord.updateTenantInfo(getTenantInfo()); return wxBillSettleRecordService.saveOrUpdate(wxBillSettleRecord,getUser(),null); } @GetMapping("exportSettle") @SystemControllerLog(description = "账单管理-结算单-导出") public void exportBill(@ModelAttribute WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { - wxBillSettle.setTenantId(getTenantId()); + wxBillSettle.updateTenantInfo(getTenantInfo()); wxBillSettleService.exportBill(request, response, wxBillSettle); } @GetMapping("downloadSettle") @SystemControllerLog(description = "账单管理-结算单-下载") public void downloadSettle(@ModelAttribute WxBillSettle wxBillSettle, HttpServletRequest request, HttpServletResponse response) { - wxBillSettle.setTenantId(getTenantId()); + wxBillSettle.updateTenantInfo(getTenantInfo()); wxBillAllService.exportSettleBill(wxBillSettle,request,response); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 83721eae3..45a38d8cc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -1,5 +1,6 @@ package com.iformall.controller.sys; +import com.alibaba.fastjson.JSON; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; import com.iformall.common.ErrorCode; @@ -7,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -25,6 +27,7 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.DisabledAccountException; import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -144,9 +147,9 @@ public class HomeController extends BaseController { if(isLogin) { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); - WxMall mall = mallService.getByTenantId(info.getTenantId()); + WxMall mall = mallService.getByTenantInfo(info); if(mall == null) { logger.error("未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall"); @@ -198,15 +201,18 @@ public class HomeController extends BaseController { logger.error("appid未找到"); return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(appinfo.getTenantId()); + }}; if (StringUtils.isNotBlank(user.getPhone())) { // 领导登录 - user = mallUserInfoService.getByPhone(user.getPhone(), appinfo.getTenantId()); + user = mallUserInfoService.getByPhone(user.getPhone(), tenantEntity); if (user == null || !isInMobileAdmin(user)) { return new ResultData(ErrorCode.USER_NO_PERMISSION); } } else if (StringUtils.isNotBlank(user.getBopenId())) { // 领导登录 - user = mallUserInfoService.getByBOpenId(user.getBopenId(), appinfo.getTenantId()); + user = mallUserInfoService.getByBOpenId(user.getBopenId(), tenantEntity); if (user == null || !isInMobileAdmin(user)) { return new ResultData(ErrorCode.USER_NO_PERMISSION); } @@ -238,9 +244,9 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); - WxMall mall = mallService.getByTenantId(info.getTenantId()); + WxMall mall = mallService.getByTenantInfo(info); if (mall == null) { logger.error("未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall"); @@ -297,7 +303,7 @@ public class HomeController extends BaseController { } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setPhone(phone); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(user); wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode()); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); } @@ -338,9 +344,9 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户手机号登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户手机号登录"); - WxMall mall = mallService.getByTenantId(info.getTenantId()); + WxMall mall = mallService.getByTenantInfo(info); if (mall == null) { logger.error("未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index f61ccc89c..c627aef99 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRoleService; @@ -51,14 +52,13 @@ public class MallRoleController extends BaseController { @SystemControllerLog(description = "用户管理-role列表") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); - String tenantId = getTenantId(); - sysRole.setTenantId(tenantId); + sysRole.updateTenantInfo(getTenantInfo()); sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); for (MallRole r : page.getList()) { MallRolePermission p = new MallRolePermission(); p.setRoleId(r.getId()); - p.setTenantId(tenantId); + p.updateTenantInfo(sysRole); List pers = sysRolePermissionService.getList(p); String menus = ""; for (MallRolePermission rp : pers) { @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { MallRole role = sysRoleService.getById(sysRole.getId()); MallRolePermission p = new MallRolePermission(); p.setRoleId(role.getId()); - p.setTenantId(getTenantId()); + p.updateTenantInfo(getTenantInfo()); List pers = sysRolePermissionService.getList(p); String menus = ""; for (MallRolePermission rp : pers) { @@ -108,12 +108,11 @@ public class MallRoleController extends BaseController { if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色"); } - String tenantId = currentUser.getTenantId(); - int count = checkUnique(sysRole.getName(), tenantId); + int count = checkUnique(sysRole.getName(), currentUser); if (sysRole.getId() == null && count > 0) { return new ResultData(ResultData.ERROR, "角色名已存在"); } - sysRole.setTenantId(tenantId); + sysRole.updateTenantInfo(currentUser); sysRoleService.saveOrUpdate(sysRole); if (StringUtils.isNoneBlank(sysRole.getMenus())) { String[] menuIds = sysRole.getMenus().split(","); @@ -121,7 +120,7 @@ public class MallRoleController extends BaseController { for (String mId : menuIds) { mIds.add(Long.valueOf(mId)); } - sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); + sysRolePermissionService.savePermissions(currentUser, sysRole.getId(), mIds.toArray(new Long[]{})); } return new ResultData(); } @@ -147,10 +146,10 @@ public class MallRoleController extends BaseController { return new ResultData(Result.SUCCESS, "删除成功", null); } - private int checkUnique(String name, String tenantId) { + private int checkUnique(String name, TenantEntity tenantEntity) { MallRole role = new MallRole(); role.setName(name); - role.setTenantId(tenantId); + role.updateTenantInfo(tenantEntity); return sysRoleService.countList(role); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 93e20027e..60dbc70f0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); - userInfo.setTenantId(getTenantId()); + userInfo.updateTenantInfo(getTenantInfo()); userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { @@ -130,7 +130,7 @@ public class MallUserInfoController extends BaseController { Assert.notNull(userInfo.getPassword(), "密码不能为空"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); - userInfo.setTenantId(getTenantId()); + userInfo.updateTenantInfo(currentUser); // 无法创建超管 userInfo.setIsAdmin(EnumUserAdmin.Normal.getCode()); userInfoService.saveOrUpdate(userInfo); @@ -169,7 +169,7 @@ public class MallUserInfoController extends BaseController { bChangedPhone = true; } - userInfo.setTenantId(getTenantId()); + userInfo.updateTenantInfo(currentUser); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); @@ -251,7 +251,7 @@ public class MallUserInfoController extends BaseController { } MallUserInfo updateUserInfo = new MallUserInfo(); updateUserInfo.setId(userInfo.getId()); - updateUserInfo.setTenantId(getTenantId()); + updateUserInfo.updateTenantInfo(currentUser); updateUserInfo.setStatus(userInfo.getStatus()); userInfoService.saveOrUpdate(userInfo); return new ResultData(); @@ -332,7 +332,7 @@ public class MallUserInfoController extends BaseController { } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(user); wxMsgValidationcode.setPhone(user.getPhone()); wxMsgValidationcode.setType(type); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index b9d0ce606..78e355a54 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallRole; import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumMenuType; import com.iformall.enums.EnumPermissionType; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 7d038d207..99470f4fc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.QrCodeService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; @@ -36,6 +37,11 @@ public class UploadController extends BaseController { @Autowired private QrCodeService qrCodeService; + private String getFileName(TenantEntity tenantEntity, String fileName) { + fileName = tenantEntity.getTenantId() + "/" + fileName; + return fileName; + } + /** * 上传文件 * @@ -49,6 +55,8 @@ public class UploadController extends BaseController { public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload"); + TenantEntity tenantEntity = getTenantInfo(); + ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(multiReq.getSize()); @@ -56,13 +64,14 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } System.out.println(fileName); - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); + ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantInfo()); return data; } @@ -77,63 +86,64 @@ public class UploadController extends BaseController { @PostMapping(value = "/awsImgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传图片") @SystemControllerLog(description = "上传图片") - public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) { + public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload"); + TenantEntity tenantEntity = getTenantInfo(); + long size = multiReq.getSize(); final long length = 2097152; if (size > length) { return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED); } String fileName = UUID.randomUUID().toString(); - String tempFileName = fileName; + String tempFileName = fileName; String fileFormat = ""; int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getTenantId() + "/" + fileName + fileFormat; + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } - System.out.println(fileName); try { - FileOutputStream fos = null; - String imgFormat = ImgUtil.getImgFormat(fileFormat); - if (StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; - String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; - BufferedInputStream fs = null; - File localFile = new File(localImgFileName); - fos = new FileOutputStream(localFile); - fs = (BufferedInputStream) multiReq.getInputStream(); - byte[] buffer = new byte[1024]; - int len = 0; - while ((len = fs.read(buffer)) != -1) { - fos.write(buffer, 0, len); - } - fos.close(); - fs.close(); - logger.info("local file: " + localImgFileName); - File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); - logger.info("local new file: " + localNewImgFileName); - // 删除本地缓存 - localFile.delete(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(newFile.length()); - ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, getTenantId()); - // 删除本地缓存 - newFile.delete(); - return data; - } else { - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(size); - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); - return data; - } + FileOutputStream fos = null; + String imgFormat = ImgUtil.getImgFormat(fileFormat); + if(StringUtils.isNotBlank(imgFormat)) { + String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; + String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; + BufferedInputStream fs = null; + File localFile = new File(localImgFileName); + fos = new FileOutputStream(localFile); + fs = (BufferedInputStream) multiReq.getInputStream(); + byte[] buffer = new byte[1024]; + int len = 0; + while ((len = fs.read(buffer)) != -1) { + fos.write(buffer, 0, len); + } + fos.close(); + fs.close(); + logger.info("local file: " + localImgFileName); + File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); + logger.info("local new file: " + localNewImgFileName); + // 删除本地缓存 + localFile.delete(); + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(multiReq.getContentType()); + metadata.setContentLength(newFile.length()); + ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); + // 删除本地缓存 + newFile.delete(); + return data; + } else { + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(multiReq.getContentType()); + metadata.setContentLength(size); + ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + return data; + } } catch (Exception e) { logger.error(e.getMessage()); return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); @@ -150,13 +160,14 @@ public class UploadController extends BaseController { @PostMapping(value = "/awsFilesUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("多文件上传") @SystemControllerLog(description = "多文件上传") - public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception { + public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload"); + TenantEntity tenantEntity = getTenantInfo(); - if (files.length > 0) { + if(files.length > 0){ ResultData data = new ResultData(); - List> dataList = new ArrayList>(); - for (MultipartFile multipartFile : files) { + List> dataList = new ArrayList>(); + for(MultipartFile multipartFile: files) { Map map = new HashMap<>(); ObjectMetadata metadata = new ObjectMetadata(); @@ -171,14 +182,15 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = getTenantId() + "/" + fileName + multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length());; + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } - ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantId()); - if (data1.code == ResultData.SUCCESS) { - Map _data = (Map) data1.data; + ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantInfo()); + if(data1.code == ResultData.SUCCESS) { + Map _data = (Map)data1.data; map.put("url", (String) _data.get("url")); dataList.add(map); } else { @@ -205,7 +217,7 @@ public class UploadController extends BaseController { */ @PostMapping(value = "/cimgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("内部接口-C端上传图片文件") - public ResultData cimgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { + public ResultData cimgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); ObjectMetadata metadata = new ObjectMetadata(); @@ -214,7 +226,9 @@ public class UploadController extends BaseController { String fileName = multiReq.getOriginalFilename(); fileName = "cimg/" + fileName; - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, "cimg"); + ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ + setTenantId("cimg"); + }}); return data; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index bbf3a1957..6d67cd177 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -157,7 +157,7 @@ public class WechatLoginController extends BaseController { response.addCookie(unameCookie); MallUserAction action = new MallUserAction(); - action.setTenantId(info.getTenantId()); + action.updateTenantInfo(info); action.setType(EnumMallUserAction.CONTROLLER.getCode()); action.setIp(ipaddress); action.setUserId(info.getId()); @@ -292,7 +292,7 @@ public class WechatLoginController extends BaseController { response.addCookie(unameCookie); MallUserAction action = new MallUserAction(); - action.setTenantId(info.getTenantId()); + action.updateTenantInfo(info); action.setType(EnumMallUserAction.CONTROLLER.getCode()); action.setIp(ipaddress); action.setUserId(info.getId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index 34528e993..68e9ca110 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -1,13 +1,9 @@ package com.iformall.controller.sys; -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAdminLog; import com.iformall.service.WxAdminLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,8 +22,7 @@ public class WxAdminLogController extends BaseController { @PostMapping("pvlog") public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); - String tenantId = getTenantId(); - wxAdminLog.setTenantId(tenantId); + wxAdminLog.updateTenantInfo(getTenantInfo()); wxAdminLogService.saveLogCount(wxAdminLog); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index f6403e7be..68d24c571 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -3,6 +3,7 @@ package com.iformall.controller.sys; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxSubBusiness; import com.iformall.domain.vo.WxBusinessDataVo; @@ -42,7 +43,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantId(),null); + final List busList = wxBusinessService.findListAll(getTenantInfo(),null); return new ResultData(busList); } @@ -60,7 +61,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态分析接口") public ResultData businessDataList(@ModelAttribute WxBusiness wxBusiness) throws Exception{ logger.debug("[" + getIpAddr() + "] WxBusinessController::businessDataList"); - wxBusiness.setTenantId(getTenantId()); + wxBusiness.updateTenantInfo(getTenantInfo()); if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); Date eDate = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); @@ -98,7 +99,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "导出业态数据列表") public void exportBusinessDataList(@ModelAttribute WxBusiness wxBusiness, HttpServletResponse response) throws Exception{ logger.debug("[" + getIpAddr() + "] WxBusinessController::exportBusinessDataList"); - wxBusiness.setTenantId(getTenantId()); + wxBusiness.updateTenantInfo(getTenantInfo()); if(wxBusiness.getStartdate() == null || wxBusiness.getEnddate() == null){ Date sDate = DateUtils.getFirstDayForCurrMonth(DateUtils.getLastMonthToDay()); Date eDate = DateUtils.getLastDayForMonth(DateUtils.getLastMonthToDay()); @@ -161,7 +162,7 @@ public class WxBusinessController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); - wxBusiness.setTenantId(getTenantId()); + wxBusiness.updateTenantInfo(getTenantInfo()); return new ResultData(wxBusinessService.devoteList(wxBusiness,pageNum,pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java index e322b5f09..b7bfe4e25 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/template/WxImportTemplateController.java @@ -67,7 +67,6 @@ public class WxImportTemplateController extends BaseController { final MallUserInfo user = getUser(); String userId = typeStr + "_" + user.getId(); String importKey = Constant.importMemPrev + userId; - final String tenantId = getTenantId(); //查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 Boolean allCount = stringRedisTemplate.opsForHash().hasKey(importKey, "allCount"); @@ -135,13 +134,13 @@ public class WxImportTemplateController extends BaseController { } } if (type.equals(EnumImportType.MEMBER.getCode())) { - importTemplateTask.importMemberData(lFile, user, importKey, tenantId); + importTemplateTask.importMemberData(lFile, user, importKey); } else if (type.equals(EnumImportType.SHOP_RENT.getCode()) || type.equals(EnumImportType.POINT_RENT.getCode()) || type.equals(EnumImportType.SHOP_PROPERTY.getCode()) || type.equals(EnumImportType.POINT_PROPERTY.getCode())) { - importTemplateTask.importBillData(lFile, user, importKey, tenantId); + importTemplateTask.importBillData(lFile, user, importKey); } else if (type.equals(EnumImportType.DAILY.getCode()) || type.equals(EnumImportType.OTHER.getCode()) || type.equals(EnumImportType.OTHER_DEPOSIT.getCode())) { - importTemplateTask.importBillDataOther(lFile, user, importKey, tenantId); + importTemplateTask.importBillDataOther(lFile, user, importKey); } return new ResultData(Result.SUCCESS, "模板正在导入"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index c142822aa..3627eabd5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -4,10 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxFlowConfig; -import com.iformall.domain.po.WxFlowModel; -import com.iformall.domain.po.WxFlowRecord; +import com.iformall.domain.po.*; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; @@ -37,7 +34,7 @@ public class WxFlowAbleController extends BaseController { public ResultData start(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] FlowAbleController::start"); MallUserInfo user = getUser(); - return wxFlowService.start(params, user.getId(),user.getName(),user.getTenantId()); + return wxFlowService.start(params, user.getId(),user.getName(),user); } /** @@ -53,7 +50,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-用户代办列表") public ResultData list(String flowType,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] FlowAbleController::list"); - return wxFlowService.list(flowType,pageNum,pageSize,getUserId(),getTenantId()); + return wxFlowService.list(flowType,pageNum,pageSize,getUserId(),getTenantInfo()); } /** @@ -64,7 +61,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-待办总数") public ResultData getTotal() { logger.debug("[" + getIpAddr() + "] FlowAbleController::getTotal"); - return wxFlowService.getTotal(getUserId(), getTenantId()); + return wxFlowService.getTotal(getUserId(), getTenantInfo()); } /** @@ -127,7 +124,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-审批历史") public ResultData applyHistory(Long businessId) { logger.debug("[" + getIpAddr() + "] FlowAbleController::applyHistory"); - return wxFlowService.applyHistory(businessId,super.getTenantId()); + return wxFlowService.applyHistory(businessId,getTenantInfo()); } /** @@ -141,7 +138,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-审批历史和代办") public ResultData applyHistoryAndAssignee(Long businessId) { logger.debug("[" + getIpAddr() + "] FlowAbleController::applyHistoryAndAssignee"); - return wxFlowService.getTaskStatusList(businessId,super.getTenantId()); + return wxFlowService.getTaskStatusList(businessId,getTenantInfo()); } /** @@ -151,7 +148,7 @@ public class WxFlowAbleController extends BaseController { @PostMapping(value = "apply") public ResultData apply(@RequestBody Map params) { MallUserInfo user = getUser(); - return wxFlowService.apply(params,user.getId(),user.getName(),user.getTenantId()); + return wxFlowService.apply(params,user.getId(),user.getName(),user); } /** @@ -162,7 +159,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-驳回") public ResultData reject(@RequestBody Map params) { MallUserInfo user = getUser(); - return wxFlowService.reject(params,user.getId(),user.getName(),user.getPhone(),user.getTenantId()); + return wxFlowService.reject(params,user.getId(),user.getName(),user.getPhone(),user); } @@ -185,7 +182,7 @@ public class WxFlowAbleController extends BaseController { @PostMapping(value = "createModel") @SystemControllerLog(description = "工作流-创建模板") public ResultData createModel(@RequestBody WxFlowModel wxFlowModel) { - wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.updateTenantInfo(getTenantInfo()); wxFlowModel.setCreateUser(getUserId()); return wxFlowService.createModel(wxFlowModel); } @@ -197,7 +194,7 @@ public class WxFlowAbleController extends BaseController { @GetMapping(value = "findModelById") @SystemControllerLog(description = "工作流-根据id查询模板") public ResultData findById(@ModelAttribute WxFlowModel wxFlowModel){ - wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.updateTenantInfo(getTenantInfo()); return wxFlowService.findModelById(wxFlowModel); } @@ -208,7 +205,7 @@ public class WxFlowAbleController extends BaseController { @PostMapping(value = "delModel") @SystemControllerLog(description = "工作流-删除模板") public ResultData delModel(@RequestBody WxFlowModel wxFlowModel) { - wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.updateTenantInfo(getTenantInfo()); return wxFlowService.delModel(wxFlowModel); } @@ -224,7 +221,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-模板列表") public ResultData modelList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); - wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.updateTenantInfo(getTenantInfo()); return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); } @@ -236,11 +233,10 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-模板列表") public ResultData getModelBybusiness(@ModelAttribute WxFlowModel wxFlowModel) { logger.debug("[" + getIpAddr() + "] FlowAbleController::getModelBybusiness"); - wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.updateTenantInfo(getTenantInfo()); return new ResultData(wxFlowService.getModelBybusiness(wxFlowModel)); } - /** * 配置列表 */ @@ -253,7 +249,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-配置列表") public ResultData configList(@ModelAttribute WxFlowConfig wxFlowConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); - wxFlowConfig.setTenantId(getTenantId()); + wxFlowConfig.updateTenantInfo(getTenantInfo()); if(pageSize == null){ pageSize = Integer.MAX_VALUE; } @@ -286,7 +282,7 @@ public class WxFlowAbleController extends BaseController { @PostMapping(value = "updateConfig") @SystemControllerLog(description = "工作流-类型设置") public ResultData updateConfig(@RequestBody WxFlowConfig wxFlowConfig) { - wxFlowConfig.setTenantId(getTenantId()); + wxFlowConfig.updateTenantInfo(getTenantInfo()); return wxFlowService.updateConfig(wxFlowConfig); } diff --git a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java index a822318de..465889699 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/SystemLogAspect.java @@ -61,7 +61,7 @@ public class SystemLogAspect { " ip:" + ipaddress); MallUserAction action = new MallUserAction(); - action.setTenantId(user.getTenantId()); + action.updateTenantInfo(user); action.setType(EnumMallUserAction.CONTROLLER.getCode()); action.setIp(ipaddress); action.setUserId(user.getId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 08a21b654..dcb6d548d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -13,11 +13,14 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.MallResourceService; import com.iformall.shiro.UserSession; import com.iformall.ueditor.define.BaseState; import com.iformall.ueditor.define.State; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.session.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; @@ -38,6 +41,11 @@ public class Uploader { private MallResourceService mallResourceService = null; private AmazonS3 s3 = null; + private String getFileName(TenantEntity tenantEntity, String fileName) { + fileName = tenantEntity.getTenantId() + "/" + fileName; + return fileName; + } + public Uploader(HttpServletRequest request, Map conf, MallResourceService mallResourceService) { this.request = request; this.conf = conf; @@ -67,14 +75,22 @@ public class Uploader { this.conf); } else { MultipartFile multiReq= ((MultipartHttpServletRequest) this.request).getFile("upfile"); - String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); + Session session = SecurityUtils.getSubject().getSession(); + String tenantId = (String)session.getAttribute(UserSession.tenantId); + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + }}; + if (StringUtils.isBlank(tenantId)) { + logger.error("TENANT is null"); + } String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = tenantId + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = tenantId + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } state = state = new BaseState(true); @@ -97,7 +113,7 @@ public class Uploader { state.putInfo("url", url.toString()); MallResource mr = new MallResource(); - mr.setTenantId(tenantId); + mr.updateTenantInfo(tenantEntity); mr.setBucket(conf.get("bucketName").toString()); mr.setS3Key(fileName); mr.setUrl(url.toString()); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql index eee489e89..9aaa8baa5 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201910231900__W_INVEST_CREATE.sql @@ -124,4 +124,4 @@ CREATE TABLE `wx_logic_permission` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='逻辑权限表'; -ALTER TABLE `mall_user_info` ADD COLUMN `invest_rule` tinyint(2) NOT NULL DEFAULT -1 COMMENT '招商用户角色:0-招商管理人员;1-招商人员' AFTER `is_admin`; +ALTER TABLE `mall_user_info` ADD COLUMN `invest_rule` tinyint(2) NOT NULL DEFAULT -1 COMMENT '招商用户角色:-1-无;0-招商管理人员;1-招商人员' AFTER `is_admin`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql b/mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql new file mode 100644 index 000000000..1fdcd40bf --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_order` +CHANGE COLUMN `real_payment` `total_payment` int(11) NULL COMMENT '总计支付金额'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201911051100__W_INVEST_RULE.sql b/mallinkAdmin/src/main/resources/db/migration/V201911051100__W_INVEST_RULE.sql new file mode 100644 index 000000000..b3f73e079 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201911051100__W_INVEST_RULE.sql @@ -0,0 +1 @@ +UPDATE `mall_user_info` SET `invest_rule`=0 WHERE `is_admin`=1 ; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index c4927eb1c..97f813619 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -105,10 +105,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); - } - public WxAppinfo getAppInfo(String appId) { return wxAppinfoService.getByAppId(appId); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java index 7dfe63744..e2dad71ac 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java @@ -63,7 +63,7 @@ public class PosOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); } - posOrder.setTenantId(user.getTenantId()); + posOrder.updateTenantInfo(user); posOrder.setBuUserId(user.getId()); posOrderService.saveOrUpdate(posOrder); return new ResultData(posOrder); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index 21da254e0..80cea64f7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -14,6 +14,7 @@ import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.MallResourceService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; @@ -51,7 +52,12 @@ public class UploadController extends BaseController { private AmazonS3 s3 = null; - private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId) { + private String getFileName(TenantEntity tenantEntity, String fileName) { + fileName = tenantEntity.getTenantId() + "/" + fileName; + return fileName; + } + + private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { ResultData data = new ResultData(); try { if (s3 == null) { @@ -78,7 +84,7 @@ public class UploadController extends BaseController { logger.info(url.toString()); MallResource mr = new MallResource(); - mr.setTenantId(tenantId); + mr.updateTenantInfo(tenantEntity); mr.setBucket(awsProperty.getBucketName()); mr.setS3Key(fileName); mr.setUrl(url.toString()); @@ -128,6 +134,8 @@ public class UploadController extends BaseController { public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload"); + TenantEntity tenantEntity = getTenantInfo(); + ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(multiReq.getSize()); @@ -138,17 +146,16 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); + ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); return data; } - - /** * 图片上传 * @@ -161,6 +168,8 @@ public class UploadController extends BaseController { public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload"); + TenantEntity tenantEntity = getTenantInfo(); + String fileName = UUID.randomUUID().toString(); String tempFileName = fileName; String fileFormat = ""; @@ -168,9 +177,9 @@ public class UploadController extends BaseController { int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getTenantId() + "/" + fileName + fileFormat; + fileName = getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + fileName = getFileName(tenantEntity, fileName); } System.out.println(fileName); @@ -199,7 +208,7 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(newFile.length()); - ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, getTenantId()); + ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); // 删除本地缓存 newFile.delete(); return data; @@ -207,7 +216,7 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(multiReq.getSize()); - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); + ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); return data; } } @@ -224,6 +233,8 @@ public class UploadController extends BaseController { public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception { logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload"); + TenantEntity tenantEntity = getTenantInfo(); + if (files.length > 0) { ResultData data = new ResultData(); List> dataList = new ArrayList>(); @@ -242,12 +253,13 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { - fileName = getTenantId() + "/" + fileName + multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + getFileName(tenantEntity, fileName + fileFormat); } else { - fileName = getTenantId() + "/" + fileName; + getFileName(tenantEntity, fileName); } - ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantId()); + ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); if (data1.code == ResultData.SUCCESS) { Map _data = (Map) data1.data; map.put("url", (String) _data.get("url")); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 28d2415da..51de154a3 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -8,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCUserFromBDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; @@ -94,9 +95,8 @@ public class WxCUserController extends BaseController { if (wxCUserFromB == null) { //TODO phone可能为空 String phone = wxCUser.getPhone(); - String tenantId = wxCUser.getTenantId(); //查询会员信息 - List byPhone = wxCUserBasicInfoService.findByPhone(tenantId, phone); + List byPhone = wxCUserBasicInfoService.findByPhone(bUser, phone); //存在会员信息 if (!byPhone.isEmpty()) { //更新会员信息 @@ -126,7 +126,7 @@ public class WxCUserController extends BaseController { wxCUserFromB.setCUserId(wxCUserBasicInfo.getId()); wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); wxCUserFromB.setMerchantId(bUser.getMerchantId()); - wxCUserFromB.setTenantId(bUser.getTenantId()); + wxCUserFromB.updateTenantInfo(bUser); wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); wxCUserFromBService.saveOrUpdate(wxCUserFromB); @@ -156,7 +156,7 @@ public class WxCUserController extends BaseController { wxCUserFromB.setCUserId(cUserId); wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); wxCUserFromB.setMerchantId(bUser.getMerchantId()); - wxCUserFromB.setTenantId(bUser.getTenantId()); + wxCUserFromB.updateTenantInfo(bUser); wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); wxCUserFromBService.saveOrUpdate(wxCUserFromB); @@ -191,7 +191,7 @@ public class WxCUserController extends BaseController { private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType, Long userId) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); - wxCreditHistory.setTenantId(getTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 04c569770..b2f610324 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -48,7 +48,7 @@ public class WxCardPayController extends BaseController { logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpendVo.toString()); if (wxCardSpendVo == null) wxCardSpendVo = new WxCardSpendVo(); WxMerchantBUser user = getUser(); - wxCardSpendVo.setTenantId(user.getTenantId()); + wxCardSpendVo.updateTenantInfo(user); wxCardSpendVo.setMerchantId(user.getMerchantId()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); @@ -61,7 +61,7 @@ public class WxCardPayController extends BaseController { logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); WxMerchantBUser user = getUser(); - wxCardSpend.setTenantId(user.getTenantId()); + wxCardSpend.updateTenantInfo(user); wxCardSpend.setMerchantId(user.getMerchantId()); final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); return new ResultData(mapList); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index a63671f58..fb9a68b46 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -183,7 +183,7 @@ public class WxCouponOrderController extends BaseController { } if(couponOrder != null) { - wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder.getTenantId(), couponOrderId, wxMerchantBUser.getId()); + wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder, couponOrderId, wxMerchantBUser.getId()); } return new ResultData(couponOrder); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 5b67dbcd7..b2f39fc5a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -52,7 +52,7 @@ public class WxCouponSendController extends BaseController { if (Objects.isNull(wxCouponSend.getSendType())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - wxCouponSend.setTenantId(getTenantId()); + wxCouponSend.updateTenantInfo(getTenantInfo()); wxCouponSend.setMerchantId(getUser().getMerchantId()); if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { wxCouponSend.setMerchantRemain(0); @@ -65,7 +65,7 @@ public class WxCouponSendController extends BaseController { final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); for (WxCouponSendVo cs : page.getList()) { - cs.setSendCount(wxCouponActionLogService.getCountByChannelId(getTenantId(), cs.getSendType(), cs.getId())); + cs.setSendCount(wxCouponActionLogService.getCountByChannelId(getTenantInfo(), cs.getSendType(), cs.getId())); } return new ResultData(page); } @@ -95,7 +95,7 @@ public class WxCouponSendController extends BaseController { WxCouponSend wxCouponSend = new WxCouponSend(); wxCouponSend.setIds(wxCouponSendIds.stream().map(Long::parseLong).collect(Collectors.toList())); - wxCouponSend.setTenantId(getTenantId()); + wxCouponSend.updateTenantInfo(getTenantInfo()); wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); try { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index af4ad3bb8..40175abdb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -69,7 +69,7 @@ public class WxCreditHistoryController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } try { - Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantId()); + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo()); return new ResultData(result); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); @@ -83,7 +83,7 @@ public class WxCreditHistoryController extends BaseController { @ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true) public ResultData findByPhone(String phone) { log.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findByPhone"); - List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); + List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantInfo(),phone); WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { wxCUserBasicInfo = wxCUserBasicInfoList.get(0); @@ -97,7 +97,7 @@ public class WxCreditHistoryController extends BaseController { @PostMapping("/add") public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); - wxCreditHistory.setTenantId(getTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); wxCreditHistory.setOperatorId(getUser().getId()); WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setId(getUser().getMerchantId()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java index 41a322500..80f9ffc7e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java @@ -56,7 +56,7 @@ public class WxDateAmountRecordController extends BaseController { WxDateAmountRecord temp = new WxDateAmountRecord(); WxMerchantBUser u = getUser(); - temp.setTenantId(u.getTenantId()); + temp.updateTenantInfo(u); temp.setMerchantId(u.getMerchantId()); temp.setType(dateAmtType); temp.setSortColumns(BaseEntity.SortField.Date_DESC); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 8ea879603..0c2edf9d5 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -11,6 +11,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumMallUserStatus; import com.iformall.exception.MallinkException; import com.iformall.service.*; @@ -140,7 +141,7 @@ public class WxInfoController extends BaseController { String ipaddress = IPUtil.getIpAddr(request); WxBuser newUser = new WxBuser(); - newUser.setTenantId(wxAuthorizerInfo.getTenantId()); + newUser.updateTenantInfo(wxAuthorizerInfo); newUser.setAppId(appId); newUser.setOpenId(openId); if (boolHaveUnionId) { @@ -151,7 +152,7 @@ public class WxInfoController extends BaseController { if (boolHaveUnionId) { // 优先根据unionId查询 WxBuser userQ = new WxBuser(); - userQ.setTenantId(wxAuthorizerInfo.getTenantId()); + userQ.updateTenantInfo(wxAuthorizerInfo); userQ.setUnionId(unionId); oldUser = wxBuserService.getByObject(userQ); } @@ -184,7 +185,7 @@ public class WxInfoController extends BaseController { wxBuserTokenService.saveOrUpdate(oldUser); } else { // 新用户 - newUser.setTenantId(wxAuthorizerInfo.getTenantId()); + newUser.updateTenantInfo(wxAuthorizerInfo); token = newUser.createToken(new Date()); newUser.setRegisterIp(ipaddress); newUser.setSessionKey(session_key); @@ -218,10 +219,13 @@ public class WxInfoController extends BaseController { } WxAppinfo wxAppinfo = getAppInfo(appId); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(wxAppinfo.getTenantId()); + }}; try { Map retMap = getOpenIdInfo(appId, code); String openId = retMap.get("openId"); - MallUserInfo user = mallUserInfoService.getByBOpenId(openId, wxAppinfo.getTenantId()); + MallUserInfo user = mallUserInfoService.getByBOpenId(openId, tenantEntity); if(user == null) { return new ResultData(ErrorCode.USER_NO_PERMISSION, retMap); } @@ -325,6 +329,9 @@ public class WxInfoController extends BaseController { WxMaService wxMaService = getWeappService(appId); WxAppinfo wxAppinfo = getAppInfo(appId); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(wxAppinfo.getTenantId()); + }}; try { // 解密 WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv); @@ -333,7 +340,7 @@ public class WxInfoController extends BaseController { String phone = phoneNoInfo.getPhoneNumber(); resultMap.put("phone", phone); - MallUserInfo user = mallUserInfoService.getByPhone(phone, wxAppinfo.getTenantId()); + MallUserInfo user = mallUserInfoService.getByPhone(phone, tenantEntity); if(user == null) { return new ResultData(ErrorCode.USER_NO_PERMISSION, resultMap); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 536a86ffa..47a356477 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -77,7 +77,7 @@ public class WxMerchantBUserController extends BaseController { } resultMap.put("creditLocked", merchant.getCreditLocked()); - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user.getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user); if (scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) { resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode()); } @@ -213,7 +213,7 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "密码不能为空"); } - return wxMerchantBUserService.updatepwd(appId, phone, code, pwd); + return wxMerchantBUserService.updatePwd(appId, phone, code, pwd); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index 7b9b79baf..c9341e365 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -33,7 +33,7 @@ public class WxMerchantController extends BaseController { @GetMapping("/name_list") public ResultData nameList() { log.debug("[" + getIpAddr() + "] WxMerchantController::name_list"); - return new ResultData(wxMerchantService.findList(getTenantId())); + return new ResultData(wxMerchantService.findList(getTenantInfo())); } @ApiOperation("查询账户信息") @@ -44,7 +44,7 @@ public class WxMerchantController extends BaseController { if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); } - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return new ResultData(wxProfitSharingReceiverService.findReceiver(wxMerchant)); } @@ -70,7 +70,7 @@ public class WxMerchantController extends BaseController { if (StringUtils.isEmpty(wxMerchant.getAccountName())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空"); } - wxMerchant.setTenantId(getTenantId()); + wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantAccount(wxMerchant); } @@ -85,7 +85,7 @@ public class WxMerchantController extends BaseController { if (receiver.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); } - receiver.setTenantId(getTenantId()); + receiver.updateTenantInfo(getTenantInfo()); return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode()); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index d5ea4ee60..d942e80d2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -34,7 +34,7 @@ public class WxMerchantSubsidyController extends BaseController { logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); WxMerchantBUser user = getUser(); - wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.updateTenantInfo(user); wxMerchantSubsidy.setMerchantId(user.getMerchantId()); List> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); return new ResultData(retMap); @@ -50,7 +50,7 @@ public class WxMerchantSubsidyController extends BaseController { logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); WxMerchantBUser user = getUser(); - wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.updateTenantInfo(user); wxMerchantSubsidy.setMerchantId(user.getMerchantId()); final PageInfo page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); return new ResultData(page); @@ -64,7 +64,7 @@ public class WxMerchantSubsidyController extends BaseController { wxMerchantSubsidy = new WxMerchantSubsidyVo(); } WxMerchantBUser user = getUser(); - wxMerchantSubsidy.setTenantId(user.getTenantId()); + wxMerchantSubsidy.updateTenantInfo(user); wxMerchantSubsidy.setMerchantId(user.getMerchantId()); Map data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); return new ResultData(data); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index de77872a7..ba175ebc0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -38,7 +38,7 @@ public class WxMerchantTradeDailyController extends BaseController { @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") @GetMapping("/getVolume") public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { - wxMerchantTradeDaily.setTenantId(getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId()); } @@ -64,8 +64,7 @@ public class WxMerchantTradeDailyController extends BaseController { @GetMapping("findById") public ResultData findById(WxMerchantTradeDaily wxMerchantTradeDaily) { logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::findById"); - String tenantId = getTenantId(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); return new ResultData(wxMerchantTradeDailyService.getById(wxMerchantTradeDaily.getId())); } @@ -78,7 +77,7 @@ public class WxMerchantTradeDailyController extends BaseController { @PostMapping("saveOrUpdate") public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); - wxMerchantTradeDaily.setTenantId(super.getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); if(wxMerchantTradeDaily.getTradeAmt()!= null){ wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +""); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 43afdc9b3..374f9e05c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -100,7 +100,7 @@ public class WxMicroPayController extends BaseController { } WxPayOrder record = new WxPayOrder(); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(user); record.setOrderId(order.getId()); record.setAuthCode(authCode); record.setPayAmount(order.getPayment()); @@ -153,7 +153,7 @@ public class WxMicroPayController extends BaseController { } WxPayOrder record = new WxPayOrder(); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(user); record.setId(payOrderId); record.setBUserId(user.getId()); record.setOrderId(orderId); @@ -204,7 +204,7 @@ public class WxMicroPayController extends BaseController { } WxPayOrder record = new WxPayOrder(); - record.setTenantId(getTenantId()); + record.updateTenantInfo(getTenantInfo()); record.setId(payOrderId); record.setPayOrderNo(payOrderIdStr); record.setBUserId(getUser().getId()); @@ -307,7 +307,7 @@ public class WxMicroPayController extends BaseController { cUser = wxCUserService.getById(cUserId); } else { WxCUser userQ = new WxCUser(); - userQ.setTenantId(user.getTenantId()); + userQ.updateTenantInfo(user); userQ.setPhone(phone); cUser = wxCUserService.getByObject(userQ); } @@ -411,10 +411,17 @@ public class WxMicroPayController extends BaseController { } wxCouponOrder = wxCouponOrderService.getById(couponOrderId); } + WxPayOrder couponPayOrder = null; Integer remainPrice = payPrice; if (wxCouponOrder != null) { try { - remainPrice = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice); + couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice); + remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); + // 更新实际支付金额 + WxOrder updateOrder = new WxOrder(); + updateOrder.setId(microOrder.getId()); + updateOrder.setPayment(remainPrice); + wxOrderService.saveOrUpdate(updateOrder); } catch (MallinkException e) { logger.error("核销异常: " + e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); @@ -431,7 +438,7 @@ public class WxMicroPayController extends BaseController { } WxPayOrder record = new WxPayOrder(); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(user); record.setOrderId(microOrder.getId()); record.setCUserId(microOrder.getCUserId()); record.setAuthCode(authCode); @@ -449,22 +456,17 @@ public class WxMicroPayController extends BaseController { } } else { // 支付完成 - WxPayOrder record = new WxPayOrder(); - record.setTenantId(user.getTenantId()); - record.setOrderId(microOrder.getId()); - record.setCUserId(microOrder.getCUserId()); - record.setPayAmount(remainPrice); - record.setIp(ipStr); + couponPayOrder.setIp(ipStr); try { - wxPayOrderService.handleMicroOrderPaySuccessForVerify(user, record); + wxPayOrderService.handleMicroOrderPaySuccessForVerify(user, couponPayOrder); Map map = new HashMap(); map.put("end", "1"); return new ResultData(map); } catch (MallinkException e) { - logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); + logger.error("payment wechat, order create error, req 2: " + couponPayOrder.toString() + ", e:" + e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage()); + logger.error("payment wechat, order create error, req 3: " + couponPayOrder.toString() + ", e:" + e.getMessage()); return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index c9f179255..599e2bad8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; @@ -66,7 +67,7 @@ public class WxMsgValidationcodeController extends BaseController { } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(user); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode()); wxMsgValidationcode.setAppid(appid); @@ -82,7 +83,9 @@ public class WxMsgValidationcodeController extends BaseController { @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) public ResultData hasvalidationcode(String tenantId, String phone, Integer type, String code, String appid) { WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode()); wxMsgValidationcode.setCode(code); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java index 0f8272b6f..873bf5e86 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java @@ -76,7 +76,7 @@ public class WxPayBillController extends BaseController { record.setBillId(billId); record.setOpenId(openid); record.setbUserId(bUserId); - record.setTenantId(appInfo.getTenantId()); + record.updateTenantInfo(getTenantInfo()); try { record.setIp(IPUtil.getIpAddr(request)); return wxPayBillService.createPayBill(appInfo, record, EnumPayWay.PAY_WAY_WECHAT); diff --git a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java index 053f58d4b..b60428246 100644 --- a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java +++ b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java @@ -9,6 +9,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.PosOrder; import com.iformall.domain.po.PosPayOrder; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; @@ -287,7 +288,7 @@ public class PosBrunService { // 1. 创建支付订单 Date curDate = new Date(); PosPayOrder posPayOrder = new PosPayOrder(); - posPayOrder.setTenantId(user.getTenantId()); + posPayOrder.updateTenantInfo(user); posPayOrder.setCreateTime(curDate); posPayOrder.setUpdateTime(curDate); posPayOrder.setOrderId(posOrderId); @@ -462,7 +463,7 @@ public class PosBrunService { public ResultData posVerifyIndepent(WxMerchantBUser user, String couponOrderId, String payment) { // 1. 创建 POS订单 PosOrder posOrder = new PosOrder(); - posOrder.setTenantId(user.getTenantId()); + posOrder.updateTenantInfo(user); posOrder.setType(EnumPosOrderType.VERIFY_INDEPENDENT.getCode()); posOrder.setBuUserId(user.getId()); posOrder.setOrderStatus(EnumPosOrderStatus.PENDING_VERIFY.getCode()); @@ -482,7 +483,7 @@ public class PosBrunService { // 2. 创建 POS支付订单 Date curDate = new Date(); PosPayOrder posPayOrder = new PosPayOrder(); - posPayOrder.setTenantId(user.getTenantId()); + posPayOrder.updateTenantInfo(user); posPayOrder.setBuUserId(user.getId()); posPayOrder.setOrderId(posOrder.getId()); posPayOrder.setType(EnumPosPayType.PAY_VERIFY_INDEPENT.getCode()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 2a1153cf7..9d03c2877 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -85,10 +85,6 @@ public class BaseController { return tenantEntity; } - public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); - } - public Long getUserId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); @@ -136,6 +132,7 @@ public class BaseController { public void saveToBasicInfo(WxCUser user) { + TenantEntity tenantEntity = getTenantInfo(); String phone = user.getPhone(); if (phone != null && phone.contains("*")) { phone = user.getVerifyCodePhone(); @@ -143,7 +140,7 @@ public class BaseController { if (StringUtils.isBlank(phone)) return; - List list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); + List list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); if (list.size() > 0) { WxCUserBasicInfo basicInfo = list.get(0); // 微信名称,统一成微信昵称 @@ -167,7 +164,7 @@ public class BaseController { Date cur = new Date(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); basicInfo.setId(user.getId()); - basicInfo.setTenantId(user.getTenantId()); + basicInfo.updateTenantInfo(tenantEntity); basicInfo.setPhone(phone); basicInfo.setNickName(user.getNickName()); basicInfo.setSex(user.getGender()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index 1889c569f..bb8365ac1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -43,7 +43,7 @@ public class WxActivityJoinController extends BaseController { public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); wxActivityJoin.setUserId(getUserId()); - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC); final PageInfo page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); return new ResultData(page); @@ -55,7 +55,7 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getActivityId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); wxActivityJoin.setUserId(getUserId()); wxActivityJoin.setNickName(getUser().getNickName()); if (StringUtils.isNotEmpty(wxActivityJoin.getAnswer())) { @@ -77,7 +77,7 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getActivityId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.updateTenantInfo(getTenantInfo()); wxActivityJoin.setUserId(getUserId()); return wxActivityJoinService.sign(wxActivityJoin); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index b12994fac..d82b02018 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -29,7 +29,7 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态全列表接口") @GetMapping("listAll") public ResultData listAll(Integer filter) { - return new ResultData(wxBusinessService.findListAll(getTenantId(),filter)); + return new ResultData(wxBusinessService.findListAll(getTenantInfo(),filter)); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 14c8f8af3..afc5dd872 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -47,7 +47,7 @@ public class WxCampaignController extends BaseController { if (null == wxCampaign) wxCampaign = new WxCampaign(); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - wxCampaign.setTenantId(getTenantId()); + wxCampaign.updateTenantInfo(getTenantInfo()); wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC); final PageInfo page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); @@ -60,7 +60,7 @@ public class WxCampaignController extends BaseController { WxCampaign wxCampaign = wxCampaignService.getById(id); if (wxCampaign != null) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(0); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 29bc0ef41..e7f88e6bd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -8,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponOrderCarCVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; @@ -69,9 +70,9 @@ public class WxCarController extends BaseController { @Autowired WxCreditHistoryService wxCreditHistoryService; - private WxPark getCurrentPark(String tenantId) { + private WxPark getCurrentPark(TenantEntity tenantEntity) { WxPark parkQ = new WxPark(); - parkQ.setTenantId(tenantId); + parkQ.updateTenantInfo(tenantEntity); WxPark wxPark = wxParkService.getByObj(parkQ); // 1, get mall's park // future use redis to optimize @@ -82,7 +83,7 @@ public class WxCarController extends BaseController { @GetMapping("/getVendor") public ResultData getVendor() { // 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); Map map = new HashMap(); map.put("vendor", park.getVendorType()); return new ResultData(map); @@ -99,7 +100,7 @@ public class WxCarController extends BaseController { public ResultData init(@RequestBody Map paramMap) { WxCUser user = getUser(); // 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); // 2. get vendor params if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { return initForEtcp(paramMap, user, park); @@ -150,7 +151,7 @@ public class WxCarController extends BaseController { dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); String etcpToken = dataObj.getString("token"); try { - JSONObject dataObj1 = etcpSyncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), + JSONObject dataObj1 = etcpSyncCarNumbers(park, user.getId(), park.getVendorType(), url, merchantNo, merchantKey, version, etcpToken); } catch (MallinkException e) { @@ -167,8 +168,8 @@ public class WxCarController extends BaseController { /** * ETCP同步 * + * @param tenantEntity * @param cUserId - * @param tenantId * @param iVendorType * @param url * @param merchantNo @@ -177,7 +178,7 @@ public class WxCarController extends BaseController { * @param etcpToken * @return */ - private JSONObject etcpSyncCarNumbers(Long cUserId, String tenantId, int iVendorType, + private JSONObject etcpSyncCarNumbers(TenantEntity tenantEntity, Long cUserId, int iVendorType, String url, String merchantNo, String merchantKey, String version, String etcpToken) { String ret; @@ -212,7 +213,7 @@ public class WxCarController extends BaseController { Date curr = new Date(); WxCUserCar userCar = new WxCUserCar(); userCar.setCUserId(cUserId); - userCar.setTenantId(tenantId); + userCar.updateTenantInfo(tenantEntity); userCar.setCarNumber(_carNum); userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); userCar.setCreateDate(curr); @@ -258,7 +259,7 @@ public class WxCarController extends BaseController { @PostMapping("/bindCar") public ResultData bindCar(@RequestBody Map paramMap) { // 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); // 2. get vendor params if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { return etcpBindCar(paramMap, park); @@ -326,7 +327,7 @@ public class WxCarController extends BaseController { Date curr = new Date(); WxCUserCar userCar = new WxCUserCar(); userCar.setCUserId(getUserId()); - userCar.setTenantId(getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCarNumber(carNumber); userCar.setVendorType(carVendor.getCode()); userCar.setCreateDate(curr); @@ -384,7 +385,7 @@ public class WxCarController extends BaseController { WxCUserCar userCar = new WxCUserCar(); userCar.setId(newCarId); userCar.setCUserId(getUserId()); - userCar.setTenantId(getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCarNumber(carNumber); userCar.setVendorType(EnumCarVendor.CAR_TJD.getCode()); JSONObject jo = new JSONObject(); @@ -410,7 +411,7 @@ public class WxCarController extends BaseController { private void addCredit() { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(getUserId()); - wxCreditHistory.setTenantId(getTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); @@ -433,7 +434,7 @@ public class WxCarController extends BaseController { @PostMapping("/unbindCar") public ResultData unbindCar(@RequestBody Map paramMap) { // 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { return etcpUnbindCar(paramMap, park); } else { @@ -472,7 +473,7 @@ public class WxCarController extends BaseController { try { WxCUserCar userCar = new WxCUserCar(); userCar.setCUserId(getUserId()); - userCar.setTenantId(getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCarNumber(carNumber); wxCUserCarService.deleteByObj(userCar); } catch (Exception e) { @@ -496,7 +497,7 @@ public class WxCarController extends BaseController { } try { WxCUserCar userCar = new WxCUserCar(); - userCar.setTenantId(getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCUserId(getUserId()); userCar.setCarNumber(carNumber); wxCUserCarService.deleteByObj(userCar); @@ -515,7 +516,7 @@ public class WxCarController extends BaseController { } WxCUserCar queryOne = new WxCUserCar(); queryOne.setCarNumber(carNumber); - queryOne.setTenantId(getTenantId()); + queryOne.updateTenantInfo(getTenantInfo()); queryOne.setCUserId(getUserId()); WxCUserCar userCar = wxCUserCarService.getOne(queryOne); if (userCar != null) { @@ -590,7 +591,7 @@ public class WxCarController extends BaseController { @PostMapping("/getCarStopFee") public ResultData getCarStopFee(@RequestBody Map paramMap) { // 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { return etcpCarStopFee(paramMap, park); } else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode())) { @@ -707,7 +708,7 @@ public class WxCarController extends BaseController { @PostMapping("/getCoupon") public ResultData getCoupon(@RequestBody Map paramMap) { /// 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); String carNumber = paramMap.get("carNumber"); String couponOrderIdStr = paramMap.get("couponOrderId"); if (StringUtils.isBlank(carNumber)) { @@ -726,7 +727,7 @@ public class WxCarController extends BaseController { WxCouponOrderCarCVo userCar = null; WxCouponOrder userCarQ = new WxCouponOrder(); - userCarQ.setTenantId(getTenantId()); + userCarQ.updateTenantInfo(getTenantInfo()); userCarQ.setCUserId(getUserId()); userCarQ.setId(couponOrderId); userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); @@ -774,7 +775,7 @@ public class WxCarController extends BaseController { // 券状态设为已使用 WxCouponOrder couponOrder = new WxCouponOrder(); couponOrder.setId(userCar.getId()); - couponOrder.setTenantId(getTenantId()); + couponOrder.updateTenantInfo(getTenantInfo()); couponOrder.setUpdateDate(new Date()); couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); try { @@ -845,6 +846,12 @@ public class WxCarController extends BaseController { String ret = ShangAnUtil.couponSend(url, key, parkNumber, couponModelId, userCar.getExpiredTime(), carNumber, position); JSONObject retObj = JSON.parseObject(ret); if (retObj.getString(ShangAnUtil.SHANGAN_STATUS).equalsIgnoreCase(ShangAnUtil.SHANGAN_SUCCESS)) { + // 停车券-核销 + try { + wxCouponOrderService.shangAnVerify(userCar.getId()); + } catch (Exception e) { + logger.error(e.getMessage()); + } return new ResultData(); } else { return new ResultData(ErrorCode.SHANGAN_COUPON_FAIL.getCode(), retObj.getString(ShangAnUtil.SHANGAN_ERROR_CODE)); @@ -865,7 +872,7 @@ public class WxCarController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); - wxCouponOrder.setTenantId(getTenantId()); + wxCouponOrder.updateTenantInfo(getTenantInfo()); wxCouponOrder.setCUserId(getUserId()); if (wxCouponOrder.getCouponOrderStatus() == null) wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); @@ -880,7 +887,7 @@ public class WxCarController extends BaseController { @GetMapping("/getParkStatus") public ResultData getParkStatus() { /// 1, get mall's park - WxPark park = getCurrentPark(getTenantId()); + WxPark park = getCurrentPark(getTenantInfo()); if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { ResultData e = etcpParkStatus(park); if (e != null) return e; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 381528c3a..bf52be1c0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -143,7 +143,7 @@ public class WxCardPayController extends BaseController { } WxCardSpend record = new WxCardSpend(); - record.setTenantId(merchant.getTenantId()); + record.updateTenantInfo(merchant); record.setCardId(cardId); record.setOwnerId(getUserId()); record.setMerchantId(merchantId); @@ -171,7 +171,7 @@ public class WxCardPayController extends BaseController { String ipStr = getIpAddr(); logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); - wxCardSpend.setTenantId(getTenantId()); + wxCardSpend.updateTenantInfo(getTenantInfo()); wxCardSpend.setOwnerId(getUserId()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); @@ -183,7 +183,7 @@ public class WxCardPayController extends BaseController { String ipStr = getIpAddr(); logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); - wxCardSpend.setTenantId(getTenantId()); + wxCardSpend.updateTenantInfo(getTenantInfo()); wxCardSpend.setOwnerId(getUserId()); final List> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); return new ResultData(mapList); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 618e81e72..996f9ac55 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -47,7 +47,7 @@ public class WxCouponChannelController extends BaseController { @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); @@ -64,7 +64,7 @@ public class WxCouponChannelController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); @@ -102,7 +102,7 @@ public class WxCouponChannelController extends BaseController { @GetMapping("change") public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) { if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index f856a5a1e..6a981fa09 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -140,7 +140,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (cardCVo == null) cardCVo = new WxCardCVo(); - cardCVo.setTenantId(getTenantId()); + cardCVo.updateTenantInfo(getTenantInfo()); cardCVo.setOwnerId(getUserId()); if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { String [] statusAttr = cardCVo.getStatusStr().split(","); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index cafc43d2e..68a87d071 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -44,7 +44,7 @@ public class WxCouponPasswordController extends BaseController { } // 1. 根据password获取领取的couponId WxCouponPassword couponPasswordQ = new WxCouponPassword(); - couponPasswordQ.setTenantId(getTenantId()); + couponPasswordQ.updateTenantInfo(getTenantInfo()); couponPasswordQ.setPassword(password); couponPasswordQ.setExpireDate(new Date()); WxCouponPassword couponPassword = null; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 61a18d623..8739a5ceb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -39,7 +39,7 @@ public class WxGameController extends BaseController { @GetMapping("getOne") public ResultData getOne(@ModelAttribute WxGame wxGame) { if (wxGame == null) wxGame = new WxGame(); - wxGame.setTenantId(getTenantId()); + wxGame.updateTenantInfo(getTenantInfo()); wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); // 因为有算法要求,分成两步获取 WxGame record = wxGameService.getOne(wxGame); @@ -54,7 +54,7 @@ public class WxGameController extends BaseController { @GetMapping("getOneGame") public ResultData getOneGame(@ModelAttribute WxGame wxGame) { if (wxGame == null) wxGame = new WxGame(); - wxGame.setTenantId(getTenantId()); + wxGame.updateTenantInfo(getTenantInfo()); wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); // 因为有算法要求,分成两步获取 WxGame record = wxGameService.getOne(wxGame); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java index 073b51d5f..a59c0b72e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java @@ -1,8 +1,6 @@ package com.iformall.controller; -import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxMallFloor; import com.iformall.service.WxMallBuildingService; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -22,6 +20,6 @@ public class WxMallBuildingController extends BaseController { @GetMapping("getbuildingfloorlist") public ResultData getbuildingfloorlist() { logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); - return wxMallBuildingService.getbuildingfloorlist(getTenantId()); + return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java index 16246e94e..25b0f0eeb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.*; @@ -94,10 +95,11 @@ public class WxMallController extends BaseController { @ApiOperation("成长值相关信息") @GetMapping("/scoreLevelInfo") public ResultData getScoreLevelInfo() { + TenantEntity tenantEntity = getTenantInfo(); Map map = new HashMap(); - WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(tenantEntity); map.put("score", scoreRules); - List levelConfigList = wxLevelConfigService.getByTenantId(getTenantId()); + List levelConfigList = wxLevelConfigService.getByTenantInfo(tenantEntity); boolean disscountEnable = false; for(WxLevelConfig levelConfig: levelConfigList) { if (levelConfig.getDiscountEnable() > 0 ) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index e61ab86cb..3f0116bc7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -46,7 +46,7 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData sendvalidationcode(String phone, Integer type) { WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setAppid(user.getAppId()); @@ -61,7 +61,7 @@ public class WxMsgValidationcodeController extends BaseController { public ResultData hasvalidationcode(String phone, Integer type, String code) { WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java index dcc600da4..bbc8a53c7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -48,7 +48,7 @@ public class WxOrderGroupController extends BaseController { } wxOrderGroup.setRemainPeople(1); wxOrderGroup.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); - wxOrderGroup.setTenantId(getTenantId()); + wxOrderGroup.updateTenantInfo(getTenantInfo()); return wxOrderGroupService.queryRemainOne(wxOrderGroup, getUserId()); } @@ -62,7 +62,7 @@ public class WxOrderGroupController extends BaseController { public ResultData queryOrderGroup(Integer pageNum, Integer pageSize) { WxOrder wxOrder = new WxOrder(); wxOrder.setCUserId(getUserId()); - wxOrder.setTenantId(getTenantId()); + wxOrder.updateTenantInfo(getTenantInfo()); final PageInfo> page = wxOrderGroupService.queryOrderGroup(wxOrder, pageNum, pageSize); return new ResultData(page); } @@ -84,7 +84,7 @@ public class WxOrderGroupController extends BaseController { if (wxOrderGroup.getOrderId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); } - wxOrderGroup.setTenantId(getTenantId()); + wxOrderGroup.updateTenantInfo(getTenantInfo()); return wxOrderGroupService.toOrderGroup(wxOrderGroup); } @@ -105,7 +105,7 @@ public class WxOrderGroupController extends BaseController { if (wxOrderGroup.getOrderId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); } - wxOrderGroup.setTenantId(getTenantId()); + wxOrderGroup.updateTenantInfo(getTenantInfo()); return wxOrderGroupService.queryOrderGroupStatus(wxOrderGroup); } @@ -119,7 +119,7 @@ public class WxOrderGroupController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } wxOrderGroup.setUserId(getUserId()); - wxOrderGroup.setTenantId(getTenantId()); + wxOrderGroup.updateTenantInfo(getTenantInfo()); return wxOrderGroupService.queryAttendStatus(wxOrderGroup); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java index 725cdf07c..058930304 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxParkController.java @@ -28,7 +28,7 @@ public class WxParkController extends BaseController { @GetMapping("/info") public ResultData findById() { WxPark parkQ = new WxPark(); - parkQ.setTenantId(getTenantId()); + parkQ.updateTenantInfo(getTenantInfo()); WxPark park = wxParkService.getByObj(parkQ); if (park == null) { logger.error("车场未取到"); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java index 4170a3044..21e94cfb1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionController.java @@ -44,7 +44,7 @@ public class WxQuestionController extends BaseController { @GetMapping("getQuestion") public Result getQuestion(@RequestParam("couponType") String couponType) { WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); - wxQuestionConfig.setTenantId(getTenantId()); + wxQuestionConfig.updateTenantInfo(getTenantInfo()); JSONArray ct = new JSONArray(); try { ct.put(Integer.valueOf(couponType)); @@ -59,7 +59,7 @@ public class WxQuestionController extends BaseController { if (wxQuestionConfig.getStatus().equals(EnumQuestionConfigStatus.ON.getCode()) && questionIds.size() > 0) { WxQuestion wxQuestion = new WxQuestion(); - wxQuestion.setTenantId(getTenantId()); + wxQuestion.updateTenantInfo(getTenantInfo()); wxQuestion.setIds(questionIds); List listQuestion = wxQuestionService.findList(wxQuestion); if (listQuestion.size() > 0) { @@ -69,7 +69,7 @@ public class WxQuestionController extends BaseController { WxQuestion x = q.next(); wxQuestionLog.setQuestionId(x.getId()); wxQuestionLog.setUserId(getUserId()); - wxQuestionLog.setTenantId(getTenantId()); + wxQuestionLog.updateTenantInfo(getTenantInfo()); if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ q.remove(); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java index cbe14a9d9..ff5bc93ee 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java @@ -28,7 +28,7 @@ public class WxScoreHistoryController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(Integer pageNum, Integer pageSize) { WxScoreHistory wxScoreHistory = new WxScoreHistory(); - wxScoreHistory.setTenantId(getTenantId()); + wxScoreHistory.updateTenantInfo(getTenantInfo()); wxScoreHistory.setCUserId(getUserId()); wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index 4bd3ad547..c74f5cb60 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -22,16 +22,14 @@ public class WxTopicController extends BaseController { public ResultData show() { logger.debug("[" + getIpAddr() + "] WxTopicController::show"); WxTopic wxTopic = new WxTopic(); - String tenantId = getTenantId(); - wxTopic.setTenantId(tenantId); + wxTopic.updateTenantInfo(getTenantInfo()); return new ResultData(wxTopicService.show(wxTopic)); } @GetMapping("findById") public ResultData findById(WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); - String tenantId = getTenantId(); - wxTopic.setTenantId(tenantId); + wxTopic.updateTenantInfo(getTenantInfo()); WxTopic queryTopic = wxTopicService.findById(wxTopic); return new ResultData(queryTopic); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 381907dd7..b2806096c 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -12,6 +12,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCUserVo; import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.enums.EnumAssignTagsTrigger; @@ -213,7 +214,7 @@ public class WxUserGrantController extends BaseController { String ipaddress = IPUtil.getIpAddr(request); WxCUser newUser = new WxCUser(); - newUser.setTenantId(wxAuthorizerInfo.getTenantId()); + newUser.updateTenantInfo(wxAuthorizerInfo); newUser.setAppId(appId); newUser.setOpenId(openId); if (boolHaveUnionId) { @@ -224,7 +225,7 @@ public class WxUserGrantController extends BaseController { if (boolHaveUnionId) { // 优先根据unionId查询 WxCUser userQ = new WxCUser(); - userQ.setTenantId(wxAuthorizerInfo.getTenantId()); + userQ.updateTenantInfo(wxAuthorizerInfo); userQ.setUnionId(unionId); oldUser = wxCUserService.getByObject(userQ); if(oldUser != null) { @@ -281,7 +282,7 @@ public class WxUserGrantController extends BaseController { resultMap.put("score", score); } else { // 新用户 - newUser.setTenantId(wxAuthorizerInfo.getTenantId()); + newUser.updateTenantInfo(wxAuthorizerInfo); token = newUser.createToken(new Date()); newUser.setRegisterIp(ipaddress); @@ -476,6 +477,7 @@ public class WxUserGrantController extends BaseController { @ApiOperation(value = "授权后获取用户的手机号", notes = "{\"encryptedData\":\"string\",\"iv\":\"string\"}") public ResultData getUserPhone(@RequestBody Map map) { logger.debug(map.toString()); + TenantEntity tenantEntity = getTenantInfo(); Map resultMap = new HashMap(); String encryptedData = map.get("encryptedData"); String iv = map.get("iv"); @@ -512,7 +514,7 @@ public class WxUserGrantController extends BaseController { user.setCountryCode(phoneNoInfo.getCountryCode()); if (isFirstPhone) { //检查是否存在会员信息 如果有 赋值积分 - WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone()); + WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, user.getPhone()); if (basicInfo != null ) { int credit = user.getCredit() == null ? 0 : user.getCredit(); int score = user.getScore() == null ? 0 : user.getScore(); @@ -679,7 +681,7 @@ public class WxUserGrantController extends BaseController { public ResultData carCount() { WxCUser user = getUser(); WxCUserCar userCar = new WxCUserCar(); - userCar.setTenantId(user.getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCUserId(user.getId()); Integer count = wxCUserCarService.countUserCar(userCar); if (count > 0) { @@ -701,7 +703,7 @@ public class WxUserGrantController extends BaseController { @GetMapping("/carList") public ResultData getCarList() { WxCUserCar userCar = new WxCUserCar(); - userCar.setTenantId(getTenantId()); + userCar.updateTenantInfo(getTenantInfo()); userCar.setCUserId(getUserId()); List list = wxCUserCarService.getList(userCar); return new ResultData(Result.SUCCESS, "获取查询成功", list); @@ -775,7 +777,7 @@ public class WxUserGrantController extends BaseController { //增加积分 WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(record.getId()); - wxCreditHistory.setTenantId(getTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java index b770e6240..757299519 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java @@ -1,5 +1,6 @@ package com.iformall.controller.base; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.IPUtil; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java index 66d305623..1c9a44204 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java @@ -300,7 +300,7 @@ public class WxCarETCPCallBackController extends BaseController { //return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); } else { tenantId = park.getTenantId(); - wxCarCmdLog.setTenantId(park.getTenantId()); + wxCarCmdLog.updateTenantInfo(park); } String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER); @@ -412,7 +412,7 @@ public class WxCarETCPCallBackController extends BaseController { // return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); } else { tenantId = park.getTenantId(); - wxCarCmdLog.setTenantId(tenantId); + wxCarCmdLog.updateTenantInfo(park); } try { diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java index 0d290d5b5..b173f0b31 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java @@ -142,7 +142,7 @@ public class WxCarTJDCallBackController extends BaseController { return map; } else { tenantId = park.getTenantId(); - wxCarCmdLog.setTenantId(park.getTenantId()); + wxCarCmdLog.updateTenantInfo(park); } try { @@ -259,7 +259,7 @@ public class WxCarTJDCallBackController extends BaseController { return map; } else { tenantId = park.getTenantId(); - wxCarCmdLog.setTenantId(tenantId); + wxCarCmdLog.updateTenantInfo(park); } try { @@ -274,7 +274,7 @@ public class WxCarTJDCallBackController extends BaseController { try { // 保存WxCarPayRecord WxCarPayRecord record = new WxCarPayRecord(); - record.setTenantId(tenantId); + record.updateTenantInfo(park); record.setVendorType(wxCarCmdLog.getVendorType()); record.setParkId(parkId); record.setParkName(parkName); @@ -292,7 +292,7 @@ public class WxCarTJDCallBackController extends BaseController { record.setFee(stopFee); } WxCarPayRecord query = new WxCarPayRecord(); - query.setTenantId(tenantId); + query.updateTenantInfo(park); query.setParkId(parkId); query.setSynId(tradeId); PageInfo page = wxCarPayRecordService.findCarPayListByPage(query,1,1); @@ -463,7 +463,7 @@ public class WxCarTJDCallBackController extends BaseController { return map; } else { tenantId = park.getTenantId(); - wxCarCmdLog.setTenantId(tenantId); + wxCarCmdLog.updateTenantInfo(park); } try { diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 07e266892..122217524 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.KwBox; import com.iformall.domain.po.KwBoxCmdHistory; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumBoxOnlineStatus; import com.iformall.enums.EnumBoxRegisterStatus; import com.iformall.service.kw.KwBoxCmdHistoryService; @@ -45,7 +46,7 @@ public class KwBoxV1Controller extends BaseController { private KwBoxCmdHistoryService kwBoxCmdHistoryService; - private void saveCmd(String tenantId, String cmd, String imei, String ccid, Date deviceTime, Map paramMap) + private void saveCmd(TenantEntity tenantEntity, String cmd, String imei, String ccid, Date deviceTime, Map paramMap) { KwBoxCmdHistory kwBoxCmdHistory = new KwBoxCmdHistory(); kwBoxCmdHistory.setCmd(cmd); @@ -54,7 +55,7 @@ public class KwBoxV1Controller extends BaseController { kwBoxCmdHistory.setIccid(ccid); kwBoxCmdHistory.setImei(imei); kwBoxCmdHistory.setContent(JSONObject.toJSON(paramMap).toString()); - kwBoxCmdHistory.setTenantId(tenantId); + kwBoxCmdHistory.updateTenantInfo(tenantEntity); kwBoxCmdHistoryService.saveOrUpdate(kwBoxCmdHistory); } @@ -78,7 +79,7 @@ public class KwBoxV1Controller extends BaseController { if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.INIT.getCode())) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); - saveCmd(kwBox.getTenantId(),KwBoxService.CMD_REGISTER,imei,ccid,deviceTime,paramMap); + saveCmd(kwBox,KwBoxService.CMD_REGISTER,imei,ccid,deviceTime,paramMap); KwBox record = new KwBox(); record.setId(kwBox.getId()); @@ -135,7 +136,7 @@ public class KwBoxV1Controller extends BaseController { if (!checkSign(kwBox, paramMap, sign)) return new ResultData(ErrorCode.DEVICE_SIGN_INVALID); - saveCmd(kwBox.getTenantId(),KwBoxService.CMD_LOGIN,imei,ccid,deviceTime,paramMap); + saveCmd(kwBox,KwBoxService.CMD_LOGIN,imei,ccid,deviceTime,paramMap); KwBox record = new KwBox(); record.setId(kwBox.getId()); @@ -163,7 +164,7 @@ public class KwBoxV1Controller extends BaseController { if (!checkSign(kwBox, paramMap, sign)) return new ResultData(ErrorCode.DEVICE_SIGN_INVALID); - saveCmd(kwBox.getTenantId(),KwBoxService.CMD_HEARTBEAT,imei,ccid,deviceTime,paramMap); + saveCmd(kwBox,KwBoxService.CMD_HEARTBEAT,imei,ccid,deviceTime,paramMap); KwBox record = new KwBox(); record.setId(kwBox.getId()); diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 0cab81a1e..c50991c8d 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -2116,7 +2116,7 @@ public class PosServiceImpl implements PosService { logger.error("交易核销积分异常:" + e.getMessage()); } // 3. 核销后处理 - couponOrderService.sendInsideCouponVerifyMsg(merchantBUser.getTenantId(), couponOrderId, merchantBUser.getId()); + couponOrderService.sendInsideCouponVerifyMsg(merchantBUser, couponOrderId, merchantBUser.getId()); } return payOrder; } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 9774b7fba..3d8024f43 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -56,7 +56,7 @@ public class ActivitySchedule { WxActivityJoin wxActivityJoin; for (WxActivity activity : wxActivitys) { wxActivityJoin = new WxActivityJoin(); - wxActivityJoin.setTenantId(activity.getTenantId()); + wxActivityJoin.updateTenantInfo(activity); wxActivityJoin.setActivityId(activity.getId()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); List list = wxActivityJoinMapper.findList(wxActivityJoin); @@ -77,7 +77,7 @@ public class ActivitySchedule { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(activityJoin.getTenantId()); + wxMsgRecord.updateTenantInfo(activityJoin); Map map = new HashedMap(); map.put("person", person); map.put("party", party); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index c0566335c..f9385cab2 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -1,6 +1,7 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; import com.iformall.mapper.WxBillAllMapper; @@ -66,7 +67,9 @@ public class BillNotificationSchedule { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); Map map = new HashedMap(); map.put("price", price.toString()); map.put("app", appname); @@ -95,7 +98,9 @@ public class BillNotificationSchedule { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(new TenantEntity(){{ + setTenantId(tenantId); + }}); Map map = new HashedMap(); map.put("price", price.toString()); map.put("app", appname); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java index 962b9a7db..f1b713ba6 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java @@ -1,6 +1,7 @@ package com.iformall.schedule; import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillAll; import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxBillAllService; @@ -35,9 +36,9 @@ public class BillStatusSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); + TenantEntity tenantEntity = wxMall.getTenantInfo(); WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setTenantId(tenantId); + wxBillAll.updateTenantInfo(tenantEntity); wxBillAllService.updateBillStatus(wxBillAll); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java index fee8c8d73..ccf1949d4 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxChartDataEntity; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchantTradeDaily; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumChartType; import com.iformall.mapper.*; @@ -77,45 +78,45 @@ public class ChartDataSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); - params.put("tenantId", tenantId); - wxChartDataEntity.setTenantId(tenantId); + TenantEntity tenantEntity = wxMall.getTenantInfo(); + params.put("tenantId", tenantEntity.getTenantId()); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carOutData(params, createtime, date, tenantId); + carOutData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carPaidData(params, createtime, date, tenantId); + carPaidData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carPayFeeData(params, createtime, date, tenantId); + carPayFeeData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carMemberData(params, createtime, date, tenantId); + carMemberData(params, createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carNewMemberData(createtime, date, tenantId); + carNewMemberData(createtime, date, tenantEntity); } wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode()); count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>"); - carBindData(params, createtime, date, tenantId); + carBindData(params, createtime, date, tenantEntity); } } } @@ -136,19 +137,19 @@ public class ChartDataSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); - params.put("tenantId", tenantId); - wxChartDataEntity.setTenantId(tenantId); + TenantEntity tenantEntity = wxMall.getTenantInfo(); + params.put("tenantId", tenantEntity.getTenantId()); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>"); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startdate); wxCouponOrder.setEndTime(enddate); Integer price = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); - addChartData(tenantId, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime); + addChartData(tenantEntity, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime); } } } @@ -167,72 +168,72 @@ public class ChartDataSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); - params.put("tenantId", tenantId); + TenantEntity tenantEntity = wxMall.getTenantInfo(); + params.put("tenantId", tenantEntity.getTenantId()); - wxChartDataEntity.setTenantId(tenantId); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setType(EnumChartType.MERCHANT_TRADE.getCode()); int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity)); if (count == 0) { logger.info("解单金额>>>>>>>>>>>>>>>>>>>>>>>>>>"); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); wxMerchantTradeDaily.setReportDate(yesterday); List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); Integer price = 0; if (!recordList.isEmpty()) { price = Integer.parseInt(recordList.get(0).getTradeAmt()); } - addChartData(tenantId, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime); + addChartData(tenantEntity, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime); } } } - public void carBindData(HashMap params, Date createtime, Date date, String tenantId) { + public void carBindData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { Long todaybindcar = wxCUserCarMapper.queryCarCount(params); - addChartData(tenantId, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); + addChartData(tenantEntity, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime); } - public void carNewMemberData(Date createtime, Date date, String tenantId) { + public void carNewMemberData(Date createtime, Date date, TenantEntity tenantEntity) { WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); wxCUserBasicInfoDto.setStartTime(date); wxCUserBasicInfoDto.setEndTime(date); Integer carUserCount = wxCUserCarMapper.countUser(wxCUserBasicInfoDto); - addChartData(tenantId, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); + addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime); } - public void carMemberData(HashMap params, Date createtime, Date date, String tenantId) { + public void carMemberData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(params); Long userCount = carCountHistory.isEmpty() ? 0L : (Long) carCountHistory.get(0).get("count"); - addChartData(tenantId, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); + addChartData(tenantEntity, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime); } - public void carPayFeeData(HashMap params, Date createtime, Date date, String tenantId) { + public void carPayFeeData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(params); BigDecimal fee = weekCarPayHistoryList.isEmpty() ? new BigDecimal(0) : (BigDecimal) weekCarPayHistoryList.get(0).get("fee"); - addChartData(tenantId, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); + addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime); } - public void carPaidData(HashMap params, Date createtime, Date date, String tenantId) { + public void carPaidData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { Long carPayFeeCount = wxCarCmdLogMapper.queryWeekCarPayCount(params); - addChartData(tenantId, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); + addChartData(tenantEntity, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime); } - public void carOutData(HashMap params, Date createtime, Date date, String tenantId) { + public void carOutData(HashMap params, Date createtime, Date date, TenantEntity tenantEntity) { List> historylist = wxCarCmdLogMapper.queryHistory(params); Long carOutCount = historylist.isEmpty() ? 0L : (Long) historylist.get(0).get("carcount"); - addChartData(tenantId, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); + addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime); } - private void addChartData(String tenantId, String result, Integer type, Date querytime, Date createtime) { + private void addChartData(TenantEntity tenantEntity, String result, Integer type, Date querytime, Date createtime) { logger.info("即将插入数据>>>>>>>>>>>>>>>>>>>>>>>"); final IdWorker idWorker = IdWorker.get(); long id = idWorker.nextId(); WxChartDataEntity wxChartDataEntity = new WxChartDataEntity(); wxChartDataEntity.setId(id); - wxChartDataEntity.setTenantId(tenantId); + wxChartDataEntity.updateTenantInfo(tenantEntity); wxChartDataEntity.setResult(result); wxChartDataEntity.setType(type); wxChartDataEntity.setQuerytime(querytime); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 5780a8b2d..0f71ecdbd 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -3,6 +3,7 @@ package com.iformall.schedule; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxPropertyContractService; import com.iformall.service.WxRentContractService; @@ -41,15 +42,15 @@ public class ContractSchedule { List wxMalls = wxMallMapper.findList(null); for (WxMall wxMall : wxMalls) { - String tenantId = wxMall.getTenantId(); + TenantEntity tenantEntity = wxMall.getTenantInfo(); WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(tenantId); + wxRentContract.updateTenantInfo(tenantEntity); logger.info("租赁合同状态更新开始"); wxRentContractService.updateStatus(wxRentContract); logger.info("租赁合同状态更新结束"); WxPropertyContract wxPropertyContract = new WxPropertyContract(); - wxPropertyContract.setTenantId(tenantId); + wxPropertyContract.updateTenantInfo(tenantEntity); logger.info("物业合同状态更新开始"); wxPropertyContractService.updateStatus(wxPropertyContract); logger.info("物业合同状态更新结束"); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index faf4b1c02..22b8c5e4d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -84,7 +84,7 @@ public class CouponExpiringSchedule { List list = wxGameMapper.findList(wxGame); list.stream().forEach(g->{ WxCouponChannel couponChannel = new WxCouponChannel(); - couponChannel.setTenantId(g.getTenantId()); + couponChannel.updateTenantInfo(g); couponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); couponChannel.setSubTargetId(g.getId()); couponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 5c0d7d346..5dfdfce85 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -115,7 +115,7 @@ public class CouponOrderExpiringSchedule { if(!co.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode()) && !co.getAutoRefund().equals(EnumCouponAutoRefund.UNSUPPORTED.getCode())) { WxAppinfo appinfo = new WxAppinfo(); - appinfo.setTenantId(co.getTenantId()); + appinfo.updateTenantInfo(co); appinfo.setType(EnumAppType.B.getCode()); appinfo = wxAppinfoMapper.findList(appinfo).get(0); @@ -131,7 +131,7 @@ public class CouponOrderExpiringSchedule { // 不设退款,只能走微信分账-分账完结,把钱给分给商场 try { WxPayOrder wxPayOrder = new WxPayOrder(); - wxPayOrder.setTenantId(co.getTenantId()); + wxPayOrder.updateTenantInfo(co); wxPayOrder.setOrderId(co.getOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); @@ -144,7 +144,7 @@ public class CouponOrderExpiringSchedule { wxSharingOrderDto.setOrderId(wxPayOrder.getId()); wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); - wxSharingOrderDto.setTenantId(wxPayOrder.getTenantId()); + wxSharingOrderDto.updateTenantInfo(wxPayOrder); wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); if (wxPayOrder.getRateAmount() != null) { // 实际分账金额为 分账金额 + 通道费差 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index 10c763881..737849079 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -3,6 +3,7 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.enums.*; @@ -100,8 +101,9 @@ public class CouponSendSchedule { logger.info("定时发券: {}发券状态关闭, 任务跳过不执行", mall.getName()); return; } + TenantEntity tenantEntity = mall.getTenantInfo(); WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(mall.getTenantId()); + wxLevelConfig.updateTenantInfo(tenantEntity); List levelConfigList = WxLevelConfigMapper.findList(wxLevelConfig); levelConfigList = levelConfigList.stream() .sorted(Comparator.comparing(WxLevelConfig::getPoints)) @@ -127,7 +129,7 @@ public class CouponSendSchedule { if (sendCount > 0) { WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(l.getTenantId()); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); wxCUserBasicInfoDto.setLevelStartScore(levelStartScore); wxCUserBasicInfoDto.setLevelEndScore(levelEndScore); List wxCUserBasicInfoList = wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto); @@ -138,7 +140,7 @@ public class CouponSendSchedule { wxCUserBasicInfoList.stream().forEach(cu -> { WxCouponSend wxCouponSend = new WxCouponSend(); - wxCouponSend.setTenantId(l.getTenantId()); + wxCouponSend.updateTenantInfo(tenantEntity); wxCouponSend.setSendType(EnumCouponSendSendType.TIMED.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); List couponSendList = wxCouponSendMapper.findListVo(wxCouponSend); @@ -184,7 +186,7 @@ public class CouponSendSchedule { // 发放免费券 try { WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs.getCouponId(), null); - wxCouponActionLogService.addOne(l.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); + wxCouponActionLogService.addOne(tenantEntity, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); } catch (Exception e) { logger.error("定时发券:发券失败 levelId=" + l.getId() + " couponId=" + cs.getCouponId() + " userId=" + cu.getId() + e.getMessage()); continue; @@ -240,9 +242,10 @@ public class CouponSendSchedule { logger.info("生日发券: {} 发券状态关闭, 任务跳过不执行", mall.getName()); return; } + TenantEntity tenantEntity = mall.getTenantInfo(); //查找生日券 WxCouponSend wxCouponSend = new WxCouponSend(); - wxCouponSend.setTenantId(mall.getTenantId()); + wxCouponSend.updateTenantInfo(tenantEntity); wxCouponSend.setSendType(EnumCouponSendSendType.BIRTHDAY.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); List couponSendList = wxCouponSendMapper.findListVo(wxCouponSend); @@ -251,7 +254,7 @@ public class CouponSendSchedule { return; } - WxCouponSend birthdayConfig = wxCouponSendService.getConfig(EnumCouponSendSendType.BIRTHDAY.getCode(), mall.getTenantId()); + WxCouponSend birthdayConfig = wxCouponSendService.getConfig(EnumCouponSendSendType.BIRTHDAY.getCode(), tenantEntity); String conditions = birthdayConfig.getConditions(); JSONObject configJo = null; try { @@ -313,7 +316,7 @@ public class CouponSendSchedule { // 发放生日券 try { WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs.getCouponId(), null); - wxCouponActionLogService.addOne(cu.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); + wxCouponActionLogService.addOne(tenantEntity, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); couponSendedUsers.add(cu); } catch (Exception e) { logger.error("定时发券:发券失败 levelId=" + cu.getId() + " couponId=" + cs.getCouponId() + " userId=" + cu.getId() + e.getMessage()); @@ -328,7 +331,7 @@ public class CouponSendSchedule { } } - int birthdayScale = CreditUtil.getBirthdayScoreScale(mall.getTenantId(), wxScoreRulesService); + int birthdayScale = CreditUtil.getBirthdayScoreScale(tenantEntity, wxScoreRulesService); for (WxCUserBasicInfo cu : couponSendedUsers) { // 记录积分倍率日期 try { @@ -372,7 +375,7 @@ public class CouponSendSchedule { WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setReceiver(cUserBasicInfo.getPhone()); - wxMsgRecord.setTenantId(cUserBasicInfo.getTenantId()); + wxMsgRecord.updateTenantInfo(mall.getTenantInfo()); Map dynamicContentMap = new HashMap<>(); if (birthdayScale > WxScoreRules.DEFAULT_SCALE) { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index d4e23e2d3..07ecdce51 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -58,7 +58,7 @@ public class DaliyAmountSchedule { WxDateAmountRecord dateAmountRecord = new WxDateAmountRecord(); dateAmountRecord.setPayPrice(total_price); dateAmountRecord.setMerchantId(merchant.getId()); - dateAmountRecord.setTenantId(merchant.getTenantId()); + dateAmountRecord.updateTenantInfo(merchant); dateAmountRecord.setType(EnumDateAmtType.PAY_RECORD.getCode()); dateAmountRecord.setDate(startDate); dateAmountRecord.setDayOfWeek(cal.get(Calendar.DAY_OF_WEEK)); @@ -106,7 +106,7 @@ public class DaliyAmountSchedule { mallList.stream().forEach(mall->{ WxMerchant merchantQ = new WxMerchant(); - merchantQ.setTenantId(mall.getTenantId()); + merchantQ.updateTenantInfo(mall.getTenantInfo()); merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); List merchantList = wxMerchantMapper.findList(merchantQ); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 82ad1d301..a30ea1e30 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -59,8 +59,8 @@ public class InvestSchedule { private static final String TAG_REMIND = "招商定时任务-提醒"; - //@Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 - @Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 + @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务 + //@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 public void messageSchedule() { log.info("{}: 开始", TAG_MESSAGE); //一个月内未完成提醒 @@ -169,7 +169,7 @@ public class InvestSchedule { private void addTaskMessage(InvestTaskEntity task, List ownerArray) { String message = String.format(EnumInvestMessageType.TASK_REMIND.getInfo(), task.getId(), DateUtils.format(task.getLastTime())); - messageService.saveBatchMessage(ownerArray, message, EnumInvestMessageTag.TASK_MONTH, EnumFollowType.TASK, task.getId(),task.getTenantId()); + messageService.saveBatchMessage(ownerArray, message, EnumInvestMessageTag.TASK_MONTH, EnumFollowType.TASK, task.getId(),task); log.info("{}:taskID:{} 为用户{}创建消息提醒", TAG_MESSAGE, task.getId(), task.getOwner()); } @@ -223,7 +223,7 @@ public class InvestSchedule { private void addCustomerMessage(InvestCustomerVo customerVo, Long owner) { String message = String.format(EnumInvestMessageType.COSTOMER_REMIND.getInfo(), customerVo.getId()); - messageService.saveBatchMessage(Collections.singletonList(owner), message, EnumInvestMessageTag.CUSTOMER_WEEK, EnumFollowType.DEMAND, customerVo.getId(), customerVo.getTenantId()); + messageService.saveBatchMessage(Collections.singletonList(owner), message, EnumInvestMessageTag.CUSTOMER_WEEK, EnumFollowType.DEMAND, customerVo.getId(), customerVo); log.info("{}:customerID:{} 为用户{}创建消息提醒", TAG_MESSAGE, customerVo.getId(), customerVo.getDemandOwner()); } @@ -235,7 +235,7 @@ public class InvestSchedule { WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setReceiver(userInfo.getPhone()); - wxMsgRecord.setTenantId(mall.getTenantId()); + wxMsgRecord.updateTenantInfo(userInfo); Map dynamicContentMap = new HashMap<>(); wxMsgRecord.setModelType(EnumMsgModel.INVEST_REMIND.getCode()); dynamicContentMap.put("mallName", mall.getName()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index d9f968677..2657b1f3f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -1,5 +1,6 @@ package com.iformall.schedule; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.*; import com.iformall.enums.*; import com.iformall.mq.MqBaseProducer; @@ -34,37 +35,38 @@ public class MsgReSendSchedule { List recordList = wxMsgRecordService.findList(msgRecord); for (WxMsgRecord wxMsgRecord:recordList) { logger.info("消息重发:{}",wxMsgRecord.getMsgJson()); + TenantEntity tenantEntity = wxMsgRecord.getTenantInfo(); try { if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ //内部消息 - 下订单成功 FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); msg.setMsgType(wxMsgRecord.getMsgType()); msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); msg.setMsgType(wxMsgRecord.getMsgType()); msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){ FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class); msg.setMsgType(wxMsgRecord.getMsgType()); msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class); msg.setMsgType(wxMsgRecord.getMsgType()); msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class); msg.setMsgType(wxMsgRecord.getMsgType()); msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); + msg.updateTenantInfo(tenantEntity); mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } } catch (Exception e) { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index e3e373be6..f4ba43803 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -167,7 +167,7 @@ public class OrderExpiringSchedule { Date curDate = new Date(); WxOrder updateOrder = new WxOrder(); updateOrder.setId(order.getId()); - updateOrder.setTenantId(order.getTenantId()); + updateOrder.updateTenantInfo(order); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()); updateOrder.setUpdateDate(curDate); wxOrderMapper.updateById(updateOrder); @@ -187,7 +187,7 @@ public class OrderExpiringSchedule { Date curDate = new Date(); WxOrder updateOrder = new WxOrder(); updateOrder.setId(order.getId()); - updateOrder.setTenantId(order.getTenantId()); + updateOrder.updateTenantInfo(order); updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); updateOrder.setUpdateDate(curDate); wxOrderMapper.updateById(updateOrder); @@ -204,7 +204,7 @@ public class OrderExpiringSchedule { //获取APP信息 WxAppinfo appinfo = new WxAppinfo(); - appinfo.setTenantId(order.getTenantId()); + appinfo.updateTenantInfo(order); appinfo.setType(EnumAppType.C.getCode()); appinfo = wxAppinfoMapper.findList(appinfo).get(0); //退款流程 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java index 5a7af6f22..13d9bc3fe 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java @@ -80,7 +80,7 @@ public class PowerBillAutoBuildSchedule { private void merchantPowerBillConfigStart(WxPowerBillAutoConfig wxPowerBillAutoConfig) { WxMerchantPowerBillConfig wxMerchantPowerBillConfig = new WxMerchantPowerBillConfig(); - wxMerchantPowerBillConfig.setTenantId(wxPowerBillAutoConfig.getTenantId()); + wxMerchantPowerBillConfig.updateTenantInfo(wxPowerBillAutoConfig); List wxMerchantPowerBillConfigs = wxMerchantPowerBillConfigMapper.selectList(new QueryWrapper(wxMerchantPowerBillConfig)); for (int i = 0; i < wxMerchantPowerBillConfigs.size(); i++) { buildPowerBill(wxMerchantPowerBillConfigs.get(i), wxPowerBillAutoConfig); @@ -150,7 +150,7 @@ public class PowerBillAutoBuildSchedule { for (int i = 0; i < size; i++) { KwMerchantMeter merchantMeter = merchantMeterList.get(i); KwMeterDataDto kwMeterDataDto = new KwMeterDataDto(); - kwMeterDataDto.setTenantId(merchantMeter.getTenantId()); + kwMeterDataDto.updateTenantInfo(merchantMeter); kwMeterDataDto.setMeterId(merchantMeter.getMeterId()); kwMeterDataDto.setStartTime(startdate); kwMeterDataDto.setEndTime(lastdate); @@ -169,7 +169,7 @@ public class PowerBillAutoBuildSchedule { WxBillDaily wxBillDaily = new WxBillDaily(); Long merchantId = wxMerchantPowerBillConfig.getMerchantId(); wxBillDaily.setShopId(getShopId(merchantId)); - wxBillDaily.setTenantId(wxMerchantPowerBillConfig.getTenantId()); + wxBillDaily.updateTenantInfo(wxMerchantPowerBillConfig); wxBillDaily.setMerchantId(merchantId); wxBillDaily.setMerchantName(wxMerchantPowerBillConfig.getMerchantName()); wxBillDaily.setType(EnumBillDailyType.POWER.getCode()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java index 21d75a421..11faec6f3 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java @@ -94,7 +94,7 @@ public class WxAppVisitSchedule { private boolean checkData(String date,WxAppinfo appInfo) { WxUserVisit wxUserVisit = new WxUserVisit(); wxUserVisit.setAppId(appInfo.getAppId()); - wxUserVisit.setTenantId(appInfo.getTenantId()); + wxUserVisit.updateTenantInfo(appInfo); wxUserVisit.setRefDate(date); PageInfo page = wxUserVisitService.listAsPage(wxUserVisit, 1, 10000); if (page.getList().size() > 0) @@ -115,7 +115,7 @@ public class WxAppVisitSchedule { for(WxMaVisitTrend maVisitTrend: vtList) { WxUserVisit v = new WxUserVisit(); v.setAppId(appInfo.getAppId()); - v.setTenantId(appInfo.getTenantId()); + v.updateTenantInfo(appInfo); String time = maVisitTrend.getRefDate(); Date dayDate = new SimpleDateFormat("yyyyMMdd").parse(time); v.setDayDate(dayDate); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index a409c9877..e222d5dc2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import java.util.Date; @TableName(value = "wx_business") @Data @EqualsAndHashCode(callSuper = true) -public class WxBusiness extends BaseEntity { +public class WxBusiness extends BaseTenantEntity { protected Integer id; @@ -31,8 +31,6 @@ public class WxBusiness extends BaseEntity { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; - @TableField(exist = false) - private String tenantId; @TableField(exist = false) private Integer limitStart; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index d6be8e8ea..40827c8e6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -26,7 +26,6 @@ public class WxCUserBasicInfo extends BaseTenantEntity { @JsonIgnore protected Date scoreDate; - @Excel(name="姓名",width = 20,orderNum = "1") @NotNull @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index af0cede67..fba0cbd9d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -24,7 +24,6 @@ public class WxCoupon extends TenantEntity { protected Long id; - @TableField(exist = false) protected List types; @@ -205,7 +204,7 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "过滤可投放0不过滤 1过滤", name = "filterCanPut") @TableField(exist = false) private Integer filterCanPut; - //审批模板id 卷、卡、拼团、砍价 + //审批模板id 券、卡、拼团、砍价 @TableField(exist = false) private Long couponModelId; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 5bffcbb45..3a59948ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -65,7 +65,7 @@ public class WxCouponChannel extends TenantEntity { private String qrCode; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="卷状态 0:可投放 1:作废",name="couponStatus") + @io.swagger.annotations.ApiModelProperty(value="券状态 0:可投放 1:作废",name="couponStatus") private Integer couponStatus; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 9dc4aa793..f98d6690c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -91,7 +91,7 @@ public class WxCouponSend extends TenantEntity { @TableField(exist = false) protected Integer merchantRemain; - /**发卷所属商户名**/ + /**发券所属商户名**/ @TableField(exist = false) private String merchantName; /** @@ -105,7 +105,7 @@ public class WxCouponSend extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - @io.swagger.annotations.ApiModelProperty(value="2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发卷 6:定时发券 7:商户发券",name="sendType") + @io.swagger.annotations.ApiModelProperty(value="2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发券 6:定时发券 7:商户发券",name="sendType") private Integer sendType; @io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition") private String conditions; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index f6cc11488..6460ed141 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -25,7 +25,7 @@ public class WxFlowConfig extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") private String name; - @io.swagger.annotations.ApiModelProperty(value="流程类型1合同审批2账单审批3终止合同4有价卷上架",name="type") + @io.swagger.annotations.ApiModelProperty(value="流程类型1合同审批2账单审批3终止合同4有价券上架",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index f7cfb9966..0c28a8f40 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -42,7 +42,7 @@ public class WxFlowModel extends TenantEntity { private String flowId; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架",name="flowType") + @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价券上架",name="flowType") private Integer flowType; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index 1e5a054bf..5bf899716 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -74,13 +74,26 @@ public class WxFlowRecord extends TenantEntity { this.processInstanceId = processInstanceId; this.currStatus = currStatus; } + @Deprecated public WxFlowRecord(Long businessId,String tenantId){ this.businessId = businessId; setTenantId(tenantId); } + @Deprecated public WxFlowRecord(Long businessId,String tenantId,Integer approvalType){ this.businessId = businessId; setTenantId(tenantId); this.approvalType = approvalType; } + + public WxFlowRecord(TenantEntity tenantEntity, Long businessId){ + updateTenantInfo(tenantEntity); + this.businessId = businessId; + } + + public WxFlowRecord(TenantEntity tenantEntity, Long businessId,Integer approvalType){ + updateTenantInfo(tenantEntity); + this.businessId = businessId; + this.approvalType = approvalType; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 503aa4060..1f05c0a25 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -2,7 +2,9 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,6 +23,7 @@ public class WxMall extends BaseEntity { private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") private String name; + @TableField(value = "`group`") @io.swagger.annotations.ApiModelProperty(value="集团",name="group") private String group; @io.swagger.annotations.ApiModelProperty(value="国家",name="country") @@ -100,4 +103,19 @@ public class WxMall extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "图片", name = "img") private String img; + @TableField(exist = false) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @io.swagger.annotations.ApiModelProperty(value = "租户信息", name = "tenantInfo") + private String tenantInfo; + + public TenantEntity getTenantInfo() { + TenantEntity mul = new TenantEntity(); + mul.setTenantId(getTenantId()); + return mul; + } + + public void setTenantInfo(TenantEntity tenantInfo) { + setTenantId(tenantInfo.getTenantId()); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index ca255582e..fee496f1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -150,7 +150,7 @@ public class WxMerchant extends TenantEntity { private String phone; @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value = "卷名称", name = "couponName") + @io.swagger.annotations.ApiModelProperty(value = "券名称", name = "couponName") private String couponName; public String getShopsStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 8bc7a8256..b890d3cf9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -91,8 +91,8 @@ public class WxOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="POS SN",name="posOrderCreateSn") private String posOrderCreateSn; - @io.swagger.annotations.ApiModelProperty(value="实际支付金额(分),收银台用券时使用",name="realPayment") - private Integer realPayment; + @io.swagger.annotations.ApiModelProperty(value="总计支付金额(分),收银台用券时使用",name="totalPayment") + private Integer totalPayment; @TableField(exist = false) protected List statusS; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java index 9a64b99db..650713344 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java @@ -14,8 +14,6 @@ public class WxProfitSharingOrder extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 8693ccc85..7fb391899 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -17,8 +17,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxTopic extends TenantEntity { - protected Long id; + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="标题",name="title") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index a9a0261e9..369bd83ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -14,8 +14,6 @@ public class WxUserVisit extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="日期字符串",name="refDate") private String refDate; @io.swagger.annotations.ApiModelProperty(value="日期",name="dayDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java index 0a77d91b2..b4d7d2729 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -15,8 +15,6 @@ public class WxWeappReleaseStatus extends BaseTenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 7ff55f22c..10ec35f31 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * @author luozukai + * @author Stormeye * @date 2019/4/24 14:32 */ @Data @@ -20,4 +20,10 @@ public class BaseTenantEntity extends BaseEntity { public void updateTenantInfo(BaseTenantEntity info) { setTenantId(info.getTenantId()); } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 7e5e27b04..f9c96156d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * @author luozukai + * @author Stormeye * @date 2019/4/24 14:32 */ @Data diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index d9613338b..b74a817da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -2,6 +2,8 @@ package com.iformall.domain.po.msg; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -49,4 +51,18 @@ public class BaseMsg extends BaseEntity { @TableField(exist = false) private Integer delayTimeLevel = 0; + public void updateTenantInfo(TenantEntity tenantEntity) { + setTenantId(tenantEntity.getTenantId()); + } + + public void updateTenantInfo(BaseTenantEntity tenantEntity) { + setTenantId(tenantEntity.getTenantId()); + } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index ca83e0c7e..264410a13 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.WxCouponInject; import com.iformall.domain.po.WxMsgConfig; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -15,11 +16,10 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMsg extends BaseMsg{ +public class WxMsg extends BaseMsg { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "模板id", name = "modelId") @@ -78,4 +78,14 @@ public class WxMsg extends BaseMsg{ @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "", name = "filterList") List filterList; + + public void updateTenantInfo(TenantEntity tenantEntity) { + setTenantId(tenantEntity.getTenantId()); + } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 7e3d7ad50..5833e9329 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -1,6 +1,7 @@ package com.iformall.domain.po.msg; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,6 +15,8 @@ import java.util.Map; public class WxMsgRecord extends BaseMsg { protected Long id; + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") + private String tenantId; @io.swagger.annotations.ApiModelProperty(value="消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 7websocket",name="msg") private String msg; @io.swagger.annotations.ApiModelProperty(value="发送时间",name="sendTime") @@ -50,5 +53,13 @@ public class WxMsgRecord extends BaseMsg { @io.swagger.annotations.ApiModelProperty(value="动态替换内容",name="dynamicContentMap") private Map dynamicContentMap; + public void updateTenantInfo(TenantEntity tenantEntity) { + setTenantId(tenantEntity.getTenantId()); + } + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 5fd0c9a57..759130b5d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -17,7 +17,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCouponOrderBVo extends WxCouponOrder{ +public class WxCouponOrderBVo extends WxCouponOrder { private static final long serialVersionUID = 6687954932922444531L; @@ -25,9 +25,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ protected Long id; /** 基础购买到的券信息 */ - @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") private Long orderId; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java index 6e189c340..e6f59b267 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java @@ -26,7 +26,7 @@ public class WxCouponSendVo extends WxCouponSend implements Serializable{ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; - /**发卷所属商户名**/ + /**发券所属商户名**/ private String merchantName; private Date sendDate ; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java index 39a2b0960..8a41eb637 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java @@ -1,17 +1,15 @@ package com.iformall.domain.vo; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; - -import java.io.Serializable; +import lombok.EqualsAndHashCode; @Data -public class WxMerchantMicroPayVo implements Serializable { - private static final long serialVersionUID = 1L; +@EqualsAndHashCode(callSuper = true) +public class WxMerchantMicroPayVo extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") private Integer tradeAmt; @io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java index fa400f659..cc799e9a0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java @@ -51,7 +51,7 @@ public enum EnumChart { HYHYD(44, "会员活跃度"), SALE_CARD(45, "卡营销数据"), - SALE_COUPON(46, "卷营销数据"), + SALE_COUPON(46, "券营销数据"), SALE_PRESS(47, "砍价营销数据"), SALE_GROUP(48, "拼团营销数据"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java index ce205e21f..4f67d111d 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSendSendType.java @@ -5,7 +5,7 @@ package com.iformall.enums; */ public enum EnumCouponSendSendType { - // -1: 未知 0:精准发券 1:主动(保留) 2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发卷 6:定时发券 7:商户发券 8:会员生日券 + // -1: 未知 0:精准发券 1:主动(保留) 2:停车发券 3:核销发券 4: B端刷卡发券 5:商户发券 6:定时发券 7:商户发券 8:会员生日券 UNKNOWN(-1, "未知"), INJECT(0, "精准发券"), ACTIVE(1, "主动(保留)"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java index 5173720e3..b9afa9388 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java @@ -12,7 +12,7 @@ public enum EnumMailMsgModel { MAIL_ASSIGNEE_NODIFY(14, "代办通知"), MAIL_REJECT_NODIFY(15, "驳回通知"), - //卷 + //券 MAIL_C_PASS_NODIFY(24, "审批通过通知"), MAIL_C_APPLY_NODIFY(25, "审批通知"), MAIL_C_ASSIGNEE_NODIFY(26, "代办通知"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 441099b22..9e45aef4e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -25,7 +25,7 @@ public enum EnumMsgModel { TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS(17, "限时活动报名成功"), TIME_LIMIT_CAMPAIGN_NOTIFY(18, "限时活动参与提醒"), - //卷 + //券 FLOW_C_ASSIGNEE_NODIFY(19, "待办通知"), FLOW_C_APPLY_NODIFY(20, "审批通知"), FLOW_C_PASS_NODIFY(21, "通过审批通知"), diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java index 9e4bbeef6..018afde76 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -4,15 +4,22 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.dto.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; +import com.iformall.domain.po.KwMeter; import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.domain.vo.MerchantMeterVo; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface KwMerchantMeterMapper extends CommonMapper { + List findList(KwMerchantMeter param); + List findSimpleMeterList(@Param("merchantId") Long merchantId); + + List findMeterList(@Param("merchantId") Long merchantId); + List findVoList(KwMerchantMeterDto param); List findDataVoList(KwMerchantMeterDataDto param); @@ -21,6 +28,6 @@ public interface KwMerchantMeterMapper extends CommonMapper getMerchantMeter(String tenantId); + List getMerchantMeter(@Param("tenantId") String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java index c65be81f3..034f4985a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/PosMallConfigMapper.java @@ -10,6 +10,8 @@ public interface PosMallConfigMapper extends CommonMapper { PosMallConfig getByTenantId(String tenantId); + PosMallConfig getByTenantInfo(String tenantId); + diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java index 424ce29d0..6fb18629c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java @@ -1,6 +1,5 @@ package com.iformall.mapper; - import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBrand; @@ -14,8 +13,7 @@ public interface WxBrandMapper extends CommonMapper { List findList(WxBrand wxBrand); - - List> queryBrand(String tenantId); + List> queryBrandByTenant(WxBrand wxBrand); int hasBrand(WxBrand wxBrand); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java index 994bd9a6f..531febd7d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCampaign; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 6b2b499d2..148b34fb8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -48,7 +48,7 @@ public interface WxCouponMapper extends CommonMapper { String findSubsidyMoney(WxCoupon wxCoupon); - //-------卷-------- + //-------券-------- List findCouponOrderCount(WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 6ed92f61e..6d2eac394 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -61,7 +61,8 @@ public interface WxRentContractMapper extends CommonMapper List selectRentContractByShopId(WxRentContract record); List selectRentContractByShopIds(@Param("shopIds") Collection shopIds, - @Param("shopIdsRegexp") String shopIdsRegexp,@Param("tenantId") String tenantId); + @Param("shopIdsRegexp") String shopIdsRegexp, + @Param("tenantId") String tenantId); int hasContractNumber(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 389811786..2f329285f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -19,7 +19,7 @@ public interface WxShopMapper extends CommonMapper { List> notRentListMapAsPage(WxShop record); - List> getbshoplist(Map tenantId); + List> getShopList(Map params); Map getMerchantShopByShopId(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java index 3b6eaf3fb..0d2d8bbc2 100644 --- a/mallinkService/src/main/java/com/iformall/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/iformall/service/DataTowerService.java @@ -1,21 +1,22 @@ package com.iformall.service; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import java.util.Map; public interface DataTowerService { - Map queryRunningMobile(String tenantId); + Map queryRunningMobile(TenantEntity tenantEntity); - Map queryRunningPotal(String tenantId); + Map queryRunningPotal(TenantEntity tenantEntity); - Map queryRunning(String tenantId); + Map queryRunning(TenantEntity tenantEntity); - Map queryCar(String tenantId); + Map queryCar(TenantEntity tenantEntity); - Map queryCustomer(String tenantId); + Map queryCustomer(TenantEntity tenantEntity); - ResultData queryCustomerData(String tenantId, Map params); + ResultData queryCustomerData(TenantEntity tenantEntity, Map params); } diff --git a/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java b/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java index 669c62c33..494d24092 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallRolePermissionService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallRolePermission; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; @@ -54,7 +55,7 @@ public interface MallRolePermissionService { * @param roleId * @param perId */ - void savePermissions(String tenantId,Long roleId, Long[] perId); + void savePermissions(TenantEntity tenantEntity, Long roleId, Long[] perId); diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java b/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java index 19f7d9c7b..d12dc40b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserActionService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserActionVo; public interface MallUserActionService { @@ -31,7 +32,15 @@ public interface MallUserActionService { */ void saveOrUpdate(MallUserAction record); - void saveActionInfo(String tenantId, Integer actionType, String ipAddress, Long userId, String actionDesc); + /** + * 保存用户操作 + * @param tenantEntity + * @param actionType + * @param ipAddress + * @param userId + * @param actionDesc + */ + void saveActionInfo(TenantEntity tenantEntity, Integer actionType, String ipAddress, Long userId, String actionDesc); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java b/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java index 2a20e6d29..eee36bb43 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserInfoVo; import java.io.Serializable; @@ -29,7 +30,7 @@ public interface MallUserInfoService { * @param phone * @return */ - MallUserInfo getByPhone(String phone, String tenantId); + MallUserInfo getByPhone(String phone, TenantEntity tenantEntity); /** * 根据web_open_id获得展示列表 @@ -45,7 +46,7 @@ public interface MallUserInfoService { * @param openId * @return */ - MallUserInfo getByBOpenId(String openId, String tenantId); + MallUserInfo getByBOpenId(String openId, TenantEntity tenantEntity); //// -------------------- Login end ----------------------- //// diff --git a/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java b/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java index 780717c6e..a4fc29994 100644 --- a/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java +++ b/mallinkService/src/main/java/com/iformall/service/MarkingDataReportService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxOrderReportDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import javax.servlet.http.HttpServletRequest; @@ -14,19 +15,19 @@ import java.util.Map; * Created by syf on 2018/8/28. */ public interface MarkingDataReportService { - Map getCouponData(String tenantId); + Map getCouponData(TenantEntity tenantEntity); - Map getSceneData(String tenantId); + Map getSceneData(TenantEntity tenantEntity); - Map getSceneDataHistory(String tenantId,String startDate,String endDate); + Map getSceneDataHistory(TenantEntity tenantEntity, String startDate, String endDate); - PageInfo getCouponDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); + PageInfo getCouponDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); - PageInfo getSceneDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); + PageInfo getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); - PageInfo getTouchUsersReportList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); + PageInfo getTouchUsersReportList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize); - List getTouchUsersReportData(String tenantId); + List getTouchUsersReportData(TenantEntity tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/PosMallConfigService.java b/mallinkService/src/main/java/com/iformall/service/PosMallConfigService.java index 0a0fda7d8..fe1f5fa5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/PosMallConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/PosMallConfigService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PosMallConfig; +import com.iformall.domain.po.base.TenantEntity; public interface PosMallConfigService { @@ -29,7 +30,10 @@ public interface PosMallConfigService { * @param tenantId * @return */ + @Deprecated PosMallConfig getByTenantId(String tenantId); + + PosMallConfig getByTenantInfo(TenantEntity tenantEntity); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/PushLimitService.java b/mallinkService/src/main/java/com/iformall/service/PushLimitService.java index 9431f2fa9..e3107d529 100644 --- a/mallinkService/src/main/java/com/iformall/service/PushLimitService.java +++ b/mallinkService/src/main/java/com/iformall/service/PushLimitService.java @@ -1,19 +1,17 @@ package com.iformall.service; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PushLimit; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.base.TenantEntity; public interface PushLimitService { /** * 获取租户的PushLimit * - * @param tenantId + * @param tenantEntity * @return */ - PushLimit getPushLimit(String tenantId); + PushLimit getPushLimit(TenantEntity tenantEntity); /** * 保存或更新实体 @@ -24,25 +22,25 @@ public interface PushLimitService { /** * 检查发送时间 - * @param tenantId + * @param tenantEntity * @return */ - boolean checkSendTime(String tenantId); + boolean checkSendTime(TenantEntity tenantEntity); /** * 发短信检查 - * @param tenantId + * @param tenantEntity * @return */ - boolean checkMsg(String tenantId); + boolean checkMsg(TenantEntity tenantEntity); /** * 主动发券检查 - * @param tenantId + * @param tenantEntity * @param cUserId * @param couponId * @return */ - boolean checkCoupon(String tenantId, Long cUserId, Long couponId); + boolean checkCoupon(TenantEntity tenantEntity, Long cUserId, Long couponId); } diff --git a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java index e8a089bad..f27221e95 100644 --- a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java +++ b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.amazonaws.services.s3.model.ObjectMetadata; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -13,14 +14,14 @@ import java.util.Map; @Service public interface QrCodeService { - void downQrCode(String tenantId,HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException; + void downQrCode(TenantEntity tenantEntity, HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException; ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, - String tenantId, int type, String pageUrl, String sceneParam, + TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name); - ResultData uploadQrcode(String tenantId, int type, String pageUrl, String sceneParam, + ResultData uploadQrcode(TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name); - ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId); + ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java index 9a378261a..4be4fc2ed 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.base.TenantEntity; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,7 +48,7 @@ public interface WxAppinfoService { * 获取c端小程序信息 * @return */ - WxAppinfo getCAppInfo(String tenantId); + WxAppinfo getCAppInfo(TenantEntity tenantEntity); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index c1444014a..bcd11e730 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -78,8 +78,8 @@ public interface WxBillAllService { void exportTemplate(WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response); - void importBill(String tenantId, String importKey, WxBillExcelTemplate bill, MallUserInfo user); + void importBill(String importKey, WxBillExcelTemplate bill, MallUserInfo user); - void importBillOther(String tenantId, String importKey, WxBillExcelTemplateOther bill, MallUserInfo user); + void importBillOther(String importKey, WxBillExcelTemplateOther bill, MallUserInfo user); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index e67abb6f3..b4ae24519 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -15,12 +15,12 @@ import java.util.Map; */ public interface WxBillDailyService { - /** + /** * 根据实体查询分页列表 * - * @param offset - * @param limit * @param record + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize); @@ -34,14 +34,14 @@ public interface WxBillDailyService { * @return */ WxBillDaily getById(Long id); - - /** + + /** * 保存或更新实体 * - * @param record - * @param user - */ - ResultData saveOrUpdate(WxBillDaily record, MallUserInfo user); + * @param record + * @param user + */ + ResultData saveOrUpdate(WxBillDaily record, MallUserInfo user); /** * 根据Id删除实体 @@ -53,7 +53,7 @@ public interface WxBillDailyService { ResultData updatePaid(Long id); - void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId); + void exportTemplate(HttpServletRequest request, HttpServletResponse response, MallUserInfo user); void insertData(WxBillDailyVo billDaily, String importKey, MallUserInfo user); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 2cacca8ce..a4e80fdb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -3,13 +3,11 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxBillRent; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; /** * @author gongbiao @@ -61,7 +59,7 @@ public interface WxBillPropertyService { void deleteById(Long id); - PageInfo findByPropertyContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize); + PageInfo findByPropertyContractId(Long id, TenantEntity tenantEntity, Integer pageIndex, Integer pageSize); ResultData updatePaid(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 4a5e0d701..d2e471766 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -57,7 +57,7 @@ public interface WxBillRentService { void deleteById(Long id); - PageInfo findByRentContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize); + PageInfo findByRentContractId(WxBillRent record, Integer pageIndex, Integer pageSize); ResultData updatePaid(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java index b2c8bc18f..4b63fbde5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java @@ -2,8 +2,8 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBrand; -import com.iformall.domain.po.WxShop; import java.io.Serializable; import java.util.Collection; @@ -47,8 +47,13 @@ public interface WxBrandService { ResultData update(WxBrand wxBrand); - List> queryBrand(String id); + List> queryBrand(TenantEntity tenantEntity); - ResultData hasBrand(String tenantId, String name, Long id); + /** + * 检查是否有重复的名称 + * @param wxBrand + * @return + */ + ResultData hasBrand(WxBrand wxBrand); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 3dcc72f14..315d4c027 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -2,7 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxBrand; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import java.io.Serializable; @@ -35,7 +35,7 @@ public interface WxBusinessService { * * @return */ - List findListAll(String tenantId, Integer filter); + List findListAll(TenantEntity tenantEntity, Integer filter); /** * 根据Id获得实体 @@ -48,7 +48,6 @@ public interface WxBusinessService { List getByIds(Collection ids); - List> businessDataList(WxBusiness wxBusiness,Long userid); ResultData devoteList(WxBusiness wxBusiness,Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index d24401c81..ff0fdeab5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -6,6 +6,8 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.CUserBaseInfoT; import com.iformall.domain.vo.UserCountVo; import com.iformall.domain.vo.WxTagsGroupVo; @@ -21,10 +23,10 @@ public interface WxCUserBasicInfoService { * @return */ - List listFilters(String tenantId); - long countByFilter(String tenantId, List filterList); - List listByFilter(String tenantId, List filterList); - List listByFilterList(String tenantId, List filterList); + List listFilters(TenantEntity tenantEntity); + long countByFilter(TenantEntity tenantEntity, List filterList); + List listByFilter(TenantEntity tenantEntity, List filterList); + List listByFilterList(TenantEntity tenantEntity, List filterList); /** * 根据实体查询分页列表 * @@ -78,8 +80,8 @@ public interface WxCUserBasicInfoService { */ void deleteById(Long id); - List findByPhone(String tenantId, String phone); - WxCUserBasicInfo findInfoByPhone(String tenantId, String phone); + List findByPhone(TenantEntity tenantEntity, String phone); + WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone); /** * 修改会员积分 @@ -116,9 +118,9 @@ public interface WxCUserBasicInfoService { void exportData(WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response); - void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId); + void exportTemplate(HttpServletRequest request, HttpServletResponse response); - void importOneMem(String tenantId, String importKey, List tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); + void importOneMem(String importKey, List tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); long findCount(WxCUserBasicInfoDto dto); List findCountHistory(WxCUserBasicInfoDto dto); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java index 082433c86..7b950ef7e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserTags; import com.iformall.domain.po.WxTags; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAssignTagsTrigger; import java.util.Date; @@ -41,9 +42,9 @@ public interface WxCUserTagsService { */ void deleteById(Long id); - long countUser(String tenantId, Long tagId, Date startTime, Date endTime ); + long countUser(TenantEntity tenantEntity, Long tagId, Date startTime, Date endTime ); - List findTagList(String tenantId, List tagIds); + List findTagList(TenantEntity tenantEntity, List tagIds); List assignTags(List tagIdList, WxCUserBasicInfo user); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java index bc50f1794..6ea5098eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCampaign; +import com.iformall.domain.po.base.TenantEntity; import javax.servlet.http.HttpServletResponse; @@ -57,7 +58,7 @@ public interface WxCampaignService { */ void deleteById(Long id); - int getMaxSortNum(String tenantId); + int getMaxSortNum(TenantEntity tenantEntity); ResultData updateStatus(WxCampaign wxCampaign); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index ec9006260..29d369d0f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.PromotionCalc; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.exception.MallinkException; @@ -79,10 +80,9 @@ public interface WxCardSpendService { /** * 卡完结 * - * @param tenantId - * @param cardId + * @param cardInfo */ - int finishCard(String tenantId, Long cardId); + int finishCard(WxCardInfo cardInfo); /** * 根据Id删除实体 @@ -93,11 +93,11 @@ public interface WxCardSpendService { /** * cardPay分账 - * @param tenantId + * @param tenantEntity * @param orderId * @param cardSpendId */ - void shareForCardPay(String tenantId, Long cardId, Long orderId, Long cardSpendId); + void shareForCardPay(TenantEntity tenantEntity, Long cardId, Long orderId, Long cardSpendId); /** * cardPay交易流水导出 diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java index 028aafae9..e18935e21 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java @@ -1,10 +1,10 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCouponActionLog; import com.iformall.domain.vo.WxCouponActionLogVo; -import java.util.List; import java.util.Map; public interface WxCouponActionLogService { @@ -13,8 +13,8 @@ public interface WxCouponActionLogService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxCouponActionLog record, Integer pageIndex, Integer pageSize); @@ -42,10 +42,10 @@ public interface WxCouponActionLogService { void deleteById(Long id); - void addOne(String tenantId,Long couponId,Long coupon_order_id,int channelType,Long channelId); + void addOne(TenantEntity tenantEntity,Long couponId,Long coupon_order_id,int channelType,Long channelId); - int getCountByChannelId(String tenantId, int channelType, Long channelId); + int getCountByChannelId(TenantEntity tenantEntity, int channelType, Long channelId); /** * 查找注券记录 diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 02d6991ba..4665ea053 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -33,7 +34,7 @@ public interface WxCouponChannelService { /** - * 查询商户的卷信息 + * 查询商户的券信息 * @param record * @param pageIndex * @param pageSize @@ -68,9 +69,9 @@ public interface WxCouponChannelService { */ ResultData saveOrUpdate(WxCouponChannel record); - ResultData addBatch(String[] ids, String[] channelId, String tanantId, Date beginTime, Date endTime); + ResultData addBatch(String[] ids, String[] channelId, TenantEntity tenantEntity, Date beginTime, Date endTime); - void updateStatusByCouponId(Long couponId,String tenantId,int status); + void updateStatusByCouponId(Long couponId,TenantEntity tenantEntity,int status); ResultData change(WxCouponChannel wxCouponChannel); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index de22711c8..aba815a45 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -3,10 +3,8 @@ package com.iformall.service; import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCouponOrder; -import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import javax.servlet.http.HttpServletRequest; @@ -60,7 +58,7 @@ public interface WxCouponOrderService { /** * 核销后发送消息 */ - void sendInsideCouponVerifyMsg(String tenantId, Long couponOrderId, Long buUserId); + void sendInsideCouponVerifyMsg(TenantEntity tenantEntity, Long couponOrderId, Long buUserId); /** * 核销后处理 @@ -79,11 +77,11 @@ public interface WxCouponOrderService { /** * B端刷卡支付发券 - * @param tenantId + * @param tenantEntity * @param orderId * @param cUserId */ - boolean sendCouponAfterMicroPay(String tenantId, Long orderId, Long cUserId); + boolean sendCouponAfterMicroPay(TenantEntity tenantEntity, Long orderId, Long cUserId); /** * 核销分账 @@ -158,12 +156,12 @@ public interface WxCouponOrderService { /** * 日期分组 消费总数 - * @param tenantId + * @param tenantEntity * @param startTime * @param endTime * @return */ - List queryPriceTotalGroup(String tenantId, Date startTime,Date endTime); + List queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime); /** * 查询消费额 * @return @@ -198,8 +196,13 @@ public interface WxCouponOrderService { */ JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUser cUser, Integer price); - Integer microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer price); + WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer price); Integer microPayVerify(WxMerchantBUser bUser, Long couponOrderId); + /** + * 尚安停车 + */ + Integer shangAnVerify(Long couponOrderId); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java index 62d77eba9..5f8006d66 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import javax.servlet.http.HttpServletRequest; @@ -52,11 +53,11 @@ public interface WxCouponPasswordService { /** * 生产卡密 - * @param tenantId + * @param tenantEntity * @param couponId * @param inventory */ - void mkPasswords(String tenantId, Long couponId, Integer inventory); + void mkPasswords(TenantEntity tenantEntity, Long couponId, Integer inventory); /** * 导出兑换码 diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java index e49200f15..675250a9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java @@ -1,13 +1,11 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxCUser; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.enums.EnumCouponSendSendType; -import javax.validation.constraints.NotNull; - public interface WxCouponSendService { /** @@ -56,22 +54,22 @@ public interface WxCouponSendService { */ boolean sendCouponToUser(EnumCouponSendSendType type, Object param); - void updateStatusByCouponId(Long couponId,String tenantId, int status); + void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status); /** * 添加或更新生日券配置 * @param beforeDays * @param sendType - * @param tenantId + * @param tenantEntity */ - void saveOrUpdateConfig(Integer beforeDays, Integer sendType, String tenantId) ; + void saveOrUpdateConfig(Integer beforeDays, Integer sendType, TenantEntity tenantEntity) ; /** * 获取生日券配置 * @param sendType - * @param tenantId + * @param tenantEntity * @return */ - WxCouponSend getConfig(Integer sendType,String tenantId) ; + WxCouponSend getConfig(Integer sendType,TenantEntity tenantEntity) ; /** * 商户注券 库存减少 diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 63c3b7d57..aec2933b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -31,7 +31,7 @@ public interface WxCouponService { PageInfo findCountData(WxCoupon record, Integer pageNum, Integer pageSize); /** - * 卷列表,包括统计 + * 券列表,包括统计 * @param record * @return */ @@ -110,45 +110,45 @@ public interface WxCouponService { */ String findSubsidyMoney(WxCoupon wxCoupon); - //----------------卷-------------- + //----------------券-------------- /** - * 卷发放数量 + * 券发放数量 * @return */ //List findCouponSendCount(WxCoupon wxCoupon); /** - * 卷购买数量 + * 券购买数量 * @return */ List findCouponOrderCount(WxCoupon wxCoupon); /** - * 卷领取数量 + * 券领取数量 * @return */ //List findCouponGetCount(WxCoupon wxCoupon); /** - * 卷核销数量 + * 券核销数量 * @return */ List findCouponPaymentCount(WxCoupon wxCoupon); /** - * 有价卷销售数量 + * 有价券销售数量 * @return */ List priceCouponSaleCount(WxCoupon wxCoupon); /** - * 有价卷核销数量 + * 有价券核销数量 * @return */ List priceCouponPaymentCount(WxCoupon wxCoupon); /** - * 有价卷退款数量 + * 有价券退款数量 * @return */ Long priceCouponCancelCount(WxCoupon wxCoupon); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index 7b4a32093..d53f182f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; @@ -67,7 +68,7 @@ public interface WxCreditHistoryService { */ void deleteById(Long id); - Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId,String tenantId); + Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity); void clearCreditByYear(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index ce39c1b2b..4f83c9d32 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxFlowConfig; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; @@ -15,7 +16,7 @@ import java.util.Map; * 流程审批服务 */ public interface WxFlowService { - WxFlowModel getModelByType(int flowType,String tenantId); + WxFlowModel getModelByType(int flowType,TenantEntity tenantEntity); /** * 更新业务数据状态 @@ -24,14 +25,14 @@ public interface WxFlowService { */ void updateBusinessStatus(Map mapInfo,Integer applyStatus); - ResultData getTaskStatusList(Long businessId,String tenantId); + ResultData getTaskStatusList(Long businessId,TenantEntity tenantEntity); /** * 启动流程 * @param params * @return */ - ResultData start(Map params,Long userId,String userName,String tenantId); + ResultData start(Map params, Long userId, String userName, TenantEntity tenantEntity); /** * 分页代办列表 @@ -40,28 +41,28 @@ public interface WxFlowService { * @param pageSize * @return */ - ResultData list(String flowType,Integer pageNum, Integer pageSize,Long userId,String tenantId); + ResultData list(String flowType,Integer pageNum, Integer pageSize,Long userId,TenantEntity tenantEntity); /** * 审批历史 * @param businessId * @return */ - ResultData applyHistory(Long businessId,String tenantId); + ResultData applyHistory(Long businessId,TenantEntity tenantEntity); /** * 审批 * @param params * @return */ - ResultData apply(@RequestBody Map params,Long userId,String userName,String tenantId); + ResultData apply(@RequestBody Map params,Long userId,String userName,TenantEntity tenantEntity); /** * 驳回 * @param params * @return */ - ResultData reject(@RequestBody Map params,Long userId,String userName,String userPhone,String tenantId); + ResultData reject(@RequestBody Map params,Long userId,String userName,String userPhone,TenantEntity tenantEntity); /** * 撤回 @@ -126,6 +127,6 @@ public interface WxFlowService { */ List getModelBybusiness(WxFlowModel wxFlowModel); - ResultData getTotal(Long userId, String tenantId); + ResultData getTotal(Long userId, TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index da28d3d6b..332c9a86b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxLevelMerchant; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxLevelMerchantCVo; import java.util.List; @@ -25,14 +26,17 @@ public interface WxLevelConfigService { List listByMerchantId(Long merchantId, WxLevelConfig record); - void batchSaveByMerchantId(String tenantId, Long merchantId, List records); + void batchSaveByMerchantId(TenantEntity tenantEntity, Long merchantId, List records); /** * getByTenantId * @param tenantId * @return */ + @Deprecated List getByTenantId(String tenantId); + + List getByTenantInfo(TenantEntity tenantEntity); /** * 根据Id获得实体 @@ -52,13 +56,13 @@ public interface WxLevelConfigService { /** * 批量保存 */ - void batchSave(String tenantId, List records); + void batchSave(TenantEntity tenantEntity, List records); /** * 批量更新 */ - void batchUpdateCapabilities(String tenantId, List records); + void batchUpdateCapabilities(TenantEntity tenantEntity, List records); Long getCapabilitiesOfSendCarConpon(JSONObject jo); /** * 根据Id删除实体 @@ -68,14 +72,14 @@ public interface WxLevelConfigService { void deleteById(Long id); - void deleteAll(String tenantId); + void deleteAll(TenantEntity tenantEntity); /** * 根据积分获取会员等级 - * @param tenantId + * @param tenantEntity * @param score * @return */ - String getLevel(String tenantId,int score); + String getLevel(TenantEntity tenantEntity,int score); /** diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java index b75de2a71..09914471d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMallBuildingFloorDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; @@ -40,10 +41,9 @@ public interface WxMallBuildingService { */ void deleteById(Long id); + ResultData getBuildingList(TenantEntity tenantEntity); - ResultData getbuildinglist(String tenantId); - - ResultData getbuildingfloorlist(String tenantId); + ResultData getBuildingFloorList(TenantEntity tenantEntity); /** * 新增楼层楼座 diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java index b5ea153d2..1ff8cea04 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallFloor; public interface WxMallFloorService { @@ -10,8 +11,8 @@ public interface WxMallFloorService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxMallFloor record, Integer pageIndex, Integer pageSize); @@ -39,6 +40,6 @@ public interface WxMallFloorService { void deleteById(Long id); - ResultData getfloorlist(String tenantId, Long buildingId); + ResultData getFloorList(TenantEntity tenantEntity, Long buildingId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 66c061bff..6c4c786f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -1,8 +1,11 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMall; +import java.util.List; + public interface WxMallService { /** @@ -45,12 +48,18 @@ public interface WxMallService { void deleteById(Long id); /** - * 根据tenant Id查寻 - * - * @param id + * 根据TenantId查询 + * @param tenantEntity + * @return */ + WxMall getByTenantInfo(TenantEntity tenantEntity); + + WxMall getByTenantInfoExt(TenantEntity tenantEntity); + + @Deprecated WxMall getByTenantId(String id); + @Deprecated WxMall getByTenantIdExt(String id); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java index 4adc85da5..c4dabafee 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMerchantBUser; public interface WxMerchantBUserService { @@ -55,8 +56,8 @@ public interface WxMerchantBUserService { void deleteById(Long id); - boolean hasphone(String phone, String tenantId); + boolean hasPhone(TenantEntity tenantEntity, String phone); - ResultData updatepwd(String appId, String phone, String code, String pwd); + ResultData updatePwd(String appId, String phone, String code, String pwd); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 5fc8b49c5..ac8d4328b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -3,7 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; -import com.iformall.domain.po.WxBillOtherDeposit; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantSimpleVo; @@ -87,10 +87,10 @@ public interface WxMerchantService { /** * 查询商户列表 - * @param tenantId + * @param tenantEntity * @return */ - List findList(String tenantId); + List findList(TenantEntity tenantEntity); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 3f812b3b5..a7a91a317 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.vo.WxMerchantTradeDailyVo; @@ -72,7 +73,7 @@ public interface WxMerchantTradeDailyService { /** * 获取近30日解单数据(总额) ADMIN 端 */ - ResultData getVolumeTotalOfMonth(String tenantId); + ResultData getVolumeTotalOfMonth(TenantEntity tenantEntity); /** * 根据实体查询分页列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java index 217bf819b..910dbcc58 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMsgModel; public interface WxMsgModelService { @@ -10,8 +11,8 @@ public interface WxMsgModelService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxMsgModel record, Integer pageIndex, Integer pageSize); @@ -40,7 +41,7 @@ public interface WxMsgModelService { - ResultData getmodellist(String tenantId); + ResultData getModelList(TenantEntity tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java index 4651a999a..d74e4b655 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMsgSignatureService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMsgSignature; public interface WxMsgSignatureService { @@ -10,8 +11,8 @@ public interface WxMsgSignatureService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxMsgSignature record, Integer pageIndex, Integer pageSize); @@ -39,6 +40,6 @@ public interface WxMsgSignatureService { void deleteById(Long id); - ResultData getsignaturelist(String tenantId); + ResultData getSignatureList(TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index e662b4040..ee9867681 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.OrderSaveDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.domain.vo.WxOrderCouponPressVo; import com.iformall.domain.vo.WxOrderCouponVo; @@ -140,11 +141,11 @@ public interface WxOrderService { * @param orderId * @param payOrderId */ - void shareForMicroPay(String tenantId, Long orderId, Long payOrderId); + void shareForMicroPay(TenantEntity tenantEntity, Long orderId, Long payOrderId); PageInfo listOrderAsPage(WxOrderQueryVo wxOrder, Integer pageNum, Integer pageSize); - Map queryOrderSummary(String tenantId); + Map queryOrderSummary(TenantEntity tenantEntity); /** * 砍价订单 @@ -153,13 +154,13 @@ public interface WxOrderService { WxOrderCouponPressVo detailPressVo(WxOrder record); - void updateStatusByPressCouponId(Long couponId,String tenantId,int orderStatus); + void updateStatusByPressCouponId(Long couponId, TenantEntity tenantEntity,int orderStatus); void updateOrderStatus(WxOrder order); - void updateOrderGroupStatusByCouponId(Long id, String tenantId, Integer code); + void updateOrderGroupStatusByCouponId(Long id, TenantEntity tenantEntity, Integer code); - void updateOrderGroupStatusByCouponChannelId(Long id, String tenantId, Integer code); + void updateOrderGroupStatusByCouponChannelId(Long id, TenantEntity tenantEntity, Integer code); /** diff --git a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java index 35a423b4c..1b97adf1e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPayAccountBillService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxPayAccountBill; public interface WxPayAccountBillService { @@ -26,10 +27,10 @@ public interface WxPayAccountBillService { /** * 根据tenantId获得实体 * - * @param tenantId + * @param tenantEntity * @return */ - WxPayAccountBill getByTenantId(String tenantId); + WxPayAccountBill getByTenantInfo(TenantEntity tenantEntity); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java index 02530a12d..351437f85 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPowerBillAutoConfigService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxPowerBillAutoConfig; /** @@ -22,10 +23,10 @@ public interface WxPowerBillAutoConfigService { /** * 根据tenantId获得实体 * - * @param tenantId + * @param tenantEntity * @return */ - WxPowerBillAutoConfig getConfig(String tenantId); + WxPowerBillAutoConfig getConfig(TenantEntity tenantEntity); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java index d9336eb96..2413e27ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.WxProfitSharingOrder; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxProfitSharingOrderQueryVo; import com.iformall.domain.vo.WxProfitSharingOrderVo; @@ -35,7 +36,7 @@ public interface WxProfitSharingOrderService { PageInfo listAsPage(WxProfitSharingOrderQueryVo order, Integer pageNum, Integer pageSize); - Map queryOrderSummary(String tenantId); + Map queryOrderSummary(TenantEntity tenantEntity); ResultData findOrderDetails(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java index fdc6b22cf..1ea6e6710 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java @@ -4,6 +4,7 @@ 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 java.util.List; @@ -49,6 +50,6 @@ public interface WxProfitSharingReceiverService { ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); - void sendMsg(String phone, String account, String merchant, String time, Integer modelType, String tenantId); + void sendMsg(String phone, String account, String merchant, String time, Integer modelType, TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 388547430..a131855c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -50,7 +50,7 @@ public interface WxPropertyContractService { void deleteById(Long id); - void download(HttpServletRequest request, HttpServletResponse response, String tenantId); + void download(HttpServletRequest request, HttpServletResponse response); Object getRentContractStatusInfo(WxPropertyContract record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 39532b750..c3f791d8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -52,7 +53,7 @@ public interface WxRentContractService { ResultData deleteById(String id); - void download(HttpServletRequest request, HttpServletResponse response, String tenantId); + void download(HttpServletRequest request, HttpServletResponse response); Object getRentContractStatusInfo(WxRentContract record); @@ -62,7 +63,7 @@ public interface WxRentContractService { Object getRentContractList(WxRentContract rentContract, Integer pageNum, Integer pageSize); - void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id); + void exportContract(HttpServletRequest request, HttpServletResponse response, Long id); ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate); @@ -94,7 +95,7 @@ public interface WxRentContractService { WxRentContract getByBill(WxBillRent billRent); - Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp,String tenantId); + Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp, TenantEntity tenantEntity); int selectContractCountByShopId(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java b/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java index 35a1464cf..12c1d4684 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.iformall.domain.po.WxScoreHistory; import com.iformall.domain.po.WxScoreRules; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumScoreType; import java.util.List; @@ -10,17 +11,17 @@ public interface WxScoreRulesService { /** * 获取租户的ScoreRules - * @param tenantId + * @param tenantEntity * @return */ - WxScoreRules getScoreRules(String tenantId); + WxScoreRules getScoreRules(TenantEntity tenantEntity); /** * 获取租户的积分规则 - * @param tenantId + * @param tenantEntity * @return */ - WxScoreRules getCreditRules(String tenantId); + WxScoreRules getCreditRules(TenantEntity tenantEntity); /** * 保存或更新实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java b/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java index 17bb68bb1..dfcc1a7ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxScreenAdService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxScreenAd; import java.util.List; @@ -56,7 +57,7 @@ public interface WxScreenAdService { - void updateStatusByCouponChannelId(Long couponChannelId, String tenantId, int status); + void updateStatusByCouponChannelId(Long couponChannelId, TenantEntity tenantEntity, int status); - void updateStatusByCouponId(Long couponId, String tenantId, int status); + void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index 39dc18622..e740eb44c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.base.TenantEntity; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -19,8 +21,8 @@ public interface WxShopService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxShop record, Integer pageIndex, Integer pageSize); @@ -54,12 +56,11 @@ public interface WxShopService { */ ResultData deleteById(Long id, Integer isAdmin); + ResultData getShopList(TenantEntity tenantEntity, String shopNumber); - ResultData getbshoplist(String tenantId, String shopNumber); - - ResultData getMerchantShopByShopId(String tenantId, String shopId); + ResultData getMerchantShopByShopId(TenantEntity tenantEntity, String shopId); - ResultData hasShopNumber(String tenantId, String shopNumber, Long id, Integer type); + ResultData hasShopNumber(WxShop wxShop); PageInfo> listShopFromContract(WxShop wxShop, Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index f85ed8528..9e2e58090 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -74,10 +75,10 @@ public class DataTowerServiceImpl implements DataTowerService { //出租与未出租*********************************************** - private Map shopRunning(String tenantId) { + private Map shopRunning(TenantEntity tenantEntity) { WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); + wxShop.updateTenantInfo(tenantEntity); wxShop.setStatus(EnumShopStatus.RENT.getCode()); List rentedList = wxShopMapper.findList(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); @@ -104,11 +105,11 @@ public class DataTowerServiceImpl implements DataTowerService { } //租金*********************************************** - private Map rentRunning(String tenantId) { + private Map rentRunning(TenantEntity tenantEntity) { HashMap rentMap = new HashMap<>(); Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); Calendar instance = Calendar.getInstance(); instance.set(Calendar.DAY_OF_YEAR, 1); @@ -144,16 +145,16 @@ public class DataTowerServiceImpl implements DataTowerService { } //上报解单*********************************************** - private Map reportRunning(String tenantId) { + private Map reportRunning(TenantEntity tenantEntity) { HashMap reportMap = new HashMap<>(); WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(tenantId); + wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); String reportDate = DateUtils.getTimeBefore(1, new Date()); wxMerchantTradeDaily.setReportDate(reportDate); List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); @@ -175,10 +176,10 @@ public class DataTowerServiceImpl implements DataTowerService { //今日车流量*********************************************** - private Map carRunning(String tenantId) { + private Map carRunning(TenantEntity tenantEntity) { HashMap carMap = new HashMap<>(); HashMap paramsCar = new HashMap<>(); - paramsCar.put("tenantId", tenantId); + paramsCar.put("tenantId", tenantEntity.getTenantId()); paramsCar.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); String startdate = DateUtils.getTimeBefore(30, new Date()); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); @@ -235,7 +236,7 @@ public class DataTowerServiceImpl implements DataTowerService { } //今日券数据*********************************************** - private Map couponRunning(String tenantId) { + private Map couponRunning(TenantEntity tenantEntity) { HashMap couponMap = new HashMap<>(); Calendar cal = Calendar.getInstance(); @@ -249,7 +250,7 @@ public class DataTowerServiceImpl implements DataTowerService { Date endTime = cal.getTime(); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); long orderedCount = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -258,7 +259,7 @@ public class DataTowerServiceImpl implements DataTowerService { couponMap.put("verifiedCount", verifiedCount); couponMap.put("orderedCount", orderedCount); WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(tenantId); + wxCouponChannel.updateTenantInfo(tenantEntity); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); long couponCount = wxCouponChannelMapper.countCoupon(wxCouponChannel); couponMap.put("couponCount", couponCount); @@ -267,7 +268,7 @@ public class DataTowerServiceImpl implements DataTowerService { } //今日客流*********************************************** - private Map visitorRunning(String tenantId) { + private Map visitorRunning(TenantEntity tenantEntity) { HashMap visitorMap = new HashMap<>(); visitorMap.put("todayCount", "--"); visitorMap.put("increasedPercent", "--"); @@ -276,11 +277,11 @@ public class DataTowerServiceImpl implements DataTowerService { } //合同*********************************************** - private Map contractRunning(String tenantId) { + private Map contractRunning(TenantEntity tenantEntity) { Map contractMap = new HashMap(); WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(tenantId); + wxRentContract.updateTenantInfo(tenantEntity); //待签约 wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); @@ -306,11 +307,11 @@ public class DataTowerServiceImpl implements DataTowerService { } //短信*********************************************** - private Map messageRunning(String tenantId) { + private Map messageRunning(TenantEntity tenantEntity) { HashMap messageMap = new HashMap<>(); WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(wxMsgConfig.getTenantId()); + wxMsgConfig.updateTenantInfo(tenantEntity); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); long usedCount = 0; @@ -331,10 +332,10 @@ public class DataTowerServiceImpl implements DataTowerService { } //账单*********************************************** - private Map billRunning(String tenantId) { + private Map billRunning(TenantEntity tenantEntity) { HashMap billMap = new HashMap<>(); WxBillAll record = new WxBillAll(); - record.setTenantId(tenantId); + record.updateTenantInfo(tenantEntity); Calendar instance = Calendar.getInstance(); instance.set(Calendar.DAY_OF_YEAR, 1); instance.set(Calendar.HOUR_OF_DAY, 0); @@ -357,41 +358,41 @@ public class DataTowerServiceImpl implements DataTowerService { //移动端首页 @Override - public Map queryRunningMobile(String tenantId) { + public Map queryRunningMobile(TenantEntity tenantEntity) { HashMap dataMap = new HashMap<>(); - dataMap.put("shop", shopRunning(tenantId)); - dataMap.put("rent", rentRunning(tenantId)); - dataMap.put("report", reportRunning(tenantId)); - dataMap.put("car", carRunning(tenantId)); - dataMap.put("coupon", couponRunning(tenantId)); - dataMap.put("visitor", visitorRunning(tenantId)); + dataMap.put("shop", shopRunning(tenantEntity)); + dataMap.put("rent", rentRunning(tenantEntity)); + dataMap.put("report", reportRunning(tenantEntity)); + dataMap.put("car", carRunning(tenantEntity)); + dataMap.put("coupon", couponRunning(tenantEntity)); + dataMap.put("visitor", visitorRunning(tenantEntity)); return dataMap; } //登陆页数据快速概览 @Override - public Map queryRunningPotal(String tenantId) { + public Map queryRunningPotal(TenantEntity tenantEntity) { HashMap dataMap = new HashMap<>(); - dataMap.put("shop", shopRunning(tenantId)); - dataMap.put("rent", rentRunning(tenantId)); - dataMap.put("report", reportRunning(tenantId)); - dataMap.put("car", carRunning(tenantId)); - dataMap.put("coupon", couponRunning(tenantId)); - dataMap.put("visitor", visitorRunning(tenantId)); - dataMap.put("contract", contractRunning(tenantId)); - dataMap.put("message", messageRunning(tenantId)); - dataMap.put("bill", billRunning(tenantId)); + dataMap.put("shop", shopRunning(tenantEntity)); + dataMap.put("rent", rentRunning(tenantEntity)); + dataMap.put("report", reportRunning(tenantEntity)); + dataMap.put("car", carRunning(tenantEntity)); + dataMap.put("coupon", couponRunning(tenantEntity)); + dataMap.put("visitor", visitorRunning(tenantEntity)); + dataMap.put("contract", contractRunning(tenantEntity)); + dataMap.put("message", messageRunning(tenantEntity)); + dataMap.put("bill", billRunning(tenantEntity)); return dataMap; } @Override - public Map queryRunning(String tenantId) { + public Map queryRunning(TenantEntity tenantEntity) { WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); + wxShop.updateTenantInfo(tenantEntity); wxShop.setStatus(EnumShopStatus.RENT.getCode()); List yczlist = wxShopMapper.findList(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); @@ -420,7 +421,7 @@ public class DataTowerServiceImpl implements DataTowerService { //租金 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); Calendar instance = Calendar.getInstance(); instance.set(Calendar.DAY_OF_YEAR, 1); instance.set(Calendar.HOUR_OF_DAY, 0); @@ -454,12 +455,12 @@ public class DataTowerServiceImpl implements DataTowerService { //上报 WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(tenantId); + wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(1); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); String reportdate = DateUtils.getTimeBefore(1, new Date()); wxMerchantTradeDaily.setReportDate(reportdate); List tradelist = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); @@ -480,10 +481,10 @@ public class DataTowerServiceImpl implements DataTowerService { } @Override - public Map queryCar(String tenantId) { + public Map queryCar(TenantEntity tenantEntity) { logger.info("停车-月统计-开始"); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); String startdate = DateUtils.getTimeBefore(30, new Date()); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); @@ -517,7 +518,7 @@ public class DataTowerServiceImpl implements DataTowerService { // 查询近一周的缴费车辆----start------ logger.info("停车-查询近一周的缴费车辆-开始"); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -576,7 +577,7 @@ public class DataTowerServiceImpl implements DataTowerService { logger.info("停车-近一周新增停车会员数-开始"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); try { wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate+ " 00:00:00")); wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate+ " 23:59:59")); @@ -588,7 +589,7 @@ public class DataTowerServiceImpl implements DataTowerService { //停车会员总数 logger.info("停车-停车会员总数-开始"); wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); datamap.put("newCarUserSumCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); logger.info("停车-停车会员总数-结束"); @@ -687,7 +688,7 @@ public class DataTowerServiceImpl implements DataTowerService { //绑定车牌 logger.info("停车-绑定车牌-开始"); Map carParams=new HashMap<>(); - carParams.put("tenantId",tenantId); + carParams.put("tenantId",tenantEntity.getTenantId()); carParams.put("startdate",DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); carParams.put("enddate",DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); long todaybindcar = wxCUserCarMapper.queryCarCount(carParams); @@ -721,9 +722,9 @@ public class DataTowerServiceImpl implements DataTowerService { } @Override - public Map queryCustomer(String tenantId) { + public Map queryCustomer(TenantEntity tenantEntity) { WxWiWideInfo wiWideInfo = new WxWiWideInfo(); - wiWideInfo.setTenantId(tenantId); + wiWideInfo.updateTenantInfo(tenantEntity); List list = wxWiwideInfoMapper.findList(wiWideInfo); Map datamap = new HashMap<>(2); if(list.size()>0){ @@ -770,9 +771,9 @@ public class DataTowerServiceImpl implements DataTowerService { } @Override - public ResultData queryCustomerData(String tenantId, Map params) { + public ResultData queryCustomerData(TenantEntity tenantEntity, Map params) { WxWiWideInfo wiWideInfo = new WxWiWideInfo(); - wiWideInfo.setTenantId(tenantId); + wiWideInfo.updateTenantInfo(tenantEntity); List list = wxWiwideInfoMapper.findList(wiWideInfo); if (list.isEmpty()){ return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index afd3f9f0b..871e0840c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -88,7 +88,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { public List queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav) { List mpList = new ArrayList(); if(userInfo.isFmSuperAdmin() || - userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + userInfo.checkAdmin()) { List mps = getAllMenuListByParentId(parentId, null, boolNav); mps.stream().forEach(mp->{ mpList.add(mp.getId()); @@ -110,7 +110,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { // 富茂系统管理员,返回所有菜单 return getAllMenuListByParentId(parentId, null, boolNav); } - else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + else if(userInfo.checkAdmin()) { // 租户超管 String menus = wxMallMapper.queryMenusByTenantId(userInfo.getTenantId()); JSONArray menuIdList = JSON.parseArray(menus); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java index 6dc486518..65e8768e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.MallRolePermission; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.mapper.MallRolePermissionMapper; import com.iformall.service.MallRolePermissionService; @@ -59,7 +60,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService @Override - public void savePermissions(String tenantId, Long roleId, Long[] perId) { + public void savePermissions(TenantEntity tenantEntity, Long roleId, Long[] perId) { final IdWorker idWorker = IdWorker.get(); // 删除old mallUserRolePermissionMapper.deleteByRoleId(roleId); @@ -69,7 +70,7 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService MallRolePermission permission = new MallRolePermission(); permission.setId(idWorker.nextId()); permission.setPermissionId(pId); - permission.setTenantId(tenantId); + permission.updateTenantInfo(tenantEntity); permission.setRoleId(roleId); mallRolePermissionList.add(permission); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java index 5b3323551..04794a58c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserActionServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserAction; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserActionVo; import com.iformall.mapper.MallUserActionMapper; import com.iformall.service.MallUserActionService; @@ -41,11 +42,11 @@ public class MallUserActionServiceImpl implements MallUserActionService { } @Override - public void saveActionInfo(String tenantId, Integer actionType, String ipAddress, Long userId, String actionDesc) { + public void saveActionInfo(TenantEntity tenantEntity, Integer actionType, String ipAddress, Long userId, String actionDesc) { MallUserAction record = new MallUserAction(); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - record.setTenantId(tenantId); + record.updateTenantInfo(tenantEntity); record.setType(actionType); record.setIp(ipAddress); record.setUserId(userId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 977cd61b8..06d8cf43a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserRole; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.exception.MallinkException; import com.iformall.mapper.MallPermissionMapper; @@ -81,8 +82,8 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { } @Override - public MallUserInfo getByBOpenId(String openId, String tenantId) { - return mallUserInfoMapper.selectByBOpenId(openId, tenantId); + public MallUserInfo getByBOpenId(String openId, TenantEntity tenantEntity) { + return mallUserInfoMapper.selectByBOpenId(openId, tenantEntity.getTenantId()); } @Override @@ -94,8 +95,8 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { } @Override - public MallUserInfo getByPhone(String phone, String tenantId) { - return mallUserInfoMapper.selectByPhone(phone, tenantId); + public MallUserInfo getByPhone(String phone, TenantEntity tenantEntity) { + return mallUserInfoMapper.selectByPhone(phone, tenantEntity.getTenantId()); } @Override @@ -130,7 +131,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public void cleanWebOpenId(MallUserInfo user) { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); - updateUser.setTenantId(user.getTenantId()); + updateUser.updateTenantInfo(user); updateUser.setUsername(user.getUsername()); mallUserInfoMapper.removeWebOpenId(updateUser); } @@ -140,7 +141,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { public void cleanAllOpenId(MallUserInfo user) { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); - updateUser.setTenantId(user.getTenantId()); + updateUser.updateTenantInfo(user); updateUser.setUsername(user.getUsername()); mallUserInfoMapper.removeAllOpenId(updateUser); } @@ -217,7 +218,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { try { MallUserInfo updateUser = new MallUserInfo(); updateUser.setId(user.getId()); - updateUser.setTenantId(user.getTenantId()); + updateUser.updateTenantInfo(user); updateUser.setPassword(user.getPassword()); mallUserInfoMapper.updateById(updateUser); } catch (Exception e) { @@ -233,7 +234,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public boolean checkCodeValid(MallUserInfo user, String code) { WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(user); wxMsgValidationcode.setPhone(user.getPhone()); wxMsgValidationcode.setCode(code); List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 5372ed76f..c1cfd3f99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -100,7 +100,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { Long roleId = userRole.getRoleId(); MallRolePermission p = new MallRolePermission(); p.setRoleId(roleId); - p.setTenantId(userInfo.getTenantId()); + p.updateTenantInfo(userInfo); List rolePermissions = mallRolePermissionMapper.findList(p); for (MallRolePermission rp : rolePermissions) { logger.info("user permission id " + rp.getPermissionId()); @@ -123,7 +123,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { Long roleId = userRole.getRoleId(); MallRolePermission p = new MallRolePermission(); p.setRoleId(roleId); - p.setTenantId(userInfo.getTenantId()); + p.updateTenantInfo(userInfo); List rolePermissionList = mallRolePermissionMapper.findList(p); String menus = ""; for (MallRolePermission rp : rolePermissionList) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index d1059089d..c3b31f12d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxOrderReportDto; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCouponSendSendType; @@ -77,11 +78,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //取的当月券数据 @Override - public Map getCouponData(String tenantId) { + public Map getCouponData(TenantEntity tenantEntity) { //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); int todayCouponCount = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -105,7 +106,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //couponData HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List couponDatalist = wxCouponOrderMapper.couponDataMap(params); @@ -143,11 +144,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override - public Map getSceneData(String tenantId) { + public Map getSceneData(TenantEntity tenantEntity) { //今日营销投放券数 - int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(0), addDay(1)); - int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-1), addDay(0)); - int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-7), addDay(-6)); + int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(0), addDay(1)); + int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-1), addDay(0)); + int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-7), addDay(-6)); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 @@ -161,7 +162,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); //停车发券数 停车发券被核销数 核销发券数 核销发券被核销数 @@ -170,7 +171,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //停车发券被核销数 HashMap params1 = new HashMap<>(); - params1.put("tenantId", tenantId); + params1.put("tenantId", tenantEntity.getTenantId()); params1.put("startTime", addDay(-30)); params1.put("endTime", addDay(1)); params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车 @@ -179,7 +180,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //核销发券被核销数 HashMap params2 = new HashMap<>(); - params2.put("tenantId", tenantId); + params2.put("tenantId", tenantEntity.getTenantId()); params2.put("startTime", addDay(-30)); params2.put("endTime", addDay(1)); params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销 @@ -188,7 +189,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // B端刷卡支付被核销数 HashMap params3 = new HashMap<>(); - params3.put("tenantId", tenantId); + params3.put("tenantId", tenantEntity.getTenantId()); params3.put("startTime", addDay(-30)); params3.put("endTime", addDay(1)); params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付 @@ -197,7 +198,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); - params4.put("tenantId", tenantId); + params4.put("tenantId", tenantEntity.getTenantId()); params4.put("startTime", addDay(-30)); params4.put("endTime", addDay(1)); params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 @@ -263,9 +264,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public PageInfo getCouponDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + public PageInfo getCouponDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -284,7 +285,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } List couponIds = couponDatalist.stream().map(p->p.getCouponId()).distinct().collect(Collectors.toList()); WxCoupon wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(tenantId); + wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setIds(couponIds); List wxCoupons = wxCouponMapper.findList(wxCoupon); Map map = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId, p -> p)); @@ -300,13 +301,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public PageInfo getSceneDataList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + public PageInfo getSceneDataList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { MarkingCouponDataReportDto queryDto = new MarkingCouponDataReportDto(); org.springframework.beans.BeanUtils.copyProperties(markingCouponDataReportDto, queryDto); - queryDto.setTenantId(tenantId); + queryDto.updateTenantInfo(tenantEntity); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); if (markingCouponDataReportDto.getStartTime() != null) { params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); @@ -347,10 +348,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map countMap = new HashMap<>(); + params.clear(); + params.put("tenantId", tenantEntity.getTenantId()); if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //停车发券被核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -360,8 +361,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list1.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付 //B端刷卡发券 被核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -371,8 +370,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list2.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())){ //核销发券被核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -382,8 +379,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list3.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())){ //购买发数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -393,8 +388,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { countMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())){ //购买发数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -406,10 +399,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { Map triggerCountMap = new HashMap<>(); + params.clear(); + params.put("tenantId", tenantEntity.getTenantId()); if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.CAR_STOP.getCode())){ //停车 //获取车辆进场数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -420,8 +413,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); } else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付发券 //获取B端刷卡数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -431,8 +422,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) { //获取核销数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -441,8 +430,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())) { //购买发券数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -451,8 +438,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())) { //购买发券数 - params.clear(); - params.put("tenantId", tenantId); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -476,11 +461,11 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public Map getSceneDataHistory(String tenantId,String startDate, String endDate) { + public Map getSceneDataHistory(TenantEntity tenantEntity, String startDate, String endDate) { Map result = new HashedMap(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); Date starttime = DateUtils.stringToDate(startDate); markingCouponDataReportDto.setStartTime(starttime); @@ -724,9 +709,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override - public PageInfo getTouchUsersReportList(String tenantId, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { + public PageInfo getTouchUsersReportList(TenantEntity tenantEntity, MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageIndex, Integer pageSize) { //查询UV PV - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); if (markingCouponDataReportDto.getStartTime() != null) markingCouponDataReportDto.setStartTime(convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -739,7 +724,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //获取核销人数 //核销量 HashMap params2 = new HashMap<>(); - params2.put("tenantId", tenantId); + params2.put("tenantId", tenantEntity.getTenantId()); if (markingCouponDataReportDto.getStartTime() != null) params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -749,10 +734,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { } @Override - public List getTouchUsersReportData(String tenantId){ + public List getTouchUsersReportData(TenantEntity tenantEntity){ //查询UV PV HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java index 9ad908b9e..a5a1627fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosMallConfigServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.PosMallConfig; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.PosMallConfigMapper; import com.iformall.service.PosMallConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +33,12 @@ public class PosMallConfigServiceImpl implements PosMallConfigService { return config; } + @Override + public PosMallConfig getByTenantInfo(TenantEntity tenantEntity) { + PosMallConfig config = posMallConfigMapper.getByTenantInfo(tenantEntity.getTenantId()); + return config; + } + @Override public void saveOrUpdate(PosMallConfig record) { if (record.getId() == null) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java index 22741891b..c7d2b2145 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -3,11 +3,13 @@ package com.iformall.service.impl; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.PushLimit; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumEnableType; import com.iformall.exception.MallinkException; import com.iformall.mapper.PushLimitMapper; import com.iformall.mapper.WxCouponActionLogMapper; import com.iformall.service.PushLimitService; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +27,6 @@ import java.util.Map; public class PushLimitServiceImpl implements PushLimitService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private String keyPrev = "setting:pushlimit:"; @Autowired PushLimitMapper pushLimitMapper; @@ -36,10 +37,16 @@ public class PushLimitServiceImpl implements PushLimitService { @Qualifier("pushLimitRedisTemplate") private RedisTemplate pushLimitRedisTemplate; + private String getKey(TenantEntity tenantEntity) { + StringBuilder sb = new StringBuilder(); + sb.append(Constant.PUSH_LIMIT_KEY_PREV).append(tenantEntity.getTenantId()); + return sb.toString(); + } + @Override - public PushLimit getPushLimit(String tenantId) { + public PushLimit getPushLimit(TenantEntity tenantEntity) { // get pushLime from cache - String key = keyPrev + tenantId; + String key = getKey(tenantEntity); // 缓存存在 boolean hasKey = pushLimitRedisTemplate.hasKey(key); @@ -50,7 +57,7 @@ public class PushLimitServiceImpl implements PushLimitService { } PushLimit pushLimit = new PushLimit(); - pushLimit.setTenantId(tenantId); + pushLimit.updateTenantInfo(tenantEntity); List list = pushLimitMapper.findList(pushLimit); if (list.size() > 0) { pushLimit = list.get(0); @@ -82,7 +89,7 @@ public class PushLimitServiceImpl implements PushLimitService { pushLimitMapper.updateById(record); // 缓存存在,删除缓存 - String key = keyPrev + record.getTenantId(); + String key = getKey(record); boolean hasKey = pushLimitRedisTemplate.hasKey(key); if (hasKey) { pushLimitRedisTemplate.delete(key); @@ -91,10 +98,10 @@ public class PushLimitServiceImpl implements PushLimitService { } @Override - public boolean checkSendTime(String tenantId) { + public boolean checkSendTime(TenantEntity tenantEntity) { Date curDate = new Date(); // 1. get tenant limit - PushLimit pushLimit = getPushLimit(tenantId); + PushLimit pushLimit = getPushLimit(tenantEntity); // 1.1 疲劳度是否启用 if(pushLimit.getEnable().equals(EnumEnableType.Disable.getCode())) { return true; @@ -114,10 +121,10 @@ public class PushLimitServiceImpl implements PushLimitService { } @Override - public boolean checkMsg(String tenantId) { + public boolean checkMsg(TenantEntity tenantEntity) { Date curDate = new Date(); // 1. get tenant limit - PushLimit pushLimit = getPushLimit(tenantId); + PushLimit pushLimit = getPushLimit(tenantEntity); // 1.1 疲劳度是否启用 if(pushLimit.getEnable().equals(EnumEnableType.Disable.getCode())) { return true; @@ -137,10 +144,10 @@ public class PushLimitServiceImpl implements PushLimitService { } @Override - public boolean checkCoupon(String tenantId, Long cUserId, Long couponId) { + public boolean checkCoupon(TenantEntity tenantEntity, Long cUserId, Long couponId) { Date curDate = new Date(); // 1. get tenant limit - PushLimit pushLimit = getPushLimit(tenantId); + PushLimit pushLimit = getPushLimit(tenantEntity); // 1.1 疲劳度是否启用 if(pushLimit.getEnable().equals(EnumEnableType.Disable.getCode())) { return true; @@ -156,7 +163,7 @@ public class PushLimitServiceImpl implements PushLimitService { // 3. check 每人每天多少张券 Map params = new HashMap(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("cUserId", cUserId); int countForUser = wxCouponActionLogMapper.getCountByUser(params); if (countForUser >= pushLimit.getCouponAmount()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 83f486365..855e321f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -17,6 +17,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.exception.MallinkException; import com.iformall.service.MallResourceService; @@ -59,7 +60,7 @@ public class QrCodeServiceImpl implements QrCodeService { private AmazonS3 s3 = null; @Override - public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId) { + public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { ResultData data = new ResultData(); try { if(s3 == null) { @@ -86,7 +87,7 @@ public class QrCodeServiceImpl implements QrCodeService { logger.info(url.toString()); MallResource mr = new MallResource(); - mr.setTenantId(tenantId); + mr.updateTenantInfo(tenantEntity); mr.setBucket(awsProperty.getBucketName()); mr.setS3Key(fileName); mr.setUrl(url.toString()); @@ -125,7 +126,7 @@ public class QrCodeServiceImpl implements QrCodeService { } @Override - public void downQrCode(String tenantId,HttpServletRequest request, HttpServletResponse response, Map params) throws MallinkException { + public void downQrCode(TenantEntity tenantEntity, HttpServletRequest request, HttpServletResponse response, Map params) throws MallinkException { String name = (String) params.get("name"); String pageUrl = (String) params.get("pageUrl"); String sceneParam = (String) params.get("sceneParam"); @@ -149,7 +150,7 @@ public class QrCodeServiceImpl implements QrCodeService { } try { exportQrcode(request, response, - tenantId, type, pageUrl, sceneParam, + tenantEntity, type, pageUrl, sceneParam, withText, text1, text2, name); } catch (Exception e) { @@ -160,12 +161,12 @@ public class QrCodeServiceImpl implements QrCodeService { @Override public ResultData exportQrcode(HttpServletRequest request, HttpServletResponse response, - String tenantId, int type, String pageUrl, String sceneParam, + TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name) { // type 0 有限二维码, 1 无限制二维码 // withText 0 不带字 1. 带下面的字,2 带下面的两行字 - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantEntity); boolean autoColor = false; boolean isHyaline = true; WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); @@ -222,12 +223,12 @@ public class QrCodeServiceImpl implements QrCodeService { } @Override - public ResultData uploadQrcode(String tenantId, int type, String pageUrl, String sceneParam, + public ResultData uploadQrcode(TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name) { // type 0 有限二维码, 1 无限制二维码 // withText 0 不带字 1. 带下面的字,2 带下面的两行字 - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantEntity); boolean autoColor = false; boolean isHyaline = true; WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); @@ -286,12 +287,13 @@ public class QrCodeServiceImpl implements QrCodeService { String fn = UUID.randomUUID().toString(); int dot = fileName.lastIndexOf('.'); if (dot >= 0) { - fn = tenantId + "/" + fn + dest.getName().substring(dot, dest.getName().length()); + String fileFormat = dest.getName().substring(dot, dest.getName().length()); + fn = getFileName(tenantEntity, fn + fileFormat); } else { - fn = tenantId + "/" + fn; + fn = getFileName(tenantEntity, fn); } - ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantId); + ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); org.apache.commons.io.FileUtils.forceDelete(dest); return data; } catch (Exception e) { @@ -300,6 +302,11 @@ public class QrCodeServiceImpl implements QrCodeService { return new ResultData(); } + private String getFileName(TenantEntity tenantEntity, String fn) { + fn = tenantEntity.getTenantId() + "/" + fn; + return fn; + } + private void copyFileToDest(int withText, String text1, String text2, String destPath1, File dest, File codeFile) throws IOException { if (withText == 1) { File dest1 = new File(destPath1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 84be19f04..7fe1859d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -79,7 +79,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId()); Integer personLimit = wxActivity.getPersonLimit(); WxActivityJoin params = new WxActivityJoin(); - params.setTenantId(wxActivity.getTenantId()); + params.updateTenantInfo(wxActivity); params.setActivityId(wxActivity.getId()); params.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); int count = wxActivityJoinMapper.selectCount(new QueryWrapper(params)); @@ -183,7 +183,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { Integer credit = wxActivity.getCredit(); //积分历史 WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(wxActivity.getTenantId()); + wxCreditHistory.updateTenantInfo(wxActivity); wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); wxCreditHistory.setCreditNum(credit); wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); @@ -241,7 +241,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(join.getTenantId()); + wxMsgRecord.updateTenantInfo(join); wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("》》》》》》》》》》》"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index d19659e9a..adee61af0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -183,7 +183,7 @@ public class WxActivityServiceImpl implements WxActivityService { campaign = new WxCampaign(); } campaign.setCoverImg(wxActivity.getCoverImg()); - campaign.setTenantId(wxActivity.getTenantId()); + campaign.updateTenantInfo(wxActivity); campaign.setTitle(wxActivity.getTitle()); campaign.setSubTitle(wxActivity.getSubTitle()); campaign.setDetail(wxActivity.getDetail()); @@ -205,7 +205,7 @@ public class WxActivityServiceImpl implements WxActivityService { WxActivityJoin activityJoin = new WxActivityJoin(); activityJoin.setUserId(userId); activityJoin.setActivityId(id); - activityJoin.setTenantId(wxActivity.getTenantId()); + activityJoin.updateTenantInfo(wxActivity); //查询是否已参加报名 //下线 就是 结束 if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java index 42d9edc36..f40ae2c0c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java @@ -53,7 +53,7 @@ public class WxAdminLogServiceImpl implements WxAdminLogService { public void saveLogCount(WxAdminLog record) { // TODO use redis to optimize WxAdminLog reqQ = new WxAdminLog(); - reqQ.setTenantId(record.getTenantId()); + reqQ.updateTenantInfo(record); reqQ.setUrl(record.getUrl()); reqQ.setType(record.getType()); reqQ.setActionDate(record.getActionDate()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 6077909f1..639720c9d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAppType; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.service.WxAppinfoService; @@ -23,10 +24,10 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { WxAppinfoMapper wxAppinfoMapper; @Override - public WxAppinfo getCAppInfo(String tenantId) { + public WxAppinfo getCAppInfo(TenantEntity tenantEntity) { WxAppinfo appInfo = null; WxAppinfo appinfoQ = new WxAppinfo(); - appinfoQ.setTenantId(tenantId); + appinfoQ.updateTenantInfo(tenantEntity); appinfoQ.setType(EnumAppType.C.getCode()); List appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); if (appList.size() > 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index cfffc0ea3..76d88add5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -89,7 +89,7 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAuthorizerAppid()); if(appinfo != null) { record.setId(appinfo.getId()); - record.setTenantId(appinfo.getTenantId()); + record.updateTenantInfo(appinfo.getTenantInfo()); record.setType(appinfo.getType()); } else { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java index f2a157bf5..57a627563 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillActionServiceImpl.java @@ -58,7 +58,7 @@ public class WxBillActionServiceImpl implements WxBillActionService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(user.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(action.getPayDate()); Date date = new Date(); wxBillAction.setCreatetime(date); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index b2aa9490b..2551717db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.vo.*; import com.iformall.enums.*; @@ -136,7 +137,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); if (StringUtils.isNotEmpty(record.getTypeStr())) { List typeList = JSONArray.parseArray(record.getTypeStr(), Integer.class); @@ -320,7 +321,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { settleRecord.setSettleMoney(wxBillSettle.getBalance()); settleRecord.setSettleTime(new Date()); settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); - settleRecord.setTenantId(wxBillSettle.getTenantId()); + settleRecord.updateTenantInfo(wxBillSettle); BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage() + "收款" + money.toString() + "元"); @@ -375,7 +376,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { datalist.add(wxBillAllVo); } } - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillAll); datalist.stream().forEach(e -> { //手续费 = 合同应收+手续费+滞纳金 cmputeTotalMoney(wxPayAccountBill, e); @@ -416,7 +417,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -460,7 +461,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -505,7 +506,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -550,7 +551,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -595,7 +596,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -640,7 +641,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -685,7 +686,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillAction.setUserId(wxMerchantBUser.getId()); wxBillAction.setUserName(wxMerchantBUser.getName()); wxBillAction.setPhone(wxMerchantBUser.getPhone()); - wxBillAction.setTenantId(wxMerchantBUser.getTenantId()); + wxBillAction.updateTenantInfo(wxMerchantBUser); wxBillAction.setPayDate(date); try { wxBillActionService.save(wxBillAction); @@ -705,11 +706,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { //wxBillOtherDepositService.updateBillStatus(wxBillOtherDeposit); //更新其他账单 WxBillOther wxBillOther = new WxBillOther(); - wxBillOther.setTenantId(record.getTenantId()); + wxBillOther.updateTenantInfo(record); wxBillOtherService.updateBillStatus(wxBillOther); //更新日常账单状态 WxBillDaily wxBillDaily = new WxBillDaily(); - wxBillDaily.setTenantId(record.getTenantId()); + wxBillDaily.updateTenantInfo(record); wxBillDailyService.updateBillStatus(wxBillDaily); //更新租赁押金账单状态 //WxBillDeposit wxBillDeposit = new WxBillDeposit(); @@ -721,11 +722,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { //wxBillPropertyDepositService.updateBillStatus(wxBillPropertyDeposit); //更新物业账单状态 WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setTenantId(record.getTenantId()); + wxBillProperty.updateTenantInfo(record); wxBillPropertyService.updateBillStatus(wxBillProperty); //更新租赁账单状态 WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setTenantId(record.getTenantId()); + wxBillRent.updateTenantInfo(record); wxBillRentService.updateBillStatus(wxBillRent); logger.info("更新各账单状态结束"); } @@ -740,7 +741,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { //付款方式 WxPayAccountBill wxPayAccountBill = new WxPayAccountBill(); - wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); + wxPayAccountBill.updateTenantInfo(wxBillAll); WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(new QueryWrapper(wxPayAccountBill)); if (payAccountBill != null) { String bankCardId = payAccountBill.getBankCardId(); @@ -1220,7 +1221,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } @Override - public void importBillOther(String tenantId, String importKey, WxBillExcelTemplateOther bill, MallUserInfo user) { + public void importBillOther(String importKey, WxBillExcelTemplateOther bill, MallUserInfo user) { Integer billType = bill.getBillType(); long receivePay = new BigDecimal(bill.getReceivePayStr()).multiply(new BigDecimal(100)).longValueExact(); long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); @@ -1236,7 +1237,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (billAttrStr.equals(EnumBillExcelTemplateDaily.AIR_CONDITIONING.getMessage())) { dailyQuery.setType(EnumBillDailyType.AIR_CONDITIONING.getCode()); } - dailyQuery.setTenantId(tenantId); + dailyQuery.updateTenantInfo(user); dailyQuery.setMerchantId(bill.getMerchantId()); dailyQuery.setReceiveDate(bill.getReceiveDate()); dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); @@ -1261,7 +1262,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else { WxMerchantShop wxMerchantShop = new WxMerchantShop(); - wxMerchantShop.setTenantId(tenantId); + wxMerchantShop.updateTenantInfo(user); wxMerchantShop.setMerchantId(bill.getMerchantId()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List select = wxMerchantShopMapper.selectList(new QueryWrapper<>(wxMerchantShop)); @@ -1273,7 +1274,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { daily.setReceiveDate(bill.getReceiveDate()); daily.setPay(pay); daily.setType(dailyQuery.getType()); - daily.setTenantId(tenantId); + daily.updateTenantInfo(user); daily.setMerchantId(bill.getMerchantId()); daily.setShopId(select.get(0).getShopId()); daily.setRentShopType(bill.getMerchantType()); @@ -1311,7 +1312,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { WxBillOther otherQuery = new WxBillOther(); - otherQuery.setTenantId(tenantId); + otherQuery.updateTenantInfo(user); otherQuery.setMerchantId(bill.getMerchantId()); otherQuery.setReceiveDate(bill.getReceiveDate()); otherQuery.setName(bill.getBillAttr()); @@ -1339,7 +1340,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else { WxMerchantShop wxMerchantShop = new WxMerchantShop(); - wxMerchantShop.setTenantId(tenantId); + wxMerchantShop.updateTenantInfo(user); wxMerchantShop.setMerchantId(bill.getMerchantId()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); @@ -1352,7 +1353,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { other.setReceivePay(receivePay); other.setReceiveDate(bill.getReceiveDate()); other.setPay(pay); - other.setTenantId(tenantId); + other.updateTenantInfo(user); other.setMerchantId(bill.getMerchantId()); other.setShopId(select.get(0).getShopId()); other.setRentShopType(bill.getMerchantType()); @@ -1375,7 +1376,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); - otherDepositQuery.setTenantId(tenantId); + otherDepositQuery.updateTenantInfo(user); otherDepositQuery.setMerchantId(bill.getMerchantId()); otherDepositQuery.setReceiveDate(bill.getReceiveDate()); otherDepositQuery.setComments(bill.getBillAttr()); @@ -1404,7 +1405,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else { WxMerchantShop wxMerchantShop = new WxMerchantShop(); - wxMerchantShop.setTenantId(tenantId); + wxMerchantShop.updateTenantInfo(user); wxMerchantShop.setMerchantId(bill.getMerchantId()); otherDepositQuery.setReceiveDate(bill.getReceiveDate()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); @@ -1418,7 +1419,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { otherDeposit.setReceivePay(receivePay); otherDeposit.setReceiveDate(bill.getReceiveDate()); otherDeposit.setPay(pay); - otherDeposit.setTenantId(tenantId); + otherDeposit.updateTenantInfo(user); otherDeposit.setMerchantId(bill.getMerchantId()); otherDeposit.setShopId(select.get(0).getShopId()); otherDeposit.setRentShopType(bill.getMerchantType()); @@ -1485,12 +1486,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { } @Override - public void importBill(String tenantId, String importKey, WxBillExcelTemplate bill, MallUserInfo user) { + public void importBill(String importKey, WxBillExcelTemplate bill, MallUserInfo user) { //租金 Integer billType = bill.getBillType(); if (billType.equals(EnumBillExcelTemplate.SHOP_RENT.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_RENT.getCode())) { WxBillRent rentQuery = new WxBillRent(); - rentQuery.setTenantId(tenantId); + rentQuery.updateTenantInfo(user); rentQuery.setMerchantId(bill.getMerchantId()); rentQuery.setStarttime(bill.getStarttime()); rentQuery.setEndtime(bill.getEndtime()); @@ -1517,7 +1518,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else if (billType.equals(EnumBillExcelTemplate.SHOP_PROPERTY.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_PROPERTY.getCode())) { WxBillProperty propertyQuery = new WxBillProperty(); - propertyQuery.setTenantId(tenantId); + propertyQuery.updateTenantInfo(user); propertyQuery.setMerchantId(bill.getMerchantId()); propertyQuery.setStarttime(bill.getStarttime()); propertyQuery.setEndtime(bill.getEndtime()); @@ -1638,6 +1639,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { String manager = (String) mapList.get(0).get("manager"); String managerPhone = (String) mapList.get(0).get("managerPhone"); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + String billListStr = ""; BigDecimal sumNeedPay = new BigDecimal(0); for (Map bill : mapList) { @@ -1666,7 +1671,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { mailMsg.setModelType(EnumMailMsgModel.MAIL_BILL_WAIT_PAY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); mailMsg.setDynamicContentMap(map); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } @@ -1693,6 +1698,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { String managerPhone = (String) mapList.get(0).get("managerPhone"); Long expiredDay = (Long) mapList.get(0).get("expiredDay"); + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + String billListStr = ""; BigDecimal sumNeedPay = new BigDecimal(0); for (Map bill : mapList) { @@ -1723,7 +1732,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setModelType(EnumMailMsgModel.MAIL_BILL_OWE.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); mailMsg.setDynamicContentMap(map); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } @@ -1867,7 +1876,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public List allDepositList(WxBillAll wxBillAll) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillAll); List wxBillAllVos = wxBillAllMapper.allDepositList(wxBillAll); wxBillAllVos.stream().forEach(e -> { cmputeTotalMoney(wxPayAccountBill, e); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 58f58a6d8..3479caa62 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -58,7 +58,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public PageInfo listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); //分页对象设置页数和条数 PageHelper.startPage(pageIndex, pageSize); //查询 @@ -135,7 +135,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { WxBillDaily record = new WxBillDaily(); record.setId(id); WxBillDaily wxBillDaily = wxBillDailyMapper.queryBillDailyList(record).get(0); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillDaily.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDaily); computeTotalMoney(wxPayAccountBill, wxBillDaily); wxBillDaily.setOwe(wxBillDaily.getRealReceivePay() - wxBillDaily.getPay()); if (wxBillDaily.getShopId() != null) { @@ -161,7 +161,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { logger.info("新增日常账单"); WxBillDaily dailyQuery = new WxBillDaily(); dailyQuery.setType(record.getType()); - dailyQuery.setTenantId(record.getTenantId()); + dailyQuery.updateTenantInfo(user); dailyQuery.setMerchantId(record.getMerchantId()); dailyQuery.setReceiveDate(record.getReceiveDate()); dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); @@ -239,7 +239,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDaily.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillDaily.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -277,7 +277,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { } @Override - public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { + public void exportTemplate(HttpServletRequest request, HttpServletResponse response, MallUserInfo user) { List list = new ArrayList<>(); WxBillDailyVo v1 = new WxBillDailyVo(); WxBillDailyVo v2 = new WxBillDailyVo(); @@ -359,7 +359,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDaily record) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); List billDailyList = wxBillDailyMapper.queryBillDailyList(record); billDailyList.stream().forEach(e->{ //手续费 = 合同应收+手续费+滞纳金 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 2e1b90847..1e378b98c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -50,7 +50,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public PageInfo listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) { - //WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + //WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); PageHelper.startPage(pageIndex, pageSize); List billDepositList = wxBillDepositMapper.queryBillDepositList(record); /* billDepositList.stream().forEach(e->{ @@ -185,7 +185,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -250,7 +250,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(wxBillDeposit); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 1ca890f3a..ba44257fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -52,7 +52,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public PageInfo listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); //分页对象设置页数和条数 PageHelper.startPage(pageIndex, pageSize); //查询 @@ -130,7 +130,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService WxBillOtherDeposit record = new WxBillOtherDeposit(); record.setId(id); WxBillOtherDeposit wxBillOther = wxBillOtherDepositMapper.queryBillList(record).get(0); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillOther.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); computeTotalMoney(wxPayAccountBill, wxBillOther); wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); if (wxBillOther.getShopId() != null) { @@ -156,7 +156,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService logger.info("新增其他账单"); WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); - otherDepositQuery.setTenantId(record.getTenantId()); + otherDepositQuery.updateTenantInfo(user); otherDepositQuery.setMerchantId(record.getMerchantId()); otherDepositQuery.setReceiveDate(record.getReceiveDate()); otherDepositQuery.setComments(record.getComments()); @@ -236,7 +236,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillOtherDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillOtherDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -301,7 +301,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { @@ -333,7 +333,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOtherDeposit wxBillDeposit) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillDeposit.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDeposit); List datalist = wxBillOtherDepositMapper.queryBillList(wxBillDeposit); datalist.stream().forEach(e->{ //手续费 = 合同应收+手续费+滞纳金 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 4f4160c90..b7d8c6b97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -52,7 +52,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Override public PageInfo listAsPage(WxBillOther record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); //分页对象设置页数和条数 PageHelper.startPage(pageIndex, pageSize); //查询 @@ -130,7 +130,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { WxBillOther record = new WxBillOther(); record.setId(id); WxBillOther wxBillOther = wxBillOtherMapper.queryBillList(record).get(0); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillOther.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); computeTotalMoney(wxPayAccountBill, wxBillOther); wxBillOther.setOwe(wxBillOther.getRealReceivePay() - wxBillOther.getPay()); if (wxBillOther.getShopId() != null) { @@ -156,7 +156,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { if (record.getId() == null) { logger.info("新增其他押金账单"); WxBillOther otherQuery = new WxBillOther(); - otherQuery.setTenantId(record.getTenantId()); + otherQuery.updateTenantInfo(user); otherQuery.setMerchantId(record.getMerchantId()); otherQuery.setReceiveDate(record.getReceiveDate()); otherQuery.setName(record.getName()); @@ -237,7 +237,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillOther.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillOther.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -277,7 +277,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOther wxBillOther) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillOther.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillOther); List datalist = wxBillOtherMapper.queryBillList(wxBillOther); datalist.stream().forEach(e->{ //手续费 = 合同应收+手续费+滞纳金 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 4c8c7b772..c58dc6462 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -48,7 +48,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe @Override public PageInfo listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); PageHelper.startPage(pageIndex, pageSize); List billDepositList = wxBillPropertyDepositMapper.queryBillDepositList(record); /*billDepositList.stream().forEach(e->{ @@ -183,7 +183,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(wxBillDeposit.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -247,7 +247,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + wxBillAction.updateTenantInfo(user); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 030680acd..d1d526d86 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillActionMapper; @@ -58,7 +59,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public PageInfo listAsPage(WxBillProperty record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); PageHelper.startPage(pageIndex, pageSize); List billRentList = wxBillPropertyMapper.queryBillPropertyList(record); billRentList.stream().forEach(e -> { @@ -139,7 +140,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setId(id); WxBillProperty property = wxBillPropertyMapper.queryBillPropertyList(record).get(0); //手续费 = 合同应收+手续费+滞纳金 - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(property.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(property); computeTotalMoney(wxPayAccountBill, property); property.setOwe(property.getRealReceivePay() - property.getPay()); return property; @@ -229,7 +230,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(property.getTenantId()); + wxBillAction.updateTenantInfo(user); wxBillAction.setPayDate(property.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -247,11 +248,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { } @Override - public PageInfo findByPropertyContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(tenantId); + public PageInfo findByPropertyContractId(Long id, TenantEntity tenantEntity, Integer pageIndex, Integer pageSize) { + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(tenantEntity); WxBillProperty record = new WxBillProperty(); record.setPropertyContractId(id); - record.setTenantId(tenantId); + record.updateTenantInfo(tenantEntity); record.setSortColumns(BaseEntity.SortField.Id_ASC); updateBillStatus(record); PageHelper.startPage(pageIndex, pageSize); @@ -322,7 +323,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillProperty wxBillProperty) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillProperty.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillProperty); String billName = wxBillProperty.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺物业账单" : "多经点位物业账单"; List billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 74d30dd9c..2083ee835 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -61,7 +61,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public PageInfo listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); PageHelper.startPage(pageIndex, pageSize); List billRentList = wxBillRentMapper.queryBillRentList(record); @@ -140,7 +140,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillRent record = new WxBillRent(); record.setId(id); WxBillRent rent = wxBillRentMapper.queryBillRentList(record).get(0); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); //手续费 = 合同应收+手续费+滞纳金 computeTotalMoney(wxPayAccountBill, rent); rent.setOwe(rent.getRealReceivePay() - rent.getPay()); @@ -229,7 +229,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillRent.getTenantId()); + wxBillAction.updateTenantInfo(wxBillRent); wxBillAction.setPayDate(wxBillRent.getPayDate()); try { wxBillActionService.save(wxBillAction); @@ -247,12 +247,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public PageInfo findByRentContractId(Long id, String tenantId, Integer pageIndex, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(tenantId); - WxBillRent record = new WxBillRent(); - record.setRentContractId(id); - record.setTenantId(tenantId); - record.setSortColumns(BaseEntity.SortField.Id_ASC); + public PageInfo findByRentContractId(WxBillRent record, Integer pageIndex, Integer pageSize) { + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); PageHelper.startPage(pageIndex, pageSize); List billRentList = wxBillRentMapper.queryBillRentList(record); billRentList.stream().forEach(e->{ @@ -407,7 +403,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillAction.setUserId(user.getId()); wxBillAction.setUserName(user.getName()); wxBillAction.setPhone(user.getPhone()); - wxBillAction.setTenantId(wxBillRent.getTenantId()); + wxBillAction.updateTenantInfo(wxBillRent); try { wxBillActionService.save(wxBillAction); } catch (Exception e) { @@ -433,7 +429,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillRent wxBillRent) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillRent.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillRent); String billName = wxBillRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; List billRentList = wxBillRentMapper.queryBillRentList(wxBillRent); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 0b7a9f740..87583201e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -109,7 +109,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //加载账单列表 WxBillSettleBill wxBillSettleBill = new WxBillSettleBill(); - wxBillSettleBill.setTenantId(billSettle.getTenantId()); + wxBillSettleBill.updateTenantInfo(merchant); wxBillSettleBill.setSettleId(billSettle.getId()); wxBillSettleBill.setType(EnumSettleBillType.R.getCode()); billSettle.setReceiveBillIds(wxBillSettleBillMapper.findBySettleId(wxBillSettleBill)); @@ -118,7 +118,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //加载清算历史 WxBillSettleRecord wxBillSettleRecord = new WxBillSettleRecord(); - wxBillSettleRecord.setTenantId(billSettle.getTenantId()); + wxBillSettleRecord.updateTenantInfo(merchant); wxBillSettleRecord.setSettleId(billSettle.getId()); billSettle.setSettleRecordList(wxBillSettleRecordMapper.findList(wxBillSettleRecord)); @@ -497,14 +497,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { for (WxBillSettleBill bill:record.getReceiveBillIds()) { bill.setId(idWorker.nextId()); bill.setSettleId(record.getId()); - bill.setTenantId(record.getTenantId()); + bill.updateTenantInfo(userInfo); bill.setType(EnumSettleBillType.R.getCode()); wxBillSettleBillMapper.insert(bill); } for (WxBillSettleBill bill:record.getPayBillIds()) { bill.setId(idWorker.nextId()); bill.setSettleId(record.getId()); - bill.setTenantId(record.getTenantId()); + bill.updateTenantInfo(userInfo); bill.setType(EnumSettleBillType.P.getCode()); wxBillSettleBillMapper.insert(bill); } @@ -517,7 +517,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //启动审批流 record.getFlowParams().put("businessId",record.getId()); if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { - wxFlowService.start(record.getFlowParams(), userInfo.getId(), userInfo.getName(), record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userInfo.getId(), userInfo.getName(), record); } } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index 7d693bfd3..9e9665c7f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumDelFlag; @@ -97,16 +98,15 @@ public class WxBrandServiceImpl implements WxBrandService { } @Override - public List> queryBrand(String tenantId) { - return wxBrandMapper.queryBrand(tenantId); + public List> queryBrand(TenantEntity tenantEntity) { + WxBrand wxBrand = new WxBrand() {{ + updateTenantInfo(tenantEntity); + }}; + return wxBrandMapper.queryBrandByTenant(wxBrand); } @Override - public ResultData hasBrand(String tenantId, String name, Long id) { - WxBrand wxBrand = new WxBrand(); - wxBrand.setTenantId(tenantId); - wxBrand.setName(name); - wxBrand.setId(id); + public ResultData hasBrand(WxBrand wxBrand) { int count = wxBrandMapper.hasBrand(wxBrand); return new ResultData(ResultData.SUCCESS, "查询成功", count > 0 ? true : false); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 8c08e7d7f..b42048a19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; @@ -49,13 +50,13 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public List findListAll(String tenantId, Integer filter) { + public List findListAll(TenantEntity tenantEntity, Integer filter) { if (filter == null) return wxBusinessMapper.findListAll(); else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) - return wxBusinessMapper.findListForCoupon(tenantId); + return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId()); else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) - return wxBusinessMapper.findListForMerchant(tenantId); + return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId()); else return wxBusinessMapper.findListAll(); } @@ -88,7 +89,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { - System.out.println("rent rentInfo is null:{}" + dbRent.getId()); + logger.warn("rent rentInfo is null-1: " + dbRent.getId()); continue; } Long price = dbRent.getPrice(); @@ -109,7 +110,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { - System.out.println("property rentInfo is null:{}" + dbRent.getId()); + logger.warn("property rentInfo is null-2:" + dbRent.getId()); continue; } logger.info("业态分析>>>>>>>>>>>>>>>>>>物业合同ID:" + dbRent.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 9508757a7..7a2c5349c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -10,6 +10,8 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import com.iformall.enums.*; import com.iformall.mapper.*; @@ -397,7 +399,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } } - private WxCUserBasicInfoDto filtersToDto(String tenantId, List filterList){ + private WxCUserBasicInfoDto filtersToDto(TenantEntity tenantEntity, List filterList){ WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); List tagIdList = new ArrayList<>(); @@ -424,7 +426,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { }); if(!tagIdList.isEmpty()) dto.setTagIds(tagIdList); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); return dto; } @@ -437,14 +439,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return type; } - private WxTagsTypeVo generateType51(String tenentId) { + private WxTagsTypeVo generateType51(TenantEntity tenantEntity) { WxTagsTypeVo type = new WxTagsTypeVo(); type.setFlag(EnumTagTypeFlag.FLAG_SINGLE.getCode()); type.setName(EnumTagType.ID_51.getMessage()); type.setId(EnumTagType.ID_51.getCode()); List tagsMemberLevel = new ArrayList<>(); - List levels = wxLevelConfigService.getByTenantId(tenentId); + List levels = wxLevelConfigService.getByTenantId(tenantEntity.getTenantId()); WxTags wxTagsBase = new WxTags(); wxTagsBase.setName(WxLevelConfigService.DEFAULT_LEVEL); @@ -490,7 +492,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return type; } - public List listFilters(String tenantId) { + public List listFilters(TenantEntity tenantEntity) { WxTagsGroupVo filter = new WxTagsGroupVo(); filter.setId(EnumTagGroup.ID_10.getCode()); @@ -498,7 +500,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { List types = new ArrayList<>(); types.add(generateType50()); - types.add(generateType51(tenantId)); + types.add(generateType51(tenantEntity)); types.add(generateType52()); types.add(generateType53()); types.add(generateType54()); @@ -509,17 +511,17 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } - public long countByFilter(String tenantId, List filterList) { - return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantId,filterList)); + public long countByFilter(TenantEntity tenantEntity, List filterList) { + return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantEntity,filterList)); } - public List listByFilter(String tenantId, List filterList) { - return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantId,filterList)); + public List listByFilter(TenantEntity tenantEntity, List filterList) { + return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantEntity,filterList)); } @Override - public List listByFilterList(String tenantId, List filterList) { + public List listByFilterList(TenantEntity tenantEntity, List filterList) { HashSet userSet = new HashSet<>(); - filterList.stream().forEach(f->userSet.addAll(listByFilter(tenantId,f.getTagList()))); + filterList.stream().forEach(f->userSet.addAll(listByFilter(tenantEntity,f.getTagList()))); return new ArrayList<>(userSet); } @@ -538,9 +540,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public List findByPhone(String tenantId, String phone) { + public List findByPhone(TenantEntity tenantEntity, String phone) { WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); - basicQ.setTenantId(tenantId); + basicQ.updateTenantInfo(tenantEntity); basicQ.setPhone(phone); List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos != null && basicInfos.size() > 0) { @@ -563,10 +565,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public WxCUserBasicInfo findInfoByPhone(String tenantId, String phone) { + public WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone) { WxCUserBasicInfo basic = null; WxCUserBasicInfo basicQ = new WxCUserBasicInfo(); - basicQ.setTenantId(tenantId); + basicQ.updateTenantInfo(tenantEntity); basicQ.setPhone(phone); List basicInfos = wxCUserBasicInfoMapper.selectList(new QueryWrapper(basicQ)); if (basicInfos.size() > 0) { @@ -599,21 +601,21 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public void updateObj(WxCUserBasicInfo record, WxCUser user) { // 1. update c_user_tags CUserTagNewIdVo userTagVo = new CUserTagNewIdVo(); - userTagVo.setTenantId(record.getTenantId()); + userTagVo.updateTenantInfo(record); userTagVo.setUserId(record.getId()); userTagVo.setNewUserId(user.getId()); wxCUserTagsMapper.updateNewId(userTagVo); // 2. update score history WxScoreHistoryNewIdVo scoreHistoryNewIdVo = new WxScoreHistoryNewIdVo(); - scoreHistoryNewIdVo.setTenantId(record.getTenantId()); + scoreHistoryNewIdVo.updateTenantInfo(record); scoreHistoryNewIdVo.setCUserId(record.getId()); scoreHistoryNewIdVo.setNewUserId(user.getId()); scoreHistoryMapper.updateNewId(scoreHistoryNewIdVo); // 3. update credit history WxCreditHistoryNewIdVo creditHistoryNewIdVo = new WxCreditHistoryNewIdVo(); - creditHistoryNewIdVo.setTenantId(record.getTenantId()); + creditHistoryNewIdVo.updateTenantInfo(record); creditHistoryNewIdVo.setCUserId(record.getId()); creditHistoryNewIdVo.setNewUserId(user.getId()); creditHistoryMapper.updateNewId(creditHistoryNewIdVo); @@ -665,7 +667,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { excelService.exportExcel(list, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); } - public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { + public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { List list = new ArrayList<>(); WxCUserBasicInfoVo u1 = new WxCUserBasicInfoVo(); WxCUserBasicInfoVo u2 = new WxCUserBasicInfoVo(); @@ -741,7 +743,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } - public WxCUserBasicInfo InitUserBaseInfo(CUserBaseInfoT uBase, String tenantId) { + public WxCUserBasicInfo InitUserBaseInfo(CUserBaseInfoT uBase, TenantEntity tenantEntity) { if (StringUtils.isBlank(uBase.getPhone())) { return null; } @@ -749,7 +751,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserBasicInfo userBase = new WxCUserBasicInfo(); - userBase.setTenantId(tenantId); + userBase.updateTenantInfo(tenantEntity); userBase.setName(uBase.getName()); if (uBase.getSex() == null) { userBase.setSex(0); @@ -790,7 +792,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public void importOneMem(String tenantId, String importKey, List tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo) { + public void importOneMem(String importKey, List tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo) { final IdWorker idWorker = IdWorker.get(); if (StringUtils.isBlank(uBase.getPhone())) { @@ -798,7 +800,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { logger.error("手机号为空", uBase.toString()); return; } - WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, tenantId); + WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, mallUserInfo); if (userBase == null) { stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); logger.error("userBase为null", uBase.toString()); @@ -831,7 +833,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxCUserBasicInfo oldUserBase = null; WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); - userBaseQ.setTenantId(tenantId); + userBaseQ.updateTenantInfo(mallUserInfo); userBaseQ.setPhone(userBase.getPhone()); List userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ)); if (userBList.size() > 0) { @@ -873,7 +875,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { { // check c_user 是否存在 WxCUser cUserQ = new WxCUser(); - cUserQ.setTenantId(tenantId); + cUserQ.updateTenantInfo(mallUserInfo); cUserQ.setPhone(userBase.getPhone()); List userList = wxCUserMapper.selectList(new QueryWrapper(cUserQ)); if (userList.size() > 0) { @@ -955,7 +957,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { //积分处理逻辑:覆盖原积分 记录历史 if (credit != null) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(tenantId); + wxCreditHistory.updateTenantInfo(mallUserInfo); wxCreditHistory.setCreateDate(new Date()); if (mallUserInfo != null) { wxCreditHistory.setOperatorId(mallUserInfo.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 89b6456ba..a880aa329 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -107,7 +107,7 @@ public class WxCUserServiceImpl implements WxCUserService { public int saveOrUpdateMpUser(WxMpUser mpUser, WxAuthorizerInfo authorizerInfo) { // 1. check user exist WxCUser userQ = new WxCUser(); - userQ.setTenantId(authorizerInfo.getTenantId()); + userQ.updateTenantInfo(authorizerInfo); boolean bHaveUnionId = false; if(StringUtils.isNotBlank(mpUser.getUnionId())) { userQ.setUnionId(mpUser.getUnionId()); @@ -226,7 +226,7 @@ public class WxCUserServiceImpl implements WxCUserService { public void actionMsgAfterLogin(WxCUser user, Boolean findByUnionId) { FmInsideCLoginMsg loginMsg = new FmInsideCLoginMsg(); loginMsg.setMsgType(EnumMsgRecordType.INSIDE_C_LOGIN.getCode()); - loginMsg.setTenantId(user.getTenantId()); + loginMsg.updateTenantInfo(user); loginMsg.setCUserId(user.getId()); loginMsg.setFindByUnionId(findByUnionId); mqBaseProducer.sendMessage(loginMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); @@ -300,7 +300,7 @@ public class WxCUserServiceImpl implements WxCUserService { public WxCreditHistory addCredit(WxCUser user, EnumScoreType enumScoreType) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(user.getId()); - wxCreditHistory.setTenantId(user.getTenantId()); + wxCreditHistory.updateTenantInfo(user); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 46e368a31..ff378bb08 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.WxCUserTagsService; @@ -87,21 +88,21 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { @Override - public long countUser(String tenantId, Long tagId, Date startTime, Date endTime ) { + public long countUser(TenantEntity tenantEntity, Long tagId, Date startTime, Date endTime ) { String str = JSON.toJSONString(tagId); - return wxCUserTagsMapper.countUser(str, tenantId, startTime, endTime); + return wxCUserTagsMapper.countUser(str, tenantEntity.getTenantId(), startTime, endTime); } @Override - public List findTagList(String tenantId, List tagIds) { + public List findTagList(TenantEntity tenantEntity, List tagIds) { if (tagIds == null || tagIds.isEmpty()) return new ArrayList(); WxTags wxTags =new WxTags(); wxTags.setIds(tagIds); List list = wxTagsMapper.findList(wxTags); for (WxTags t : list) { - t.setCount(countUser(tenantId,t.getId(),null,null)); + t.setCount(countUser(tenantEntity,t.getId(),null,null)); } return list; } @@ -114,7 +115,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { return null; WxCUserTags record = new WxCUserTags(); record.setUserId(user.getId()); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(user); List cUserTagsList = wxCUserTagsMapper.findList(record); if (cUserTagsList.size() > 0) { record.setId(cUserTagsList.get(0).getId()); @@ -164,7 +165,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { return null; WxCUserTags record = new WxCUserTags(); record.setUserId(user.getId()); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(user); List cUserTagsList = wxCUserTagsMapper.findList(record); if (cUserTagsList.size() > 0) { record.setId(cUserTagsList.get(0).getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 8ebc7e025..b3affd326 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.*; import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxCampaignMapper; @@ -18,6 +19,7 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.QrCodeService; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponService; +import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -181,7 +183,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { public void delBatch(WxCampaign record) { // couponChannel 下架 WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); - wxCouponChannelQ.setTenantId(record.getTenantId()); + wxCouponChannelQ.updateTenantInfo(record); wxCouponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannelQ.setSubTargetId(record.getId()); wxCouponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); @@ -198,7 +200,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { public void addOrUpdateBatch(List ids, WxCampaign record) { // 获取已上架的CouponChannel WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); - wxCouponChannelQ.setTenantId(record.getTenantId()); + wxCouponChannelQ.updateTenantInfo(record); wxCouponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannelQ.setSubTargetId(record.getId()); wxCouponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); @@ -255,7 +257,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannel.setCouponId(couponId); wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); - wxCouponChannel.setTenantId(wxCoupon.getTenantId()); + wxCouponChannel.updateTenantInfo(wxCoupon); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannel.setTitle(wxCoupon.getTitle()); @@ -264,12 +266,12 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannel.setId(idWorker.nextId()); wxCouponChannelMapper.insert(wxCouponChannel); - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; WxCouponChannel couponChannel = new WxCouponChannel(); couponChannel.setId(wxCouponChannel.getId()); couponChannel.setType(wxCouponChannel.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); @@ -285,8 +287,8 @@ public class WxCampaignServiceImpl implements WxCampaignService { } @Override - public int getMaxSortNum(String tenantId) { - return wxCampaignMapper.getMaxSortNum(tenantId); + public int getMaxSortNum(TenantEntity tenantEntity) { + return wxCampaignMapper.getMaxSortNum(tenantEntity.getTenantId()); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 6f332979e..4d15a7d22 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.PromotionCalc; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.enums.*; @@ -77,7 +78,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { public WxCouponMerchant checkMerchantInCoupon(WxCardInfo cardInfo, Long merchantId) { WxCouponMerchant couponMerchant = null; WxCouponMerchant couponMerchantQ = new WxCouponMerchant(); - couponMerchantQ.setTenantId(cardInfo.getTenantId()); + couponMerchantQ.updateTenantInfo(cardInfo); couponMerchantQ.setProductId(cardInfo.getCouponId()); couponMerchantQ.setMerchantId(merchantId); couponMerchantQ.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); @@ -115,7 +116,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 3. get pay account WxPayAccount payAccount = null; WxPayAccount payAccountQ = new WxPayAccount(); - payAccountQ.setTenantId(record.getTenantId()); + payAccountQ.updateTenantInfo(record); try { payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { @@ -138,7 +139,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 5 insert card_spend record.setId(idWorker.nextId()); - record.setTenantId(cardInfo.getTenantId()); + record.updateTenantInfo(cardInfo); record.setPayFrom(EnumCardSpendFrom.C.getCode()); record.setPayment(payment); record.setRealPayment(real_payment); @@ -159,7 +160,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 6. update order status WxOrder orderUpdate = new WxOrder(); orderUpdate.setId(order.getId()); - orderUpdate.setTenantId(record.getTenantId()); + orderUpdate.updateTenantInfo(record); orderUpdate.setCUserId(record.getOwnerId()); orderUpdate.setPaymentTime(curDate); orderUpdate.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); @@ -210,7 +211,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { Integer realSubsidyFee = subsidyFee - iSubChargeFee; WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.setTenantId(record.getTenantId()); + merchantSubsidy.updateTenantInfo(record); merchantSubsidy.setOrderId(order.getId()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setMerchantId(record.getMerchantId()); @@ -247,7 +248,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { if (payAccount.checkShare()) { // 9. 分账 try { - shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); + shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId()); } catch (MallinkException e) { logger.error(e.getMessage()); if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode()) { @@ -288,7 +289,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setOperatorId(record.getOwnerId()); creditHistory.setCUserId(record.getOwnerId()); creditHistory.setCreateDate(new Date()); - creditHistory.setTenantId(record.getTenantId()); + creditHistory.updateTenantInfo(record); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(coupon.getBusiness()); creditHistory.setSpend(real_payment); @@ -305,7 +306,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { public void creteMerchantSubsidy(WxCardSpend record, Date curDate, IdWorker idWorker, WxCoupon coupon, Integer payment) { WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.setTenantId(record.getTenantId()); + merchantSubsidy.updateTenantInfo(record); merchantSubsidy.setOrderId(record.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setMerchantId(record.getMerchantId()); @@ -393,11 +394,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } @Override - public int finishCard(String tenantId, Long cardId) { + public int finishCard(WxCardInfo wxCardInfo) { // admin用户手动帮已用卡消费用户退卡, 此卡需要分账完结, 买卡的钱进商场账户 WxCardInfo cardInfo = null; try { - cardInfo = wxCardInfoMapper.selectById(cardId); + cardInfo = wxCardInfoMapper.selectById(wxCardInfo.getId()); } catch (Exception e) { logger.error("微信分账: " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), e.getMessage()); @@ -425,7 +426,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 分账完结 WxSharingOrderDto shareOrder = new WxSharingOrderDto(); shareOrder.setCUserId(couponOrder.getOwnerId()); - shareOrder.setTenantId(tenantId); + shareOrder.updateTenantInfo(wxCardInfo); shareOrder.setMerchantId(0L); // 卡完结,默认给0 shareOrder.setTransactionId(cardInfo.getTransactionId()); cardShareFinished(cardInfo, shareOrder); @@ -447,12 +448,12 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void shareForCardPay(String tenantId, Long cardId, Long orderId, Long cardSpendId) { - // 微信已分账检查次数 + public void shareForCardPay(TenantEntity tenantEntity, Long cardId, Long orderId, Long cardSpendId) { + // 微信已分账检查次数 int psNum = 0; try { WxCardSpend cardSpendQ = new WxCardSpend(); - cardSpendQ.setTenantId(tenantId); + cardSpendQ.updateTenantInfo(tenantEntity); cardSpendQ.setCardId(cardId); psNum = wxCardSpendMapper.selectCount(new QueryWrapper(cardSpendQ)); if (psNum > 20) { @@ -469,7 +470,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 微信分账 try { WxCardSpend cardSpend = new WxCardSpend(); - cardSpend.setTenantId(tenantId); + cardSpend.updateTenantInfo(tenantEntity); cardSpend.setId(cardSpendId); cardSpend.setCardId(cardId); cardSpend.setOrderId(orderId); @@ -492,7 +493,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { shareOrder.setOrderId(cardSpendId); shareOrder.setPayTimeStart(cardSpend.getCreateDate()); shareOrder.setPayTimeEnd(cardSpend.getUpdateDate()); - shareOrder.setTenantId(tenantId); + shareOrder.updateTenantInfo(tenantEntity); shareOrder.setTransactionId(cardInfo.getTransactionId()); shareOrder.setShareAmount(cardSpend.getRealPayment()); ResultData resultData = profitSharingOrderService.createSharingOrder(shareOrder); @@ -542,7 +543,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // card spend 添加一条 记录] final IdWorker idWorker = IdWorker.get(); WxCardSpend cardSpend = new WxCardSpend(); - cardSpend.setTenantId(cardInfo.getTenantId()); + cardSpend.updateTenantInfo(cardInfo); cardSpend.setId(idWorker.nextId()); cardSpend.setCardId(cardInfo.getId()); cardSpend.setOrderId(null); @@ -619,7 +620,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 3. get pay account WxPayAccount payAccount = null; WxPayAccount payAccountQ = new WxPayAccount(); - payAccountQ.setTenantId(record.getTenantId()); + payAccountQ.updateTenantInfo(record); try { payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { @@ -659,7 +660,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 5 insert card_spend record.setId(idWorker.nextId()); - record.setTenantId(cardInfo.getTenantId()); + record.updateTenantInfo(cardInfo); record.setPayment(payment); record.setRealPayment(real_payment); record.setCardBeforeAmount(cardInfo.getRemainingAmount()); @@ -716,7 +717,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 3. get pay account WxPayAccount payAccount = null; WxPayAccount payAccountQ = new WxPayAccount(); - payAccountQ.setTenantId(record.getTenantId()); + payAccountQ.updateTenantInfo(record); try { payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { @@ -753,7 +754,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } // 100. delete prev card_spend - record.setTenantId(cardInfo.getTenantId()); + record.updateTenantInfo(cardInfo); try { wxCardSpendMapper.deleteForPrevCancel(record); } catch (Exception e) { @@ -806,7 +807,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 3. get pay account WxPayAccount payAccount = null; WxPayAccount payAccountQ = new WxPayAccount(); - payAccountQ.setTenantId(record.getTenantId()); + payAccountQ.updateTenantInfo(record); try { payAccount = payAccountMapper.selectOne(new QueryWrapper(payAccountQ)); } catch (Exception e) { @@ -825,7 +826,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { Integer realSubsidyFee = subsidyFee - iSubChargeFee; WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.setTenantId(record.getTenantId()); + merchantSubsidy.updateTenantInfo(record); merchantSubsidy.setOrderId(record.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.PREPAIDCARD.getCode()); merchantSubsidy.setMerchantId(record.getMerchantId()); @@ -858,7 +859,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 9. 分账 try { - shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); + shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId()); } catch (MallinkException e) { logger.error(e.getMessage()); if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode()) { @@ -873,7 +874,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { try { WxOrder orderUpdate = new WxOrder(); orderUpdate.setId(record.getOrderId()); - orderUpdate.setTenantId(record.getTenantId()); + orderUpdate.updateTenantInfo(record); orderUpdate.setCUserId(record.getOwnerId()); orderUpdate.setPayment(record.getRealPayment()); orderUpdate.setPaymentTime(record.getUpdateDate()); @@ -892,7 +893,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setOperatorId(buUser.getId()); creditHistory.setCUserId(record.getOwnerId()); creditHistory.setCreateDate(new Date()); - creditHistory.setTenantId(record.getTenantId()); + creditHistory.updateTenantInfo(record); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setBusinessId(merchant.getBusinessId()); creditHistory.setSpend(record.getRealPayment()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 1bb90bce4..1a7619f3f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.*; import com.iformall.enums.*; import com.iformall.mapper.*; @@ -118,181 +119,185 @@ public class WxChartServiceImpl implements WxChartDataService { enddate = enddate + " 23:59:59"; } + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(tenantId); + }}; + //出租率 if (chart.equals(EnumChart.CZL.getCode())) { - return getRentRate(tenantId); + return getRentRate(tenantEntity); } //租金收缴率 if (chart.equals(EnumChart.ZJSJL.getCode())) { - return getRentMoneyRate(tenantId, startdate, enddate); + return getRentMoneyRate(tenantEntity, startdate, enddate); } //昨日报单率 if (chart.equals(EnumChart.ZRBDL.getCode())) { - return getYesterdayTradeRate(tenantId); + return getYesterdayTradeRate(tenantEntity); } //车流数据 if (chart.equals(EnumChart.CLSJ.getCode())) { - return getCarHistoryAndTodayAndHB(tenantId, false); + return getCarHistoryAndTodayAndHB(tenantEntity, false); } //券交易数据 if (chart.equals(EnumChart.QJYSJ.getCode())) { - return getCouponSaleAnalysis(tenantId); + return getCouponSaleAnalysis(tenantEntity); } //活跃用户数据 if (chart.equals(EnumChart.HYYHSJ.getCode())) { // TODO getActiveMemberAnalysis - return getActiveMemberTrade(tenantId); + return getActiveMemberTrade(tenantEntity); } //销售数据 if (chart.equals(EnumChart.XSSJ.getCode())) { - return getSaleAnalysis(tenantId); + return getSaleAnalysis(tenantEntity); } //解单数据 if (chart.equals(EnumChart.JDSJ.getCode())) { - return getMerchantTradeMonthly(tenantId); + return getMerchantTradeMonthly(tenantEntity); } ///// --- 车流 -- START //今日已绑车牌量 if (chart.equals(EnumChart.JRYBCPL.getCode())) { - return getBindCarAnalysis(tenantId); + return getBindCarAnalysis(tenantEntity); } //实时车流量 if (chart.equals(EnumChart.SSCLL.getCode())) { - return getCarDataCurrent(tenantId); + return getCarDataCurrent(tenantEntity); } // 历史车流量+今日车流量 + 上周同期 if (chart.equals(EnumChart.LSCLL.getCode())) { - return getCarHistoryAndTodayAndHB(tenantId, true); + return getCarHistoryAndTodayAndHB(tenantEntity, true); } //近一周新增停车会员 if (chart.equals(EnumChart.JYZXXZTCHY.getCode())) { - return getCarNewMemberCount(tenantId); + return getCarNewMemberCount(tenantEntity); } //近一周线上缴费车辆 if (chart.equals(EnumChart.JYZXSJFCL.getCode())) { - return getCarPayCarCountInWeek(tenantId); + return getCarPayCarCountInWeek(tenantEntity); } //近一周线上缴费金额 if (chart.equals(EnumChart.JYZXSJFJE.getCode())) { - return getCarPayCountInWeek(tenantId); + return getCarPayCountInWeek(tenantEntity); } //近一周新增会员数 if (chart.equals(EnumChart.JYZXZHYS.getCode())) { - return getCarNewMemberCountInWeek(tenantId); + return getCarNewMemberCountInWeek(tenantEntity); } //// --- 车流 -- END //昨日触达用户 if (chart.equals(EnumChart.ZRCDYH.getCode())) { - return getTodayTouchUser(tenantId); + return getTodayTouchUser(tenantEntity); } //今日券交易数据 if (chart.equals(EnumChart.JRQJYSJ.getCode())) { - return getTodayCouponCount(tenantId); + return getTodayCouponCount(tenantEntity); } //今日场景营销 if (chart.equals(EnumChart.JRCJYX.getCode())) { - return getSaleSceneCount(tenantId); + return getSaleSceneCount(tenantEntity); } //触达用户数 if (chart.equals(EnumChart.CDYHS.getCode())) { - return getTouchUserCount(tenantId); + return getTouchUserCount(tenantEntity); } //场景营销数据 if (chart.equals(EnumChart.CJYXSJ.getCode())) { - return getSceneData(tenantId); + return getSceneData(tenantEntity); } //新增用户 if (chart.equals(EnumChart.XZYH.getCode())) { - return getNewUserCount(tenantId); + return getNewUserCount(tenantEntity); } //活跃用户 if (chart.equals(EnumChart.HYYH.getCode())) { - return getActiveMemberCount(tenantId); + return getActiveMemberCount(tenantEntity); } //线上交易 if (chart.equals(EnumChart.XSJY.getCode())) { - return getOnlineOrderCount(tenantId); + return getOnlineOrderCount(tenantEntity); } //近一周新增用户数 if (chart.equals(EnumChart.JYZXZYHS.getCode())) { - return getNewMemberInWeek(tenantId); + return getNewMemberInWeek(tenantEntity); } //近一周活跃用户数 if (chart.equals(EnumChart.JYZHYYHS.getCode())) { - return getActiveMemberCountInWeek(tenantId); + return getActiveMemberCountInWeek(tenantEntity); } //近一周线上交易金额(元) if (chart.equals(EnumChart.JYZXSJYJE.getCode())) { - return getWeekMoneyData(tenantId); + return getWeekMoneyData(tenantEntity); } //新增用户趋势 if (chart.equals(EnumChart.XZYHQS.getCode())) { - return getNewMemberTradeMonthly(tenantId); + return getNewMemberTradeMonthly(tenantEntity); } //活跃用户趋势 if (chart.equals(EnumChart.HYYHQS.getCode())) { - return getActiveMemberTrade(tenantId); + return getActiveMemberTrade(tenantEntity); } //线上交易趋势 if (chart.equals(EnumChart.XSJYQS.getCode())) { - return getOnlineTrade(tenantId); + return getOnlineTrade(tenantEntity); } //微信用户总数 if (chart.equals(EnumChart.WXYHZS.getCode())) { - return getMemeberWechatTotal(tenantId); + return getMemeberWechatTotal(tenantEntity); } //会员总数 if (chart.equals(EnumChart.HYZS.getCode())) { - return getMemberTotalCount(tenantId); + return getMemberTotalCount(tenantEntity); } //微信用户累计趋势 if (chart.equals(EnumChart.WXYHLJQS.getCode())) { - return getMemberWechatJoinTrade(tenantId); + return getMemberWechatJoinTrade(tenantEntity); } //会员累计趋势 if (chart.equals(EnumChart.HYLJQS.getCode())) { - return getMemberJoinTrade(tenantId); + return getMemberJoinTrade(tenantEntity); } //微信用户新增趋势 if (chart.equals(EnumChart.WXYHXZQS.getCode())) { - return getWechatMemberTrade(tenantId); + return getWechatMemberTrade(tenantEntity); } //会员新增趋势 if (chart.equals(EnumChart.HYXZQS.getCode())) { - return getNewMemberTrade(tenantId); + return getNewMemberTrade(tenantEntity); } //拓客渠道 if (chart.equals(EnumChart.TKQD.getCode())) { - return getFromChannelAnalysis(tenantId); + return getFromChannelAnalysis(tenantEntity); } //场景排名 if (chart.equals(EnumChart.CJPM.getCode())) { - return getSceneAnalysis(tenantId); + return getSceneAnalysis(tenantEntity); } //会员性别比例 if (chart.equals(EnumChart.HYXBBL.getCode())) { - return getMemberSexRate(tenantId, startdate, enddate); + return getMemberSexRate(tenantEntity, startdate, enddate); } //会员绑定车牌率 if (chart.equals(EnumChart.HYBDCPL.getCode())) { - return getMemberBindCar(tenantId, startdate, enddate); + return getMemberBindCar(tenantEntity, startdate, enddate); } //会员年龄层次 if (chart.equals(EnumChart.HYNLCC.getCode())) { - return getMemberAgeAnalysis(tenantId, startdate, enddate); + return getMemberAgeAnalysis(tenantEntity, startdate, enddate); } //会员成长值 if (chart.equals(EnumChart.HYCZZ.getCode())) { - return getMemberGrowthAnalysis(tenantId, startdate, enddate); + return getMemberGrowthAnalysis(tenantEntity, startdate, enddate); } //会员手机品牌 if (chart.equals(EnumChart.HYSJPP.getCode())) { - return getMobileBrandAnalysis(tenantId, startdate, enddate); + return getMobileBrandAnalysis(tenantEntity, startdate, enddate); } //会员活跃度 if (chart.equals(EnumChart.HYHYD.getCode())) { - return getMemActivity(tenantId, startdate, enddate); + return getMemActivity(tenantEntity, startdate, enddate); } //卡营销数据 if (chart.equals(EnumChart.SALE_CARD.getCode())) { @@ -306,12 +311,12 @@ public class WxChartServiceImpl implements WxChartDataService { //砍价营销数据 if (chart.equals(EnumChart.SALE_PRESS.getCode())) { - return getSalePressAnalysis(paramsMap, tenantId, startdate, enddate); + return getSalePressAnalysis(paramsMap, tenantEntity, startdate, enddate); } //拼团营销数据 if (chart.equals(EnumChart.SALE_GROUP.getCode())) { - return getSaleGroupAnalysis(paramsMap, tenantId, startdate); + return getSaleGroupAnalysis(paramsMap, tenantEntity, startdate); } //首页商铺出租数据 @@ -321,32 +326,32 @@ public class WxChartServiceImpl implements WxChartDataService { //首页商铺出租数据 if (chart.equals(EnumChart.INDEX_BILL_RECE_RATE.getCode())) { - return getBillReceRate(tenantId, startdate); + return getBillReceRate(tenantEntity, startdate); } //首页场景发券 if (chart.equals(EnumChart.INDEX_COUPON_SCENE.getCode())) { - return new ResultData(markingDataReportService.getSceneDataHistory(tenantId, startdate, enddate)); + return new ResultData(markingDataReportService.getSceneDataHistory(tenantEntity, startdate, enddate)); } //首页营销数据 if (chart.equals(EnumChart.INDEX_SALE_DATA.getCode())) { - return getSaleDataHistory(tenantId, startdate, enddate); + return getSaleDataHistory(tenantEntity, startdate, enddate); } //商铺出租率走势 if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { - return getRentRateHistory(tenantId,paramsMap); + return getRentRateHistory(tenantEntity,paramsMap); } //业务分析 if (chart.equals(EnumChart.BUSINESS.getCode())) { - return getBusiness(tenantId,paramsMap); + return getBusiness(tenantEntity,paramsMap); } //电能分析 if (chart.equals(EnumChart.POWER_SUMMERY.getCode())) { - return getPowerSummery(tenantId,paramsMap); + return getPowerSummery(tenantEntity); } return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); @@ -416,17 +421,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 用电分析 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getPowerSummery(String tenantId,Map paramsMap){ + private ResultData getPowerSummery(TenantEntity tenantEntity){ Map resultMap = new HashMap<>(); KwMeterDataDto kwMeterDataDto = new KwMeterDataDto(); kwMeterDataDto.setStartTime(addDay(-29)); kwMeterDataDto.setEndTime(addDay(1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); kwMeterDataDto.setReportType(EnumMeterDataReportType.DAY.getCode()); List kwMeterDataVosDaily = kwMeterDataService.findVoList(kwMeterDataDto); @@ -459,7 +464,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto = new KwMeterDataDto(); kwMeterDataDto.setStartTime(addMonth(-11)); kwMeterDataDto.setEndTime(addMonth(1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); kwMeterDataDto.setReportType(EnumMeterDataReportType.MONTH.getCode()); List kwMeterDataVosMonthly = kwMeterDataService.findVoList(kwMeterDataDto); @@ -483,7 +488,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto = new KwMeterDataDto(); kwMeterDataDto.setStartTime(addDay(0)); kwMeterDataDto.setEndTime(addDay(1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); kwMeterDataDto.setReportType(EnumMeterDataReportType.HOUR.getCode()); List kwMeterDataVosHourly = kwMeterDataService.findVoList(kwMeterDataDto); @@ -508,12 +513,12 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto.setStartTime(addDay(-1)); kwMeterDataDto.setEndTime(addDay(new Date(), -1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo yesterdayUsedPower = kwMeterDataService.getPower(kwMeterDataDto); kwMeterDataDto.setStartTime(addDay(0)); kwMeterDataDto.setEndTime(addDay(new Date(), 0)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo todayUsedPower = kwMeterDataService.getPower(kwMeterDataDto); if (todayUsedPower.getUsedPower() != null) @@ -534,14 +539,14 @@ public class WxChartServiceImpl implements WxChartDataService { kwMeterDataDto.setStartTime(addMonth(0)); kwMeterDataDto.setEndTime(addMonth(new Date(),0)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo thisMonthUsedPower = kwMeterDataService.getPower(kwMeterDataDto); if (thisMonthUsedPower.getUsedPower() != null) resultMap.put("thisMonthUsedPower",thisMonthUsedPower.getUsedPower()); kwMeterDataDto.setStartTime(addMonth(-1)); kwMeterDataDto.setEndTime(addMonth(new Date(),-1)); - kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.updateTenantInfo(tenantEntity); KwMeterDataVo lastMonthUsedPower = kwMeterDataService.getPower(kwMeterDataDto); if (lastMonthUsedPower.getUsedPower() != null) resultMap.put("lastMonthUsedPower",lastMonthUsedPower.getUsedPower()); @@ -555,7 +560,7 @@ public class WxChartServiceImpl implements WxChartDataService { } KwMeter kwMeter = new KwMeter(); - kwMeter.setTenantId(tenantId); + kwMeter.updateTenantInfo(tenantEntity); kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); int meterCount = kwMeterService.selectCount(kwMeter); @@ -566,7 +571,7 @@ public class WxChartServiceImpl implements WxChartDataService { resultMap.put("boxMeterCount",boxMeterCount); KwMerchantMeter kwMerchantMeter = new KwMerchantMeter(); - kwMerchantMeter.setTenantId(tenantId); + kwMerchantMeter.updateTenantInfo(tenantEntity); kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); int merchantMeterCount = kwMerchantMeterService.selectCount(kwMerchantMeter); resultMap.put("merchantMeterCount",merchantMeterCount); @@ -586,7 +591,7 @@ public class WxChartServiceImpl implements WxChartDataService { kwMerchantMeterDataDto.setLimitCount(null); List businessPower = kwMerchantMeterService.findDataVoList(kwMerchantMeterDataDto); - List businessList = wxBusinessService.findListAll(tenantId,null); + List businessList = wxBusinessService.findListAll(tenantEntity,null); businessList.stream().forEach(b->{ Optional businessData = businessPower.stream().filter(bd->bd.getBusinessId().equals(b.getId())).findAny(); if (businessData.isPresent()) { @@ -607,17 +612,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 业态分析 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getBusiness(String tenantId,Map paramsMap){ + private ResultData getBusiness(TenantEntity tenantEntity,Map paramsMap){ Map resultMap = new LinkedMap(); List businessList = wxBusinessService.findList(new WxBusiness()); for (WxBusiness b:businessList) { resultMap.put(b.getTitle(),0l); } Map query = new HashedMap(); - query.put("tenantId",tenantId); + query.put("tenantId",tenantEntity.getTenantId()); query.put("id",paramsMap.get("id")); query.put("buildingId",paramsMap.get("buildingId")); List> mapList = wxMerchantMapper.findBusByFloorId(query); @@ -629,14 +634,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 首页商铺出租率走势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getRentRateHistory(String tenantId,Map paramsMap) { + private ResultData getRentRateHistory(TenantEntity tenantEntity,Map paramsMap) { Integer dateType = Integer.parseInt(paramsMap.get("dateType")); Map queryMap = new HashMap<>(); - queryMap.put("tenantId",tenantId); + queryMap.put("tenantId",tenantEntity.getTenantId()); queryMap.put("dateType",dateType); String building = paramsMap.get("building"); @@ -655,7 +660,7 @@ public class WxChartServiceImpl implements WxChartDataService { // get all WxShop query = new WxShop(); - query.setTenantId(tenantId); + query.updateTenantInfo(tenantEntity); List allList = wxShopMapper.findList(query); List> mapList = wxShopMapper.rentRateHistory(queryMap); @@ -700,12 +705,12 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 解单数据 - 月 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMerchantTradeMonthly(String tenantId) { + private ResultData getMerchantTradeMonthly(TenantEntity tenantEntity) { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); @@ -734,16 +739,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日已绑车牌量 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getBindCarAnalysis(String tenantId) { + private ResultData getBindCarAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); String yesterday = DateUtils.getTimeBefore(1, new Date()); String lastweek = DateUtils.getTimeBefore(7, new Date()); //绑定车牌 Map carParams = new HashMap<>(); - carParams.put("tenantId", tenantId); + carParams.put("tenantId", tenantEntity.getTenantId()); carParams.put("startdate", DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); carParams.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); long todaybindcar = wxCUserCarMapper.queryCarCount(carParams); @@ -773,16 +778,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 实时车流量 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarDataCurrent(String tenantId) { + private ResultData getCarDataCurrent(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); String yesterday = DateUtils.getTimeBefore(1, new Date()); String lastweek = DateUtils.getTimeBefore(7, new Date()); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); params.put("startdate", systemTime + " 05:00:00"); params.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); @@ -844,14 +849,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 数据塔台-数据总览-车流数据 | 数据塔台-车流数据-(历史车流量 + 今日车流量 + 上周同期) - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarHistoryAndTodayAndHB(String tenantId, boolean withOthers ) { + private ResultData getCarHistoryAndTodayAndHB(TenantEntity tenantEntity, boolean withOthers ) { String startdate; HashMap datamap = new HashMap<>(); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); startdate = DateUtils.getTimeBefore(30, new Date()); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); @@ -919,13 +924,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周线上缴费车辆 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarPayCarCountInWeek(String tenantId) { + private ResultData getCarPayCarCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -937,13 +942,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周线上缴费金额 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarPayCountInWeek(String tenantId) { + private ResultData getCarPayCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -978,16 +983,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 车流 - 近一周新增停车会员 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarNewMemberCount(String tenantId) { + private ResultData getCarNewMemberCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); try { wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate)); wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate)); @@ -997,7 +1002,7 @@ public class WxChartServiceImpl implements WxChartDataService { datamap.put("oneWeekNewCarUserCount", wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); //停车会员总数 wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); - wxCUserBasicInfoDto.setTenantId(tenantId); + wxCUserBasicInfoDto.updateTenantInfo(tenantEntity); datamap.put("newCarUserSumCount", wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); return new ResultData(datamap); @@ -1006,13 +1011,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 车流 - 近一周新增会员数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCarNewMemberCountInWeek(String tenantId) { + private ResultData getCarNewMemberCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); HashMap weekParams = new HashMap<>(); - weekParams.put("tenantId", tenantId); + weekParams.put("tenantId", tenantEntity.getTenantId()); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date()); weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); @@ -1047,14 +1052,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日券交易数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getTodayTouchUser(String tenantId) { + private ResultData getTodayTouchUser(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); //查询UV PV HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-1)); params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); @@ -1076,15 +1081,15 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日券交易数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getTodayCouponCount(String tenantId) { + private ResultData getTodayCouponCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); //今日领取券数 //查询coupon order表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setStartTime(addDay(0)); wxCouponOrder.setEndTime(addDay(1)); int todayCouponCount = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -1112,14 +1117,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 今日场景营销 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSaleSceneCount(String tenantId) { + private ResultData getSaleSceneCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); - int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(0), addDay(1)); - int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-1), addDay(0)); - int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantId, addDay(-7), addDay(-6)); + int todaySceneCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(0), addDay(1)); + int yesterdayCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-1), addDay(0)); + int lastWeekCount = wxCouponActionLogMapper.getCountByDateLimit(tenantEntity.getTenantId(), addDay(-7), addDay(-6)); NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2);//控制保留小数点后几位,2:表示保留2位小数点 String sceneDownDay = "--"; @@ -1138,14 +1143,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 触达用户数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getTouchUserCount(String tenantId) { + private ResultData getTouchUserCount(TenantEntity tenantEntity) { String startdate; String enddate;//查询UV PV HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List wxUserVisitList = wxUserVisitMapper.touchUsersReportData(params); @@ -1175,16 +1180,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 场景营销数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSceneData(String tenantId) { + private ResultData getSceneData(TenantEntity tenantEntity) { String startdate; String enddate; HashMap datamap = new HashMap<>(); HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); //停车发券数 停车发券被核销数 核销发券数 核销发券被核销数 @@ -1192,7 +1197,7 @@ public class WxChartServiceImpl implements WxChartDataService { //停车发券被核销数 HashMap params1 = new HashMap<>(); - params1.put("tenantId", tenantId); + params1.put("tenantId", tenantEntity.getTenantId()); params1.put("startTime", addDay(-30)); params1.put("endTime", addDay(1)); params1.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode());//停车 @@ -1201,7 +1206,7 @@ public class WxChartServiceImpl implements WxChartDataService { //核销发券被核销数 HashMap params2 = new HashMap<>(); - params2.put("tenantId", tenantId); + params2.put("tenantId", tenantEntity.getTenantId()); params2.put("startTime", addDay(-30)); params2.put("endTime", addDay(1)); params2.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode());//核销 @@ -1210,7 +1215,7 @@ public class WxChartServiceImpl implements WxChartDataService { // B端刷卡支付被核销数 HashMap params3 = new HashMap<>(); - params3.put("tenantId", tenantId); + params3.put("tenantId", tenantEntity.getTenantId()); params3.put("startTime", addDay(-30)); params3.put("endTime", addDay(1)); params3.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode());//B端刷卡支付 @@ -1219,10 +1224,10 @@ public class WxChartServiceImpl implements WxChartDataService { // 购买发券被核销数 HashMap params4 = new HashMap<>(); - params3.put("tenantId", tenantId); - params3.put("startTime", addDay(-30)); - params3.put("endTime", addDay(1)); - params3.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 + params4.put("tenantId", tenantEntity.getTenantId()); + params4.put("startTime", addDay(-30)); + params4.put("endTime", addDay(1)); + params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券 List list4 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params4); Map OrderCountMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount())); @@ -1272,13 +1277,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 活跃用户 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewUserCount(String tenantId) { + private ResultData getNewUserCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); long allCount = wxCUserMapper.findCount(dto);//总数 Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1298,10 +1303,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 活跃用户 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getActiveMemberCount(String tenantId) { + private ResultData getActiveMemberCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1312,7 +1317,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1330,10 +1335,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 线上交易 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getOnlineOrderCount(String tenantId) { + private ResultData getOnlineOrderCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, 1); @@ -1346,7 +1351,7 @@ public class WxChartServiceImpl implements WxChartDataService { WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); int thisMonthCount = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder);//月消费金额 c.clear(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1356,7 +1361,7 @@ public class WxChartServiceImpl implements WxChartDataService { startTime = c.getTime(); wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); int todayCount = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder);//月消费金额 DecimalFormat df = new DecimalFormat("0.00"); datamap.put("todayCount", df.format((float) todayCount / 100));//今日消费金额 @@ -1365,10 +1370,10 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - private ResultData getNewMemberCount(String tenantId, int days, String returnName) { + private ResultData getNewMemberCount(TenantEntity tenantEntity, int days, String returnName) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); @@ -1395,19 +1400,19 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周新增用户数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewMemberInWeek(String tenantId) { - return getNewMemberCount(tenantId, 7, "weekVos"); + private ResultData getNewMemberInWeek(TenantEntity tenantEntity) { + return getNewMemberCount(tenantEntity, 7, "weekVos"); } /** * 近一周活跃用户数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getActiveMemberCountInWeek(String tenantId) { + private ResultData getActiveMemberCountInWeek(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1418,7 +1423,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -7); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1450,10 +1455,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 近一周线上交易金额(元) - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getWeekMoneyData(String tenantId) { + private ResultData getWeekMoneyData(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); Date today = c.getTime(); @@ -1468,7 +1473,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime(); c.add(Calendar.DAY_OF_YEAR, -7); Date sTime = c.getTime(); - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1496,10 +1501,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 销售数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSaleAnalysis(String tenantId) { + private ResultData getSaleAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); Date sTime = c.getTime(); @@ -1509,7 +1514,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.set(Calendar.SECOND, 0); Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), sTime, eTime); List monthVos = new ArrayList<>();//周消费金额 Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { @@ -1535,7 +1540,7 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(datamap); } - private ResultData getActiveMemberAnalysis(String tenantId) { + private ResultData getActiveMemberAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1546,7 +1551,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1578,19 +1583,19 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 新增用户趋势-月 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewMemberTradeMonthly(String tenantId) { - return getNewMemberCount(tenantId, 29, "monthVos"); + private ResultData getNewMemberTradeMonthly(TenantEntity tenantEntity) { + return getNewMemberCount(tenantEntity, 29, "monthVos"); } /** * 活跃用户趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getActiveMemberTrade(String tenantId) { + private ResultData getActiveMemberTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_YEAR, -1); @@ -1601,7 +1606,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30); Date startTime = c.getTime(); MarkingCouponDataReportDto markingCouponDataReportDto = new MarkingCouponDataReportDto(); - markingCouponDataReportDto.setTenantId(tenantId); + markingCouponDataReportDto.updateTenantInfo(tenantEntity); markingCouponDataReportDto.setStartTime(startTime); markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); @@ -1633,10 +1638,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 线上交易趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getOnlineTrade(String tenantId) { + private ResultData getOnlineTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); Calendar c = Calendar.getInstance(); Date today = c.getTime(); @@ -1647,7 +1652,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 Date sTime = c.getTime(); - List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1675,13 +1680,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 微信用户总数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemeberWechatTotal(String tenantId) { + private ResultData getMemeberWechatTotal(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); //微信用户数据 long wxallCount = wxCUserMapper.findCount(dto);//总量 Calendar c = Calendar.getInstance(); @@ -1699,13 +1704,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员总数 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemberTotalCount(String tenantId) { + private ResultData getMemberTotalCount(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); long allCount = wxCUserBasicInfoMapper.findCount(dto);//总量 Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1722,14 +1727,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 微信用户累计趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemberWechatJoinTrade(String tenantId) { + private ResultData getMemberWechatJoinTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); final int daysBefore = 29; WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); @@ -1776,16 +1781,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 券交易数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getCouponSaleAnalysis(String tenantId) { + private ResultData getCouponSaleAnalysis(TenantEntity tenantEntity) { String startdate; String enddate; HashMap datamap = new HashMap<>(); //couponData HashMap params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startTime", addDay(-30)); params.put("endTime", addDay(1)); List couponDatalist = wxCouponOrderMapper.couponDataMap(params); @@ -1815,13 +1820,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员累计趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getMemberJoinTrade(String tenantId) { + private ResultData getMemberJoinTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); final int daysBefore = 29; Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1869,14 +1874,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 拓客渠道 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getFromChannelAnalysis(String tenantId) { + private ResultData getFromChannelAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); List channelStructureList = new ArrayList<>(); WxCUser wxCUser = new WxCUser(); - wxCUser.setTenantId(tenantId); + wxCUser.updateTenantInfo(tenantEntity); List channels = wxUserChannelMapper.findDistinctChannel(); for (WxUserChannel w : channels) { WxUserChannel c = new WxUserChannel(); @@ -1903,14 +1908,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 微信用户新增趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getWechatMemberTrade(String tenantId) { + private ResultData getWechatMemberTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); final int daysBefore = 29; WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); @@ -1939,13 +1944,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员新增趋势 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getNewMemberTrade(String tenantId) { + private ResultData getNewMemberTrade(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); + dto.updateTenantInfo(tenantEntity); final int daysBefore = 29; Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 0); @@ -1975,14 +1980,14 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 场景排名 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSceneAnalysis(String tenantId) { + private ResultData getSceneAnalysis(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); List senceStructureList = new ArrayList<>(); WxCUser wxCUser = new WxCUser(); - wxCUser.setTenantId(tenantId); + wxCUser.updateTenantInfo(tenantEntity); List channels = wxUserChannelMapper.findDistinctChannel(); for (WxUserChannel w : channels) { WxUserChannel c = new WxUserChannel(); @@ -2006,18 +2011,18 @@ public class WxChartServiceImpl implements WxChartDataService { } /** - * 会员性别比例 TODO - * @param tenantId + * 会员性别比例 + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberSexRate(String tenantId, String startdate, String enddate) { + private ResultData getMemberSexRate(TenantEntity tenantEntity, String startdate, String enddate) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); - dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); - dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(DateUtils.stringToDate(startdate)); + dto.setEndTime(DateUtils.stringToDate(enddate)); long all = wxCUserBasicInfoMapper.findCount(dto); List vos = new ArrayList<>(); Calendar c = Calendar.getInstance(); @@ -2035,16 +2040,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员绑定车牌率 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberBindCar(String tenantId, String startdate, String enddate) { + private ResultData getMemberBindCar(TenantEntity tenantEntity, String startdate, String enddate) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); - dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); - dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(DateUtils.stringToDate(startdate)); + dto.setEndTime(DateUtils.stringToDate(enddate)); long total = wxCUserBasicInfoMapper.findCount(dto); long userCountWithCar = wxCUserCarMapper.countUser(dto); Map userWithCar = new HashMap(); @@ -2071,17 +2076,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员年龄层次 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberAgeAnalysis(String tenantId, String startdate, String enddate) { + private ResultData getMemberAgeAnalysis(TenantEntity tenantEntity, String startdate, String enddate) { HashMap datamap = new HashMap<>(); WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); - dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); - dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(DateUtils.stringToDate(startdate)); + dto.setEndTime(DateUtils.stringToDate(enddate)); long all = wxCUserBasicInfoMapper.findCount(dto); List vos = new ArrayList<>(); Calendar c = Calendar.getInstance(); @@ -2099,23 +2104,22 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员成长值 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemberGrowthAnalysis(String tenantId, String startdate, String enddate) { + private ResultData getMemberGrowthAnalysis(TenantEntity tenantEntity, String startdate, String enddate) { WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(tenantId); + wxLevelConfig.updateTenantInfo(tenantEntity); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigMapper.findList(wxLevelConfig); for (int i = 0; i < levelList.size(); i++) { - WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); - dto.setStartTime(DateUtils.stringToDate(startdate + " 00:00:00")); - dto.setEndTime(DateUtils.stringToDate(enddate + " 23:59:59")); + dto.updateTenantInfo(tenantEntity); + dto.setStartTime(DateUtils.stringToDate(startdate)); + dto.setEndTime(DateUtils.stringToDate(enddate)); if (i + 1 < levelList.size()) { dto.setLevelStartScore(levelList.get(i).getPoints()); dto.setLevelEndScore(levelList.get(i + 1).getPoints()); @@ -2139,16 +2143,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员手机品牌 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMobileBrandAnalysis(String tenantId, String startdate, String enddate) { + private ResultData getMobileBrandAnalysis(TenantEntity tenantEntity, String startdate, String enddate) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); - Date startTime = DateUtils.stringToDate(startdate + " 00:00:00"); - Date endTime = DateUtils.stringToDate(enddate + " 23:59:59"); + dto.updateTenantInfo(tenantEntity); + Date startTime = DateUtils.stringToDate(startdate); + Date endTime = DateUtils.stringToDate(enddate); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoMapper.findCount(dto); @@ -2162,7 +2166,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantId, startTime, endTime)); + tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -2176,16 +2180,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 会员活跃度 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getMemActivity(String tenantId, String startdate, String enddate) { + private ResultData getMemActivity(TenantEntity tenantEntity, String startdate, String enddate) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(tenantId); - Date startTime = DateUtils.stringToDate(startdate + " 00:00:00"); - Date endTime = DateUtils.stringToDate(enddate + " 23:59:59"); + dto.updateTenantInfo(tenantEntity); + Date startTime = DateUtils.stringToDate(startdate); + Date endTime = DateUtils.stringToDate(enddate); dto.setStartTime(startTime); dto.setEndTime(endTime); long total = wxCUserBasicInfoMapper.findCount(dto); @@ -2198,7 +2202,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < tags.length; i++) { WxTags tag = new WxTags(); tag.setName(tags[i].getMessage()); - tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantId, startTime, endTime)); + tag.setCount(wxCUserTagsMapper.countUser(JSON.toJSONString(tags[i].getCode()), tenantEntity.getTenantId(), startTime, endTime)); tagList.add(tag); total -= tag.getCount(); } @@ -2307,7 +2311,7 @@ public class WxChartServiceImpl implements WxChartDataService { result.put("sumPriceSaleMoney",wxCouponService.findSumPriceSaleMoney(wxCoupon)); result.put("sumPricePayMent",wxCouponService.findSumPricePayMent(wxCoupon)); result.put("sumSubsidyMoney",wxCouponService.findSumSubsidyMoney(wxCoupon)); - result.put("priceCouponCancelCount",priceCouponCancelCount);//有价卷退款数量 + result.put("priceCouponCancelCount",priceCouponCancelCount);//有价券退款数量 //有价券售出数量 int total = 0; @@ -2321,12 +2325,12 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 砍价营销数据 * @param paramsMap - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getSalePressAnalysis(Map paramsMap, String tenantId, String startdate, String enddate) { + private ResultData getSalePressAnalysis(Map paramsMap, TenantEntity tenantEntity, String startdate, String enddate) { WxCoupon wxCoupon = new WxCoupon(); Map result = new HashedMap(); @@ -2364,7 +2368,7 @@ public class WxChartServiceImpl implements WxChartDataService { result.put("pressSuccHistory",pressSuccHistoryMap); result.put("pressPaymentHistory",pressPaymentHistoryMap); - wxCoupon.setTenantId(tenantId); + wxCoupon.updateTenantInfo(tenantEntity); result.put("pressSendHistoryTotal",getTotal(pressSendHistoryMap)); result.put("pressSuccHistoryCount",getTotal(pressSuccHistoryMap)); @@ -2386,13 +2390,13 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 拼团营销数据 * @param paramsMap - * @param tenantId + * @param tenantEntity * @param startdate * @return */ - private ResultData getSaleGroupAnalysis(Map paramsMap, String tenantId, String startdate) { + private ResultData getSaleGroupAnalysis(Map paramsMap, TenantEntity tenantEntity, String startdate) { Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); //默认时间本月第一天,截止到当天 Map result = new HashMap<>(); Date startTime = new Date(); @@ -2459,17 +2463,17 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 昨日解单率 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getYesterdayTradeRate(String tenantId) { + private ResultData getYesterdayTradeRate(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(tenantId); + wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(1); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity); String reportdate = DateUtils.getTimeBefore(1, new Date()); wxMerchantTradeDaily.setReportDate(reportdate); List tradelist = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); @@ -2489,12 +2493,12 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 出租率 - * @param tenantId + * @param tenantEntity */ - private ResultData getRentRate(String tenantId) { + private ResultData getRentRate(TenantEntity tenantEntity) { HashMap datamap = new HashMap<>(); WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); + wxShop.updateTenantInfo(tenantEntity); wxShop.setStatus(EnumShopStatus.RENT.getCode()); List yczlist = wxShopMapper.findList(wxShop); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); @@ -2523,16 +2527,16 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 租金收缴率 - * @param tenantId + * @param tenantEntity * @param startdate * @param enddate * @return */ - private ResultData getRentMoneyRate(String tenantId, String startdate, String enddate) { + private ResultData getRentMoneyRate(TenantEntity tenantEntity, String startdate, String enddate) { HashMap datamap = new HashMap<>(); //租金 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startdate", startdate + " 00:00:00"); params.put("enddate", enddate + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfo(params); @@ -2693,10 +2697,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 费用收缴数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getBillReceRate(String tenantId, String startDateStr) { + private ResultData getBillReceRate(TenantEntity tenantEntity, String startDateStr) { HashMap datamap = new HashMap<>(); Date startDate = DateUtils.getDateFromString(startDateStr,"yyyy-MM-dd HH:mm:ss").getTime(); startDate = DateUtils.getFirstDayForCurrMonth(startDate); @@ -2704,7 +2708,7 @@ public class WxChartServiceImpl implements WxChartDataService { //租金收缴率 ysje 应收金额 ssje 实收金额 zjsjl收缴率 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); params.put("startdate", DateUtils.date2String(startDate,"yyyy-MM-dd") + " 00:00:00"); params.put("enddate", DateUtils.date2String(endDate,"yyyy-MM-dd") + " 23:59:59"); Map payinfo = wxBillRentMapper.queryPayInfoTotal(params); @@ -2793,7 +2797,7 @@ public class WxChartServiceImpl implements WxChartDataService { //==========欠缴数据========= BigDecimal totalOwe = new BigDecimal(0); WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setTenantId(tenantId); + wxBillAll.updateTenantInfo(tenantEntity); wxBillAll.setMonth(new SimpleDateFormat("yyyy-MM").format(startDate)); wxBillAll.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); List billTypeList = new ArrayList<>(); @@ -2869,10 +2873,10 @@ public class WxChartServiceImpl implements WxChartDataService { /** * 营销数据 - * @param tenantId + * @param tenantEntity * @return */ - private ResultData getSaleDataHistory(String tenantId, String startdate,String enddate) { + private ResultData getSaleDataHistory(TenantEntity tenantEntity, String startdate,String enddate) { Date startDate = DateUtils.getDateFromString(startdate,"yyyy-MM-dd HH:mm:ss").getTime(); Date endDate = DateUtils.getDateFromString(enddate,"yyyy-MM-dd HH:mm:ss").getTime(); @@ -2881,7 +2885,7 @@ public class WxChartServiceImpl implements WxChartDataService { TreeMap historyMap; Map countMap; WxCoupon couponQuery = new WxCoupon(); - couponQuery.setTenantId(tenantId); + couponQuery.updateTenantInfo(tenantEntity); couponQuery.setStartdate(startDate); couponQuery.setEnddate(endDate); @@ -2914,7 +2918,7 @@ public class WxChartServiceImpl implements WxChartDataService { } datamap.put("groupHistory",countHistoryMap); - //卷数据 + //券数据 wxCouponStatisVoList = wxCouponService.findCouponOrderCount(couponQuery); countHistoryMap = getDateMap(startDate,endDate); for (WxCouponStatisVo coupon:wxCouponStatisVoList){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index 6fc336793..53c3c5a5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCouponActionLog; import com.iformall.domain.vo.WxCouponActionLogVo; import com.iformall.exception.MallinkException; @@ -55,23 +56,23 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { } @Override - public void addOne(String tenantId, Long couponId, Long coupon_order_id, int channelType, Long channelId) { + public void addOne(TenantEntity tenantEntity, Long couponId, Long coupon_order_id, int channelType, Long channelId) { Date curDate = new Date(); - WxCouponActionLog actionLog = new WxCouponActionLog(); - actionLog.setTenantId(tenantId); - actionLog.setCouponId(couponId); - actionLog.setChannelId(channelId); - actionLog.setCouponOrderId(coupon_order_id); - actionLog.setChannelType(channelType); - actionLog.setCreateTime(curDate); - actionLog.setCreateTimeMd(new SimpleDateFormat("MM/dd").format(curDate)); - ; + WxCouponActionLog actionLog = new WxCouponActionLog() {{ + updateTenantInfo(tenantEntity); + setCouponId(couponId); + setChannelId(channelId); + setCouponOrderId(coupon_order_id); + setChannelType(channelType); + setCreateTime(curDate); + setCreateTimeMd(new SimpleDateFormat("MM/dd").format(curDate)); + }}; saveOrUpdate(actionLog); } @Override - public int getCountByChannelId(String tenantId, int channelType, Long channelId) { - return wxCouponActionLogMapper.getCountByChannelId(tenantId, channelType, channelId); + public int getCountByChannelId(TenantEntity tenantEntity, int channelType, Long channelId) { + return wxCouponActionLogMapper.getCountByChannelId(tenantEntity.getTenantId(), channelType, channelId); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index b8faef139..59bf9fe87 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponCVo; @@ -15,6 +16,7 @@ import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.*; +import com.iformall.utils.Constant; import com.iformall.utils.JsonUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -95,7 +97,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { //查找是否该券 在该频道有其他上架 WxCouponChannel query = new WxCouponChannel(); - query.setTenantId(orignal.getTenantId()); + query.updateTenantInfo(orignal); query.setCouponId(orignal.getCouponId()); query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());//已上架 query.setTargetAd(orignal.getTargetAd()); @@ -109,9 +111,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { WxCouponChannel orignal = getById(record.getId()); if (orignal.getStatus().equals(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()) && record.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { - wxScreenAdService.updateStatusByCouponChannelId(record.getId(),record.getTenantId(),EnumScreenAdStatus.INVALID.getCode()); + wxScreenAdService.updateStatusByCouponChannelId(record.getId(),record,EnumScreenAdStatus.INVALID.getCode()); //下架拼团券 - wxOrderService.updateOrderGroupStatusByCouponChannelId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); + wxOrderService.updateOrderGroupStatusByCouponChannelId(record.getId(), record, EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); //修改卡状态 wxCardInfoMapper.updateTransferStatusByCouponId(orignal.getCouponId()); //浮层下架 @@ -123,29 +125,29 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } //清除缓存 - clearCache(record.getTenantId()); + clearCache(record); return new ResultData(); } /** - * 清除c端首页卷列表缓存 - * @param tenantId + * 清除c端首页券列表缓存 + * @param tenantEntity */ - public void clearCache(String tenantId){ + public void clearCache(TenantEntity tenantEntity){ for (int i = 1; i <=5 ; i++) { - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()+tenantId+"_" + i + ":"; + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()+tenantEntity.getTenantId()+"_" + i + ":"; cdRedisTemplate.delete(key); } } @Override - public ResultData addBatch(String[] ids, String[] channelId, String tanantId, Date beginTime, Date endTime) { + public ResultData addBatch(String[] ids, String[] channelId, TenantEntity tenantEntity, Date beginTime, Date endTime) { List errorList = new ArrayList<>(); for (String targetIdstr:channelId) { Integer targetId = Integer.parseInt(targetIdstr); for (String couponidstr:ids) { Long couponid = Long.parseLong(couponidstr); - WxCouponChannelAddVo vo = addCouponChannel(couponid,targetId,tanantId,beginTime,endTime); + WxCouponChannelAddVo vo = addCouponChannel(couponid,targetId,tenantEntity,beginTime,endTime); if(!vo.isSuc()){ errorList.add(vo); } @@ -159,9 +161,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } @Override - public void updateStatusByCouponId(Long couponId, String tenantId, int status) { + public void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(tenantId); + wxCouponChannel.updateTenantInfo(tenantEntity); wxCouponChannel.setStatus(status); wxCouponChannel.setCouponId(couponId); wxCouponChannel.setUpdateDate(new Date()); @@ -207,7 +209,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return false; } - public WxCouponChannelAddVo addCouponChannel(Long couponid,Integer channelId,String tanantId,Date beginTime,Date endTime){ + public WxCouponChannelAddVo addCouponChannel(Long couponid,Integer channelId, TenantEntity tenantEntity,Date beginTime,Date endTime){ WxCouponChannelAddVo vo = new WxCouponChannelAddVo(); @@ -220,7 +222,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } WxCouponChannel wxCouponChannelQuery = new WxCouponChannel(); - wxCouponChannelQuery.setTenantId(tanantId); + wxCouponChannelQuery.updateTenantInfo(tenantEntity); wxCouponChannelQuery.setCouponId(couponid); wxCouponChannelQuery.setTargetAd(channelId); wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); @@ -274,7 +276,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponChannel.setCouponId(couponid); wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setTargetAd(channelId); - wxCouponChannel.setTenantId(tanantId); + wxCouponChannel.updateTenantInfo(tenantEntity); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannel.setTitle(wxCoupon.getTitle()); @@ -284,12 +286,12 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { vo.setType(channel.getType()); vo.setSuc(true); - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; WxCouponChannel couponChannel = new WxCouponChannel(); couponChannel.setId(vo.getId()); couponChannel.setType(vo.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index b59c5ae6c..da80b3454 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -95,7 +95,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { public ResultData add(WxCouponInject record) { try { - pushLimitService.checkSendTime(record.getTenantId()); + pushLimitService.checkSendTime(record); } catch (MallinkException e) { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(),e.getMessage()); @@ -140,7 +140,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { } record.setTags(JSON.toJSONString(record.getFilterList())); List userList = - wxCUserBasicInfoService.listByFilterList(record.getTenantId(),record.getFilterList()); + wxCUserBasicInfoService.listByFilterList(record,record.getFilterList()); if(userList.isEmpty()){ return new ResultData(ErrorCode.TAGS_MATCHED_NULL); @@ -191,9 +191,9 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { } WxMsg wxmsg=new WxMsg(); - wxmsg.setTenantId(record.getTenantId()); + wxmsg.updateTenantInfo(record); WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(wxmsg.getTenantId()); + wxMsgConfig.updateTenantInfo(record); wxMsgConfig = wxMsgConfigService.findObject(wxMsgConfig); if (wxMsgConfig==null){ return new ResultData(ErrorCode.MSG_SERVER_NOT_FIND); @@ -263,7 +263,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { boolean checkLimit = false; // 检查疲劳度 try { - checkLimit = pushLimitService.checkCoupon(tempCUser.getTenantId(), tempCUser.getId(), wxCoupon.getId()); + checkLimit = pushLimitService.checkCoupon(wxCoupon, tempCUser.getId(), wxCoupon.getId()); } catch (MallinkException e) { logger.error(e.getMessage()); } @@ -275,7 +275,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { try { couponOrder = wxOrderService.sendFreeCouponToUser(tempCUser.getId(), wxCoupon.getId(),null); if (couponOrder != null) { - wxCouponActionLogService.addOne(tempCUser.getTenantId(), wxCoupon.getId(), couponOrder.getId(), EnumCouponSendSendType.INJECT.getCode(), couponInjectId); + wxCouponActionLogService.addOne(couponOrder, wxCoupon.getId(), couponOrder.getId(), EnumCouponSendSendType.INJECT.getCode(), couponInjectId); } } catch (MallinkException e) { logger.error(e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 34908733b..1e9e66a28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg; import com.iformall.domain.po.msg.MpAppMsg; @@ -23,6 +24,7 @@ import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.pay.WxPayConstant; import com.iformall.service.*; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import com.iformall.utils.PayUtils; import org.apache.commons.lang3.StringUtils; @@ -388,7 +390,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setOperatorId(bUser.getId()); creditHistory.setCUserId(couponOrder.getcUserId()); creditHistory.setCreateDate(new Date()); - creditHistory.setTenantId(couponOrder.getTenantId()); + creditHistory.updateTenantInfo(couponOrder); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(wxCoupon.getBusiness()); @@ -402,11 +404,39 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } + private void doAfterVerify(WxCouponOrder couponOrder, WxCoupon wxCoupon, WxCUser cuUser) { + // 成长值 + try { + WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); + wxScoreRulesService.addScore2(EnumScoreType.CONSUMPTION, order, wxCoupon.getBusiness()); + } catch (Exception e) { + logger.error("成长值:" + e.getMessage()); + } + + // 积分 + try { + //-------此处为【现金支付】记录增加积分操作------- + WxCreditHistory creditHistory = new WxCreditHistory(); + creditHistory.setOperatorType(EnumUserType.CUSER.getCode()); + creditHistory.setOperatorId(cuUser.getId()); + creditHistory.setCUserId(couponOrder.getcUserId()); + creditHistory.setCreateDate(new Date()); + creditHistory.updateTenantInfo(couponOrder); + creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); + creditHistory.setCouponId(wxCoupon.getId()); + creditHistory.setBusinessId(wxCoupon.getBusiness()); + creditHistory.setSpend(couponOrder.getCouponPrice()); + wxCreditHistoryService.saveOrUpdate(creditHistory); + } catch (Exception e) { + logger.error("积分值:" + e.getMessage()); + } + } + @Override - public void sendInsideCouponVerifyMsg(String tenantId, Long couponOrderId, Long buUserId) { + public void sendInsideCouponVerifyMsg(TenantEntity tenantEntity, Long couponOrderId, Long buUserId) { FmInsideCouponVerifyMsg verifyMsg = new FmInsideCouponVerifyMsg(); verifyMsg.setMsgType(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode()); - verifyMsg.setTenantId(tenantId); + verifyMsg.updateTenantInfo(tenantEntity); verifyMsg.setCouponOrderId(couponOrderId); verifyMsg.setBUserId(buUserId); mqBaseProducer.sendMessage(verifyMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); @@ -416,7 +446,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public void actionAfterVerify(WxCouponOrder couponOrder, WxMerchantBUser bUser) { WxPayAccount wxPayAccountQuery = new WxPayAccount(); - wxPayAccountQuery.setTenantId(couponOrder.getTenantId()); + wxPayAccountQuery.updateTenantInfo(couponOrder); WxPayAccount wxPayAccount = wxPayAccountMapper.selectOne(new QueryWrapper<>(wxPayAccountQuery)); if (wxPayAccount != null && wxPayAccount.getShare().equals(EnumPayShare.NO.getCode())) { try { @@ -479,7 +509,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { final IdWorker idWorker = IdWorker.get(); Date curDate = new Date(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.setTenantId(couponOrder.getTenantId()); + merchantSubsidy.updateTenantInfo(couponOrder); merchantSubsidy.setOrderId(couponOrder.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); merchantSubsidy.setMerchantId(merchantId); @@ -503,7 +533,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 微信分账 try { WxPayOrder wxPayOrder = new WxPayOrder(); - wxPayOrder.setTenantId(couponOrder.getTenantId()); + wxPayOrder.updateTenantInfo(couponOrder); wxPayOrder.setOrderId(couponOrder.getOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); @@ -517,7 +547,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxSharingOrderDto.setOrderId(wxPayOrder.getId()); wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); - wxSharingOrderDto.setTenantId(wxPayOrder.getTenantId()); + wxSharingOrderDto.updateTenantInfo(wxPayOrder); wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); wxSharingOrderDto.setShareAmount(wxPayOrder.getShareAmount()); wxProfitSharingOrderService.createSharingOrder(wxSharingOrderDto); @@ -560,7 +590,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); } - WxAppinfo wxAppinfo = wxAppinfoService.getCAppInfo(couponOrder.getTenantId()); + WxAppinfo wxAppinfo = wxAppinfoService.getCAppInfo(couponOrder); WxPayAccount payAccount = wxPayAccountMapper.selectById(wxAppinfo.getPayId()); Integer subsidyNum = coupon.getSubsidyNum(); @@ -583,7 +613,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.setTenantId(couponOrder.getTenantId()); + merchantSubsidy.updateTenantInfo(couponOrder); merchantSubsidy.setOrderId(couponOrder.getOrderId()); merchantSubsidy.setOrderType(EnumOrderType.COUPON.getCode()); merchantSubsidy.setMerchantId(merchantId); @@ -623,7 +653,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public boolean sendCouponAfterMicroPay(String tenantId, Long orderId, Long cUserId) { + public boolean sendCouponAfterMicroPay(TenantEntity tenantEntity, Long orderId, Long cUserId) { // B端刷卡支付发券 WxOrder wxOrder = wxOrderMapper.selectById(orderId); if (wxOrder != null) { @@ -678,10 +708,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } boolean bUsed = false; - String gotopage = "pages/index/index"; + String gotopage = Constant.mainPageUrl; if (couponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()) { if (hadSentCoupon) { - gotopage = "pages/index/index?type=mc"; + gotopage = Constant.mainPageUrl + "?type=mc"; } bUsed = true; } @@ -716,7 +746,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // formId为空,获取prepayId WxPayOrder payOrder = null; WxPayOrder payOrderQ = new WxPayOrder(); - payOrderQ.setTenantId(couponOrder.getTenantId()); + payOrderQ.updateTenantInfo(couponOrder); payOrderQ.setOrderId(order.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); List payList = wxPayOrderMapper.selectList(new QueryWrapper(payOrderQ)); @@ -749,7 +779,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { * 检查 小程序模板消息是否超限 */ WxMsgLimit msgLimit = new WxMsgLimit(); - msgLimit.setTenantId(user.getTenantId()); + msgLimit.updateTenantInfo(merchant); msgLimit.setType(formType); msgLimit.setLimitId(formId); if (wxMsgLimitService.checkIsLimit(msgLimit)) { @@ -783,7 +813,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { mpAppMsg.setTo(user.getMpOpenId()); mpAppMsg.setMiniAppId(user.getAppId()); mpAppMsg.setMiniPagePath(gotopage); - mpAppMsg.setTenantId(couponOrder.getTenantId()); + mpAppMsg.updateTenantInfo(couponOrder); mpAppMsg.setTemplateType(EnumTemplateType.VERIFY_RESULT.getCode()); mpAppMsg.setDataList(Lists.newArrayList( merchant.getName(), @@ -804,7 +834,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { private void doVerifyAppUniformMsg(WxCouponOrder couponOrder, WxCoupon coupon, WxMerchant merchant, WxCUser user, SimpleDateFormat dateFormat, String gotopage) { WxAuthorizerInfo authQ = new WxAuthorizerInfo(); authQ.setAuthorizerAppid(user.getAppId()); - authQ.setTenantId(user.getTenantId()); + authQ.updateTenantInfo(merchant); WxAuthorizerInfo weappInfo = authorizerInfoMapper.findMp(authQ); if (weappInfo != null) { AppUniformMsg appUniformMsg = new AppUniformMsg(); @@ -845,7 +875,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { smartAppMsg = new SmartAppMsg(); smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); smartAppMsg.setAppId(user.getAppId()); - smartAppMsg.setTenantId(couponOrder.getTenantId()); + smartAppMsg.updateTenantInfo(couponOrder); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_SUCCESS.getCode()); smartAppMsg.setGotopage(gotopage); smartAppMsg.setTo(user.getOpenId()); @@ -880,7 +910,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { smartAppMsg = new SmartAppMsg(); smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); smartAppMsg.setAppId(user.getAppId()); - smartAppMsg.setTenantId(couponOrder.getTenantId()); + smartAppMsg.updateTenantInfo(couponOrder); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_FAIL.getCode()); smartAppMsg.setGotopage(gotopage); smartAppMsg.setTo(user.getOpenId()); @@ -903,8 +933,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override - public List queryPriceTotalGroup(String tenantId, Date startTime, Date endTime) { - return wxCouponOrderMapper.queryPriceTotalGroup(tenantId, startTime, endTime); + public List queryPriceTotalGroup(TenantEntity tenantEntity, Date startTime, Date endTime) { + return wxCouponOrderMapper.queryPriceTotalGroup(tenantEntity.getTenantId(), startTime, endTime); } @Override @@ -1034,7 +1064,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxCardTransferInfo wxCardTransferInfo = new WxCardTransferInfo(); final IdWorker idWorker = IdWorker.get(); wxCardTransferInfo.setId(idWorker.nextId()); - wxCardTransferInfo.setTenantId(cardCVo.getTenantId()); + wxCardTransferInfo.updateTenantInfo(couponOrder); wxCardTransferInfo.setCouponOrderId(couponOrder.getId()); wxCardTransferInfo.setFromUser(couponOrder.getCUserId()); wxCardTransferInfo.setToUser(couponOrder.getOwnerId()); @@ -1153,7 +1183,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public Integer microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer payPrice) { + public WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer payPrice) { // 1. 获取券信息 WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId()); if (wxCoupon == null) { @@ -1203,7 +1233,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 1. insert posOrderId PosCouponOrderVerify posCouponOrderVerify = new PosCouponOrderVerify(); - posCouponOrderVerify.setTenantId(couponOrder.getTenantId()); + posCouponOrderVerify.updateTenantInfo(couponOrder); posCouponOrderVerify.setCouponOrderId(couponOrder.getId()); posCouponOrderVerify.setPosOrderId(microOrder.getId()); posCouponOrderVerify.setOrderFrom(EnumOrderFrom.INSIDE.getCode()); @@ -1237,7 +1267,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { final IdWorker idWorker = IdWorker.get(); Long id = idWorker.nextId(); setId(id); - setTenantId(microOrder.getTenantId()); + updateTenantInfo(microOrder); setCUserId(microOrder.getCUserId()); setOrderId(microOrder.getId()); setCreateTime(curDate); @@ -1245,7 +1275,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { setPayTimeStart(curDate); setPayTimeEnd(curDate); setPayOrderNo(String.valueOf(id)); - setPayAmount(wxCoupon.getPrice()); + if (microOrder.getPayment() > wxCoupon.getPrice()) { + setPayAmount(wxCoupon.getPrice()); + } else { + setPayAmount(microOrder.getPayment()); + } setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); setShare(EnumPayShare.NO.getCode()); @@ -1259,16 +1293,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.error("payOrder error"); } - Integer remainPrice = payPrice - wxCoupon.getPrice(); - if (remainPrice < 0) { - remainPrice = 0; - } - - WxOrder updateOrder = new WxOrder(); - updateOrder.setId(microOrder.getId()); - updateOrder.setRealPayment(remainPrice); - wxOrderMapper.updateById(updateOrder); - return remainPrice; + return payOrder; } @Override @@ -1289,4 +1314,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return 0; } + @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public Integer shangAnVerify(Long couponOrderId) { + WxCouponOrder updateCouponOrder = new WxCouponOrder(); + updateCouponOrder.setId(couponOrderId); + updateCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); + updateCouponOrder.setUpdateDate(new Date()); + // 核销状态更新 + int num = wxCouponOrderMapper.updateById(updateCouponOrder); + if (num == 1) { + WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId); + WxCUser cuUser = wxCUserMapper.selectById(couponOrder.getcUserId()); + WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId()); + doAfterVerify(couponOrder, coupon, cuUser); + } + return 0; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 7df5b6534..6c02b00b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxCouponPassword; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponPasswordStatus; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import com.iformall.common.ErrorCode; @@ -94,13 +95,13 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { } @Override - public void mkPasswords(String tenantId, Long couponId, Integer inventory) { + public void mkPasswords(TenantEntity tenantEntity, Long couponId, Integer inventory) { String strAll = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; // 1.获取 coupon short 1 int couponShort = 0; String couponShortStr = "0"; WxCouponPassword pwQ = new WxCouponPassword(); - pwQ.setTenantId(tenantId); + pwQ.updateTenantInfo(tenantEntity); List pwgList = wxCouponPasswordMapper.findCouponGroupList(pwQ); couponShort = pwgList.size(); couponShortStr = String.valueOf(strAll.charAt(couponShort)); @@ -134,7 +135,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { for (int i=0;i list, Set phoneSet) { - String tenantId = record.getTenantId(); - //添加记录 final IdWorker idWorker = IdWorker.get(); long id = idWorker.nextId(); @@ -63,7 +62,7 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService { record.setSendAmount(phoneSet.size()); wxCouponPresentMapper.insert(record); //小程序 - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(record); String title = record.getCouponName(); String name = appInfo.getName(); List tempList = new ArrayList<>(); @@ -72,7 +71,7 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService { for (String phone : phoneSet) { WxCouponPassword couponPassword = list.get(i); //发送 - sendMsg(tenantId, phone, title, name, couponPassword.getPassword(), couponPassword.getId().toString()); + sendMsg(record, phone, title, name, couponPassword.getPassword(), couponPassword.getId().toString()); //记录发送数据便于更新状态 couponPassword.setPresentId(id); couponPassword.setSendedPhone(phone); @@ -84,7 +83,7 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService { return new ResultData(); } - private void sendMsg(String tenantId, String phone, String title, String appName, String password, String id) { + private void sendMsg(TenantEntity tenantEntity, String phone, String title, String appName, String password, String id) { logger.info("》》》》》》》》》》》"); logger.info("系统发卡发送短信开始"); logger.info("》》》》》》》》》》》"); @@ -97,7 +96,7 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.COUPON_CARD_SEND.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("》》》》》》》》》》》"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 4fcec1a4a..abd1d586d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.MpAppMsg; import com.iformall.domain.po.msg.WxMsgRecord; @@ -18,6 +19,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -101,7 +103,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { record.setSortColumns(BaseEntity.SortField.CreateDate_DESC); pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record)); for (WxCouponSendVo cs:pageInfo.getList()) - cs.setSendCount(wxCouponActionLogService.getCountByChannelId(record.getTenantId(), cs.getSendType(), cs.getId())); + cs.setSendCount(wxCouponActionLogService.getCountByChannelId(record, cs.getSendType(), cs.getId())); } return pageInfo; } @@ -116,7 +118,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { public void saveOrUpdate(WxCouponSend record) { //会员生日券配置 if (Objects.equals(record.getSendType(), EnumCouponSendSendType.BIRTHDAY.getCode())) { - WxCouponSend config = getConfig(record.getSendType(), record.getTenantId()); + WxCouponSend config = getConfig(record.getSendType(), record); if (Objects.nonNull(config)) { record.setConditions(config.getConditions()); } @@ -287,7 +289,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public boolean sendCouponToUser(EnumCouponSendSendType type, Object param) { - String tenantId; + TenantEntity tenantEntity; Long cUserId; switch (type) { case CAR_STOP: @@ -295,7 +297,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { return false; WxCUserCar wxCUserCar = (WxCUserCar) param; cUserId = wxCUserCar.getCUserId(); - tenantId = wxCUserCar.getTenantId(); + tenantEntity = new TenantEntity(); + tenantEntity.updateTenantInfo(wxCUserCar); break; case COUPON_VERIFY: case B_MICROPAY: @@ -304,7 +307,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { return false; WxOrder order = (WxOrder) param; cUserId = order.getCUserId(); - tenantId = order.getTenantId(); + tenantEntity = order; break; default: return false; @@ -319,7 +322,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { //查询开关是否打开 WxCouponSendConfig wxCouponSendConfig = new WxCouponSendConfig(); wxCouponSendConfig.setSendType(type.getCode()); - wxCouponSendConfig.setTenantId(tenantId); + wxCouponSendConfig.updateTenantInfo(tenantEntity); List configList = wxCouponSendConfigMapper.findList(wxCouponSendConfig); if (configList.size() > 0) { WxCouponSendConfig config = configList.get(0); @@ -331,7 +334,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { boolean checkTime = false; try { - checkTime = pushLimitService.checkSendTime(tenantId); + checkTime = pushLimitService.checkSendTime(tenantEntity); if (!checkTime) return false; } catch (MallinkException e) { @@ -342,7 +345,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { boolean bRet = false; WxCouponSend wxCouponSendQuery = new WxCouponSend(); - wxCouponSendQuery.setTenantId(tenantId); + wxCouponSendQuery.updateTenantInfo(tenantEntity); wxCouponSendQuery.setSendType(type.getCode()); wxCouponSendQuery.setStatus(EnumCouponSendStatus.VALID.getCode()); @@ -351,7 +354,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { boolean checkLimit = false; // 检查疲劳度 try { - checkLimit = pushLimitService.checkCoupon(tenantId, cUserId, send.getCouponId()); + checkLimit = pushLimitService.checkCoupon(tenantEntity, cUserId, send.getCouponId()); } catch (MallinkException e) { logger.error("券达到limit: " + e.getMessage()); } @@ -370,7 +373,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { if (couponOrder != null) { bRet = true; - wxCouponActionLogService.addOne(tenantId, send.getCouponId(), couponOrder.getId(), type.getCode(), send.getId()); + wxCouponActionLogService.addOne(couponOrder, send.getCouponId(), couponOrder.getId(), type.getCode(), send.getId()); // 查找cUser WxCUser user = wxCUserMapper.selectById(cUserId); @@ -380,7 +383,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { // 发送消息 if (couponOrder != null) { - sendMsgForSendCoupon(tenantId, send, couponOrder, user); + sendMsgForSendCoupon(couponOrder, send, couponOrder, user); } bRet = true; @@ -395,7 +398,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { return bRet; } - private void sendMsgForSendCoupon(String tenantId, WxCouponSend send, WxCouponOrder couponOrder, WxCUser user) { + private void sendMsgForSendCoupon(TenantEntity tenantEntity, WxCouponSend send, WxCouponOrder couponOrder, WxCUser user) { // 发送微信模板消息(公众号模板消息/小程序统一消息/小程序模板消息) sendMpMsgForSendCoupon(send, couponOrder, user); @@ -410,7 +413,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { String phone = user.getPhone(); //小程序名称 - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantEntity); String appName = appInfo.getName(); Map msgReplaceMap = new HashMap(); msgReplaceMap.put("title", title); @@ -420,7 +423,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.COUPON_SEND.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("》》》》》》》》》》》"); @@ -432,14 +435,14 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { private boolean sendMpMsgForSendCoupon(WxCouponSend send, WxCouponOrder couponOrder, WxCUser user) { // 发送 公众号 模板消息 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - String gotopage = "pages/index/index?type=mc"; + String gotopage = Constant.mainPageUrl + "?type=mc"; // 7. 公众号消息 if (StringUtils.isNotBlank(user.getMpAppId()) && StringUtils.isNotBlank(user.getMpOpenId()) && user.getMpSubscribe().equals(EnumUserIsSubscribe.YES.getCode())) { // 检查是否超限 WxMsgLimit msgLimit = new WxMsgLimit(); - msgLimit.setTenantId(user.getTenantId()); + msgLimit.updateTenantInfo(couponOrder); msgLimit.setType(EnumMsgLimitType.WXCHAT_OPENID_SEND.getCode()); msgLimit.setLimitId(user.getMpOpenId()); if (wxMsgLimitService.checkIsLimit(msgLimit)) { @@ -464,7 +467,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { mpAppMsg.setTo(user.getMpOpenId()); mpAppMsg.setMiniAppId(user.getAppId()); mpAppMsg.setMiniPagePath(gotopage); - mpAppMsg.setTenantId(couponOrder.getTenantId()); + mpAppMsg.updateTenantInfo(couponOrder); mpAppMsg.setTemplateType(EnumTemplateType.GIFT_MESSAGE.getCode()); mpAppMsg.setDataList(Lists.newArrayList( user.getNickName(), @@ -488,7 +491,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { // 8. 微信小程序-统一消息 // 检查是否超限 WxMsgLimit msgLimit = new WxMsgLimit(); - msgLimit.setTenantId(user.getTenantId()); + msgLimit.updateTenantInfo(user); msgLimit.setType(EnumMsgLimitType.WEAPP_OPENID_SEND.getCode()); msgLimit.setLimitId(user.getOpenId()); if (wxMsgLimitService.checkIsLimit(msgLimit)) { @@ -498,7 +501,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { // 获取小程序关联的服务号 WxAuthorizerInfo authQ = new WxAuthorizerInfo(); authQ.setAuthorizerAppid(user.getAppId()); - authQ.setTenantId(user.getTenantId()); + authQ.updateTenantInfo(user); WxAuthorizerInfo weappInfo = authorizerInfoMapper.findMp(authQ); if (weappInfo != null) { AppUniformMsg appUniformMsg = new AppUniformMsg(); @@ -529,9 +532,9 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } @Override - public void updateStatusByCouponId(Long couponId, String tenantId, int status) { + public void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status) { WxCouponSend wxCouponSend = new WxCouponSend(); - wxCouponSend.setTenantId(tenantId); + wxCouponSend.updateTenantInfo(tenantEntity); wxCouponSend.setCouponId(couponId); wxCouponSend.setStatus(status); wxCouponSend.setUpdateDate(new Date()); @@ -539,10 +542,10 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } @Override - public void saveOrUpdateConfig(Integer beforeDays, Integer sendType, String tenantId) { - WxCouponSend config = getConfig(sendType, tenantId); + public void saveOrUpdateConfig(Integer beforeDays, Integer sendType, TenantEntity tenantEntity) { + WxCouponSend config = getConfig(sendType, tenantEntity); if (Objects.isNull(config)) { - WxCouponSend couponSendQuery = createCouponSendQuery(sendType, tenantId) ; + WxCouponSend couponSendQuery = createCouponSendQuery(sendType, tenantEntity) ; insertCouponSend(beforeDays, couponSendQuery); } else { JSONObject couponSendJo = JSONObject.parseObject(config.getConditions()); @@ -568,8 +571,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } @Override - public WxCouponSend getConfig(Integer sendType, String tenantId) { - WxCouponSend couponSendQuery = createCouponSendQuery(sendType, tenantId) ; + public WxCouponSend getConfig(Integer sendType, TenantEntity tenantEntity) { + WxCouponSend couponSendQuery = createCouponSendQuery(sendType, tenantEntity) ; //读取会员生日券配置信息 List wxCouponSendList = wxCouponSendMapper.selectList(new QueryWrapper(couponSendQuery)); if (CollectionUtils.isEmpty(wxCouponSendList)) { @@ -580,10 +583,10 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { return wxCouponSendList.get(0); } - private WxCouponSend createCouponSendQuery(Integer sendType, String tenantId) { + private WxCouponSend createCouponSendQuery(Integer sendType, TenantEntity tenantEntity) { WxCouponSend couponSendQuery = new WxCouponSend(); couponSendQuery.setSendType(sendType); - couponSendQuery.setTenantId(tenantId); + couponSendQuery.updateTenantInfo(tenantEntity); couponSendQuery.setCouponId(0L); couponSendQuery.setStatus(EnumCouponSendStatus.INVALID.getCode()); return couponSendQuery ; @@ -630,8 +633,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { // 发放免费券 WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(cu.getId(), cs.getCouponId(), cs); if (couponOrder != null) { - wxCouponActionLogService.addOne(cu.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); - sendMsgForSendCoupon(cs.getTenantId(), cs, couponOrder, cu); + wxCouponActionLogService.addOne(couponOrder, cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); + sendMsgForSendCoupon(couponOrder, cs, couponOrder, cu); } else { logger.warn("handSel couponOrder is null"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 2cf116f3f..29c4d85cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCouponMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponStatisVo; @@ -107,7 +108,7 @@ public class WxCouponServiceImpl implements WxCouponService { List ids = wxCouponList.stream().map(p -> p.getId()).collect(Collectors.toList()); WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(wxCoupon.getTenantId()); + wxCouponChannel.updateTenantInfo(wxCoupon); wxCouponChannel.setCouponIds(ids); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); //上架状态 @@ -342,7 +343,7 @@ public class WxCouponServiceImpl implements WxCouponService { if (record.getPasswordSupport() != null && record.getPasswordSupport().equals(EnumCouponPasswordSupport.SUPPORTED.getCode())) { // 如果用户启用卡密,生成数据并保存 - couponPasswordService.mkPasswords(record.getTenantId(), record.getId(), record.getInventory()); + couponPasswordService.mkPasswords(record, record.getId(), record.getInventory()); } record.setCreateDate(new Date()); @@ -417,16 +418,16 @@ public class WxCouponServiceImpl implements WxCouponService { //下架所有投放频道 wxCouponChannelService - .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); + .updateStatusByCouponId(record.getId(), record, EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); //下架所有场景投放 wxCouponSendService - .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponSendStatus.INVALID.getCode()); + .updateStatusByCouponId(record.getId(), record, EnumCouponSendStatus.INVALID.getCode()); //下架所有已砍价券 - wxOrderService.updateStatusByPressCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); + wxOrderService.updateStatusByPressCouponId(record.getId(), record, EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); //下架所有相关广告 - wxScreenAdService.updateStatusByCouponId(record.getId(), record.getTenantId(), EnumScreenAdStatus.INVALID.getCode()); + wxScreenAdService.updateStatusByCouponId(record.getId(), record, EnumScreenAdStatus.INVALID.getCode()); //下架拼团券 - wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); + wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record, EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); // 卡下架后,转赠找不到卡相关信息,所以修改卡转赠状态为不可转赠 wxCardInfoMapper.updateTransferStatusByCouponId(record.getId()); // 卡券下架,未使用的卡密要下架 @@ -438,18 +439,18 @@ public class WxCouponServiceImpl implements WxCouponService { } //清空缓存 - clearCache(record.getTenantId()); + clearCache(record); return new ResultData(record.getId()); } /** - * 清除c端首页卷列表缓存 - * @param tenantId + * 清除c端首页券列表缓存 + * @param tenantEntity */ - public void clearCache(String tenantId){ + public void clearCache(TenantEntity tenantEntity){ for (int i = 1; i <=5 ; i++) { - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +tenantId+"_" + i + ":"; + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +tenantEntity.getTenantId()+"_" + i + ":"; cdRedisTemplate.delete(key); } } @@ -616,7 +617,7 @@ public class WxCouponServiceImpl implements WxCouponService { Integer oldSale = oldCoupon.getInventory() - oldCoupon.getRemainInventory(); if (!newSale.equals(oldSale)) { // 已售卖数不变 - logger.error("券库存要保证同增同减"); + logger.error("券库存要保证同增同减 " + newSale + ", " + oldSale); return new ResultData(ErrorCode.COUPON_STOCK_ERR.getCode(), "券库存要保证同增同减"); } if (!wxCoupon.getValidType().equals(oldCoupon.getValidType())) { @@ -655,7 +656,7 @@ public class WxCouponServiceImpl implements WxCouponService { Integer oldSale1 = wxCoupon.getInventory() - wxCoupon.getOrgInventory(); if (!newSale1.equals(oldSale1)) { // 库存要保证,同增同减 - logger.error("券库存要保证同增同减"); + logger.error("券库存要保证同增同减"+ newSale1 + ", " + oldSale1); return new ResultData(ErrorCode.COUPON_STOCK_NO_EQUAL_ERR); } @@ -667,7 +668,7 @@ public class WxCouponServiceImpl implements WxCouponService { // 5. 更新coupon channel 有效期 if(wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { WxCouponChannel couponChannel = new WxCouponChannel(); - couponChannel.setTenantId(wxCoupon.getTenantId()); + couponChannel.updateTenantInfo(wxCoupon); couponChannel.setCouponId(wxCoupon.getId()); couponChannel.setEndTime(wxCoupon.getValidEndDate()); wxCouponChannelMapper.updateEndTimeByCouponId(couponChannel); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 32081e12a..633ec5678 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -330,13 +331,13 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } @Override - public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId,String tenantId) { + public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity) { WxMerchant wxMerchant = wxMerchantMapper.selectById(merchantId); Map creditMap = Maps.newHashMap(); if (wxMerchant != null && wxMerchant.getBusinessId() != null) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setBusinessId(wxMerchant.getBusinessId()); - wxCreditHistory.setTenantId(tenantId); + wxCreditHistory.updateTenantInfo(tenantEntity); int credit; int creditNew = 0 ; if (StringUtils.isNotBlank(spendStr)) { @@ -407,35 +408,35 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return 0; } // 1. 获取当前租户下积分的增加规则 - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.LOGIN, WxScoreRules.SCORE); } private int bindCarAddCredit(WxCreditHistory record) { // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE); } private int personAddCredit(WxCreditHistory record) { // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.WECHAT_PERSION, WxScoreRules.SCORE); } private int phoneAddCredit(WxCreditHistory record) { // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); + WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record); // 2. 获取成长值 return wxScoreRules.getRule(EnumScoreType.WECHAT_PHONE, WxScoreRules.SCORE); } private int checkCompleteInfoScoreCount(WxCUser cUser) { WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(cUser.getTenantId()); + wxCreditHistory.updateTenantInfo(cUser); wxCreditHistory.setCUserId(cUser.getId()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); return wxCreditHistoryMapper.countList(wxCreditHistory); @@ -446,7 +447,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (user == null || checkCompleteInfoScoreCount(user) > 0) return 0; // 1. 获取score rules - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user.getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record); // 2. 获取成长值 return scoreRules.getRule(EnumScoreType.COMPLETE_INFO, WxScoreRules.SCORE); } @@ -460,7 +461,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } //根据商户id和花费金额计算需要新增的积分 - Map map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null,record.getTenantId()); + Map map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null,record); return map.get("credit"); } @@ -475,7 +476,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditNum() != null && record.getCreditNum() == 0) return 0; // 1. 获取score rules - WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); + WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record); // 2. 获取成长值 by id JSONObject payRule = scoreRules.getRuleObj(EnumScoreType.CONSUMPTION); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java index 2961c80c0..8e46e6795 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java @@ -2,10 +2,13 @@ package com.iformall.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.common.IdWorker; +import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCuserFloatingLayer; import com.iformall.domain.po.WxFloatingLayer; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumFloatingLayerStatus; +import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxCUserMapper; import com.iformall.mapper.WxCuserFloatingLayerMapper; import com.iformall.mapper.WxFloatingLayerMapper; @@ -24,6 +27,9 @@ import java.util.Date; public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + WxAppinfoMapper appinfoMapper; + @Autowired WxCuserFloatingLayerMapper wxCuserFloatingLayerMapper; @@ -41,9 +47,9 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ user.setOpenId(openId); user.setAppId(appId); WxCUser byOpenId = wxCUserMapper.findByOpenId(user); - String tenantId = byOpenId.getTenantId(); if (byOpenId == null) { - return getWxFloatingLayer(tenantId); + WxAppinfo appinfo = appinfoMapper.findByAppId(appId); + return getWxFloatingLayer(appinfo.getTenantInfo()); } //2 用户存在 查看是否已有弹出记录 没有 保存记录后返回浮层信息 WxCuserFloatingLayer wxCuserFloatingLayerQuery = new WxCuserFloatingLayer(); @@ -51,7 +57,7 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ WxCuserFloatingLayer wxCuserFloatingLayer = wxCuserFloatingLayerMapper.selectOne(new QueryWrapper<>(wxCuserFloatingLayerQuery)); if (wxCuserFloatingLayer == null) { saveCuserFloatingLayer(byOpenId); - return getWxFloatingLayer(tenantId); + return getWxFloatingLayer(byOpenId); } return null; } @@ -62,14 +68,14 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ final IdWorker idWorker = IdWorker.get(); wxCuserFloatingLayer.setId(idWorker.nextId()); wxCuserFloatingLayer.setUserId(wxCUser.getId()); - wxCuserFloatingLayer.setTenantId(wxCUser.getTenantId()); + wxCuserFloatingLayer.updateTenantInfo(wxCUser); wxCuserFloatingLayer.setCreateTime(new Date()); wxCuserFloatingLayerMapper.insert(wxCuserFloatingLayer); } - public WxFloatingLayer getWxFloatingLayer(String tenantId) { + public WxFloatingLayer getWxFloatingLayer(TenantEntity tenantEntity) { WxFloatingLayer wxFloatingLayer = new WxFloatingLayer(); - wxFloatingLayer.setTenantId(tenantId); + wxFloatingLayer.updateTenantInfo(tenantEntity); wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode()); return wxFloatingLayerMapper.selectOne(new QueryWrapper<>(wxFloatingLayer)); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java index 30a31682b..60a8d5517 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java @@ -53,7 +53,7 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService WxDateAmountRecord record = new WxDateAmountRecord(); record.setDate(amount.getDate()); - record.setTenantId(amount.getTenantId()); + record.updateTenantInfo(amount); record.setMerchantId(amount.getMerchantId()); record.setType(amount.getType()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFloatingLayerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFloatingLayerServiceImpl.java index bcd1eef51..5cc7af117 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFloatingLayerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFloatingLayerServiceImpl.java @@ -51,7 +51,7 @@ public class WxFloatingLayerServiceImpl implements WxFloatingLayerService { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "小程序跳转路径不能为空"); } WxFloatingLayer wxFloatingLayerQuery = new WxFloatingLayer(); - wxFloatingLayerQuery.setTenantId(wxFloatingLayer.getTenantId()); + wxFloatingLayerQuery.updateTenantInfo(wxFloatingLayer); wxFloatingLayerQuery.setStatus(wxFloatingLayer.getStatus()); Integer integer = wxFloatingLayerMapper.selectCount(new QueryWrapper<>(wxFloatingLayerQuery)); if (integer > 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index bbcc3fead..c1b984516 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.FlowUserVo; @@ -102,9 +103,9 @@ public class WxFlowServiceImpl implements WxFlowService { * @param flowType * @return */ - public WxFlowModel getModelByType(int flowType,String tenantId){ + public WxFlowModel getModelByType(int flowType, TenantEntity tenantEntity){ WxFlowModel model = new WxFlowModel(); - model.setTenantId(tenantId); + model.updateTenantInfo(tenantEntity); model.setFlowType(flowType); List list = getModelBybusiness(model); if(CollectionUtils.isNotEmpty(list)){ @@ -292,7 +293,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxCoupon.setRemainInventory(remainInventory); wxCoupon.setType(type); wxCoupon.setValidType(validType); - wxCoupon.setTenantId(wxCoupon.getTenantId()); + wxCoupon.updateTenantInfo(wxCoupon); wxCouponService.updateCouponStockAndEndTime(wxCoupon); } }else if(EnumCouponAppType.CANCLE.getCode().equals(operateType)){ @@ -306,7 +307,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxCoupon.setApprovalType(operateType); wxCouponMapper.updateById(wxCoupon); //清除缓存 - clearCache(wxCoupon.getTenantId()); + clearCache(wxCoupon); }else if(EnumFlowKey.SETTLE.getCode().equals(flowType)){ WxBillSettle wxBillSettle = new WxBillSettle(); wxBillSettle.setId(businessId); @@ -333,12 +334,12 @@ public class WxFlowServiceImpl implements WxFlowService { } /** - * 清除c端首页卷列表缓存 - * @param tenantId + * 清除c端首页券列表缓存 + * @param tenantEntity */ - public void clearCache(String tenantId){ + public void clearCache(TenantEntity tenantEntity){ for (int i = 1; i <=5 ; i++) { - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()+tenantId+"_" + i + ":"; + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()+tenantEntity.getTenantId()+"_" + i + ":"; cdRedisTemplate.delete(key); } } @@ -389,13 +390,13 @@ public class WxFlowServiceImpl implements WxFlowService { @Override @Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) - public ResultData start(Map params,Long userId,String userName,String tenantId) { + public ResultData start(Map params,Long userId,String userName,TenantEntity tenantEntity) { String remark = (String)params.get("remark"); Long businessId = Long.parseLong(params.get("businessId").toString()); Integer flowType = getIngeter(params.get("businessType")); List> variables = (List)params.get("variables"); - WxFlowModel flowModel = getModelByType(flowType,tenantId); + WxFlowModel flowModel = getModelByType(flowType,tenantEntity); if(flowModel== null || StringUtils.isBlank(flowModel.getFlowId())){ return new ResultData(ResultData.ERROR, "您尚未设置审批模板,请先设置。"); } @@ -413,7 +414,7 @@ public class WxFlowServiceImpl implements WxFlowService { map.put("variables",variables); map.put("taskAssignee",flowModel.getFlow()); setSignAssignee(map,flowModel.getFlow()); - map.put("tenantId",tenantId); + map.put("tenantId",tenantEntity.getTenantId()); ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(flowModel.getFlowId(), map); logger.debug("流程启动,流程id:{}",processInstance.getId()); @@ -439,12 +440,12 @@ public class WxFlowServiceImpl implements WxFlowService { //给审批人发送代办通知短信 List mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); for (MallUserInfo mallUserInfo:mallUserInfoList) { - sendAssigneeMsgAndEmail(tenantId, mallUserInfo.getPhone(), mallUserInfo.getEmail(), starterInfo.getName(), businessId, flowType, variables); + sendAssigneeMsgAndEmail(tenantEntity, mallUserInfo.getPhone(), mallUserInfo.getEmail(), starterInfo.getName(), businessId, flowType, variables); } return new ResultData(); } - public void sendAssigneeMsgAndEmail(String tenantId, String phone, String email, String userName, Long businessId, Integer flowType, List> variables) { + public void sendAssigneeMsgAndEmail(TenantEntity tenantEntity, String phone, String email, String userName, Long businessId, Integer flowType, List> variables) { Map dynamicContentMap = new HashMap<>(); dynamicContentMap.put("userName",userName); dynamicContentMap.put("page", Constant.adminPage); @@ -452,7 +453,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); if(isContract(flowType)){ dynamicContentMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -474,7 +475,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("name",userName); msgReplaceMap.put("linkName",userName); msgReplaceMap.put("linkPhone",phone); - ResultData resultData = getTaskStatusList(businessId, tenantId); + ResultData resultData = getTaskStatusList(businessId, tenantEntity); List flowRecordList = (List) resultData.data; String taskListHtml = ""; for (int i = flowRecordList.size() -1; i>=0; i--) { @@ -533,7 +534,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -604,13 +605,13 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId,String tenantId) { + public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId,TenantEntity tenantEntity) { TaskQuery taskQuery = taskService.createTaskQuery(); //流程过滤条件 if(StringUtils.isNotBlank(flowType)) { List definitionKeyList = new ArrayList<>(); for (String ft : flowType.split(",")) { - WxFlowModel flowModel = getModelByType(Integer.parseInt(ft),tenantId); + WxFlowModel flowModel = getModelByType(Integer.parseInt(ft),tenantEntity); if(flowModel!=null) { definitionKeyList.add(flowModel.getFlowId()); } @@ -665,17 +666,17 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData applyHistory(Long businessId,String tenantId) { + public ResultData applyHistory(Long businessId,TenantEntity tenantEntity) { List result; WxCoupon query = new WxCoupon(); - query.setTenantId(tenantId); + query.updateTenantInfo(tenantEntity); query.setId(businessId); List couponList = wxCouponMapper.findList(query); if(CollectionUtils.isNotEmpty(couponList)) { WxCoupon coupon = couponList.get(0); - result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId,coupon.getApprovalType())); + result = wxFlowRecordService.findList(new WxFlowRecord(tenantEntity, businessId,coupon.getApprovalType())); }else{ - result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); + result = wxFlowRecordService.findList(new WxFlowRecord(tenantEntity, businessId)); } if(CollectionUtils.isNotEmpty(result)){ @@ -699,8 +700,8 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData getTaskStatusList(Long businessId, String tenantId) { - List resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); + public ResultData getTaskStatusList(Long businessId, TenantEntity tenantEntity) { + List resultList = wxFlowRecordService.findList(new WxFlowRecord(tenantEntity, businessId)); if(CollectionUtils.isEmpty(resultList)){ return new ResultData(); } @@ -877,7 +878,7 @@ public class WxFlowServiceImpl implements WxFlowService { @Override @Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) - public ResultData apply(Map params,Long userId,String userName,String tenantId) { + public ResultData apply(Map params,Long userId,String userName,TenantEntity tenantEntity) { String taskId = params.get("taskId"); String processInstanceId = params.get("processInstanceId"); String remark = params.get("remark"); @@ -914,7 +915,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecordService.saveOrUpdate(wxFlowRecord); // 判断流程是否结束,并发送短信通知 - boolean end = isEndAndSendMsg(mapInfo,taskKey,processInstanceId,tenantId,userName); + boolean end = isEndAndSendMsg(mapInfo,taskKey,processInstanceId,tenantEntity,userName); //修改记录表当前状态 if(end){ @@ -929,13 +930,13 @@ public class WxFlowServiceImpl implements WxFlowService { * 判断流程是否结束,并发送短信通知 * @param taskKey * @param processInstanceId - * @param tenantId + * @param tenantEntity */ - public boolean isEndAndSendMsg(Map mapInfo,String taskKey,String processInstanceId,String tenantId,String userName){ + public boolean isEndAndSendMsg(Map mapInfo,String taskKey,String processInstanceId,TenantEntity tenantEntity,String userName){ // 发送短信 Map msgReplaceMap; WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.updateTenantInfo(tenantEntity); Map userMap = (Map)mapInfo.get("starter"); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); String email = (String)userMap.get("email"); @@ -961,7 +962,7 @@ public class WxFlowServiceImpl implements WxFlowService { List mallUserInfoList = getUserByProcessInstanceId(processInstanceId); for (int i = 0; i < mallUserInfoList.size(); i++) { MallUserInfo mallUserInfo = mallUserInfoList.get(i); - sendAssigneeMsgAndEmail(tenantId, mallUserInfo.getPhone(), mallUserInfo.getEmail(), userName, businessId, flowType, variables); + sendAssigneeMsgAndEmail(tenantEntity, mallUserInfo.getPhone(), mallUserInfo.getEmail(), userName, businessId, flowType, variables); if(i == mallUserInfoList.size()-1){ assignee += mallUserInfo.getName(); }else{ @@ -979,7 +980,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -1006,7 +1007,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelType(EnumMailMsgModel.MAIL_APPLY_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -1029,7 +1030,7 @@ public class WxFlowServiceImpl implements WxFlowService { return false; }else{ //继续递归判断 - return isEndAndSendMsg(mapInfo,taskKey,processInstanceId,tenantId,userName); + return isEndAndSendMsg(mapInfo,taskKey,processInstanceId,tenantEntity,userName); } }else{ updateBusinessStatus(mapInfo,EnumRentContractAppStatus.FINISH.getCode()); @@ -1043,7 +1044,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_PASS_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -1070,7 +1071,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelType(EnumMailMsgModel.MAIL_PASS_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -1140,7 +1141,7 @@ public class WxFlowServiceImpl implements WxFlowService { @Override @Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) - public ResultData reject(Map params,Long userId,String userName,String userPhone,String tenantId) { + public ResultData reject(Map params,Long userId,String userName,String userPhone,TenantEntity tenantEntity) { String processInstanceId = (String)params.get("processInstanceId"); String remark = (String)params.get("remark"); @@ -1196,7 +1197,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap != null ? (String) userMap.get("phone") : ""); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); if (isContract(flowType)) { msgReplaceMap.put("bustype", "合同"); } else if (isBill(flowType)) { @@ -1231,7 +1232,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelType(EnumMailMsgModel.MAIL_REJECT_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); + mailMsg.updateTenantInfo(tenantEntity); if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ @@ -1515,7 +1516,7 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData delModel(WxFlowModel wxFlowModel) { WxFlowConfig query = new WxFlowConfig(); - query.setTenantId(wxFlowModel.getTenantId()); + query.updateTenantInfo(wxFlowModel); query.setModelId(wxFlowModel.getId()); if(CollectionUtils.isNotEmpty(wxFlowConfigMapper.findList(query))){ return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" + @@ -1543,7 +1544,7 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData getTotal(Long userId, String tenantId) { + public ResultData getTotal(Long userId, TenantEntity tenantEntity) { TaskQuery taskQuery = taskService.createTaskQuery(); int total = taskQuery.taskCandidateOrAssigned(userId.toString()).list().size(); return new ResultData(total); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index ab911d527..0ecefd21e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -121,7 +121,7 @@ public class WxGameServiceImpl implements WxGameService { final IdWorker idWorker = IdWorker.get(); WxGameActionLog wxGameActionLog = new WxGameActionLog(); wxGameActionLog.setUserId(userId); - wxGameActionLog.setTenantId(wxCouponOrder.getTenantId()); + wxGameActionLog.updateTenantInfo(wxCouponOrder); wxGameActionLog.setGameId(gameId); wxGameActionLog.setCouponOrderId(wxCouponOrder.getOrderId()); wxGameActionLog.setId(idWorker.nextId()); @@ -138,7 +138,7 @@ public class WxGameServiceImpl implements WxGameService { return new ResultData(ErrorCode.GAME_NOT_FOUND); WxGameActionLog wxGameActionLog = new WxGameActionLog(); - wxGameActionLog.setTenantId(wxGame.getTenantId()); + wxGameActionLog.updateTenantInfo(wxGame); wxGameActionLog.setUserId(userId); wxGameActionLog.setGameId(gameId); @@ -163,7 +163,7 @@ public class WxGameServiceImpl implements WxGameService { private List getParams(WxGame record) { // 获取已上架的CouponChannel WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.setTenantId(record.getTenantId()); + couponChannelQ.updateTenantInfo(record); couponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); couponChannelQ.setSubTargetId(record.getId()); couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); @@ -223,7 +223,7 @@ public class WxGameServiceImpl implements WxGameService { private void delCouponChannelBatch(WxGame record) { // couponChannel 下架 WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); - wxCouponChannelQ.setTenantId(record.getTenantId()); + wxCouponChannelQ.updateTenantInfo(record); wxCouponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); wxCouponChannelQ.setSubTargetId(record.getId()); wxCouponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); @@ -240,7 +240,7 @@ public class WxGameServiceImpl implements WxGameService { private void addOrUpdateCouponChannelBatch(List couponIds, WxGame record) { // 获取已上架的CouponChannel WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); - wxCouponChannelQ.setTenantId(record.getTenantId()); + wxCouponChannelQ.updateTenantInfo(record); wxCouponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); wxCouponChannelQ.setSubTargetId(record.getId()); wxCouponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); @@ -303,7 +303,7 @@ public class WxGameServiceImpl implements WxGameService { wxCouponChannel.setCouponId(couponId); wxCouponChannel.setType(wxCoupon.getType()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); - wxCouponChannel.setTenantId(wxCoupon.getTenantId()); + wxCouponChannel.updateTenantInfo(wxCoupon); wxCouponChannel.setBusiness(wxCoupon.getBusiness()); wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannel.setTitle(wxCoupon.getTitle()); @@ -317,7 +317,7 @@ public class WxGameServiceImpl implements WxGameService { couponChannel.setId(wxCouponChannel.getId()); couponChannel.setType(wxCouponChannel.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 992e964ea..76c92bc72 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxLevelMerchant; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxLevelConfigMapper; @@ -55,7 +56,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { l.setScale(WxLevelConfig.DEFAULT_SCALE); } WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.setTenantId(l.getTenantId()); + dto.updateTenantInfo(record); dto.setLevelStartScore(l.getPoints()); if (i + 1 records) { + public void batchSaveByMerchantId(TenantEntity tenantEntity, Long merchantId, List records) { final IdWorker idWorker = IdWorker.get(); records.stream().forEach(l->{ @@ -96,7 +97,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { }else { wxLevelMerchantParam.setId(idWorker.nextId()); wxLevelMerchantParam.setCreateDate(new Date()); - wxLevelMerchantParam.setTenantId(tenantId); + wxLevelMerchantParam.updateTenantInfo(tenantEntity); wxLevelMerchantParam.setDiscount(l.getCount().intValue()); wxLevelMerchantapper.insert(wxLevelMerchantParam); } @@ -118,6 +119,14 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { return wxLevelConfigMapper.findList(wxLevelConfig); } + @Override + public List getByTenantInfo(TenantEntity tenantEntity) { + WxLevelConfig wxLevelConfig = new WxLevelConfig(); + wxLevelConfig.updateTenantInfo(tenantEntity); + wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); + return wxLevelConfigMapper.findList(wxLevelConfig); + } + @Override public WxLevelConfig getById(Long id) { return wxLevelConfigMapper.selectById(id); @@ -137,9 +146,9 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Transactional(rollbackFor = {Exception.class}) @Override - public void batchSave(String tenantId, List records) { + public void batchSave(TenantEntity tenantEntity, List records) { final IdWorker idWorker = IdWorker.get(); - wxLevelConfigMapper.deleteAll(tenantId); + wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); List levelConfigs = new ArrayList<>(); for(WxLevelConfig levelConfig: records) { if(levelConfig.getId() == null) { @@ -149,18 +158,18 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } else { levelConfig.setUpdateDate(new Date()); } - levelConfig.setTenantId(tenantId); + levelConfig.updateTenantInfo(tenantEntity); levelConfigs.add(levelConfig); } wxLevelConfigMapper.insertBatch(levelConfigs); } @Override - public void batchUpdateCapabilities(String tenantId, List records) { + public void batchUpdateCapabilities(TenantEntity tenantEntity, List records) { List levelConfigs = new ArrayList(); for(WxLevelConfig levelConfig: records) { if(levelConfig.getId() != null && levelConfig.getCount() != null) { - levelConfig.setTenantId(tenantId); + levelConfig.updateTenantInfo(tenantEntity); levelConfig.setUpdateDate(new Date()); JSONObject jo = new JSONObject(); jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); @@ -182,14 +191,14 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } @Override - public void deleteAll(String tenantId) { - wxLevelConfigMapper.deleteAll(tenantId); + public void deleteAll(TenantEntity tenantEntity) { + wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); } @Override - public String getLevel(String tenantId, int score) { - return wxLevelConfigMapper.getLevel(tenantId,score); + public String getLevel(TenantEntity tenantEntity, int score) { + return wxLevelConfigMapper.getLevel(tenantEntity.getTenantId(),score); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index fb0f156b7..708e7328a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMallBuildingFloorDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; import com.iformall.mapper.WxMallBuildingMapper; @@ -57,17 +58,17 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { } @Override - public ResultData getbuildinglist(String tenantId) { + public ResultData getBuildingList(TenantEntity tenantEntity) { WxMallBuilding wxMallBuilding = new WxMallBuilding(); - wxMallBuilding.setTenantId(tenantId); + wxMallBuilding.updateTenantInfo(tenantEntity); List list = wxMallBuildingMapper.findList(wxMallBuilding); return new ResultData(list); } @Override - public ResultData getbuildingfloorlist(String tenantId) { + public ResultData getBuildingFloorList(TenantEntity tenantEntity) { WxMallBuilding wxMallBuilding = new WxMallBuilding(); - wxMallBuilding.setTenantId(tenantId); + wxMallBuilding.updateTenantInfo(tenantEntity); List buildings = wxMallBuildingMapper.findList(wxMallBuilding); List wxMallBuildings = buildings.stream().map(b -> { WxMallBuilding tempb = new WxMallBuilding(); @@ -105,36 +106,39 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { String [] floors = record.getFloors().split(","); // 楼座 - WxMallBuilding mallBuilding = new WxMallBuilding(); - mallBuilding.setId(idWorker.nextId()); - mallBuilding.setTenantId(record.getTenantId()); - mallBuilding.setName(record.getBuilding()); - mallBuilding.setFloorNumber(floors.length); + WxMallBuilding mallBuilding = new WxMallBuilding() {{ + setId(idWorker.nextId()); + updateTenantInfo(record); + setName(record.getBuilding()); + setFloorNumber(floors.size()); + }}; wxMallBuildingMapper.insert(mallBuilding); // 楼层 for(String floor: floors) { - WxMallFloor mallFloor = new WxMallFloor(); - mallFloor.setId(idWorker.nextId()); - mallFloor.setTenantId(record.getTenantId()); - mallFloor.setBuildingId(mallBuilding.getId()); - mallFloor.setFloorName(floor); - mallFloor.setBackgroundImg(Constant.floor_back_img); + WxMallFloor mallFloor = new WxMallFloor() {{ + setId(idWorker.nextId()); + updateTenantInfo(record); + setBuildingId(mallBuilding.getId()); + setFloorName(floor); + setBackgroundImg(Constant.floor_back_img); + }}; wxMallFloorMapper.insert(mallFloor); } } @Override public void saveFloorArea(WxMallFloor record) { - WxMallFloor mallFloor = new WxMallFloor(); - mallFloor.setId(record.getId()); - mallFloor.setTenantId(record.getTenantId()); - if (record.getTotalArea() != null) { - mallFloor.setTotalArea(record.getTotalArea()); - } - if (record.getOperatingArea() != null) { - mallFloor.setOperatingArea(record.getOperatingArea()); - } + WxMallFloor mallFloor = new WxMallFloor() {{ + setId(record.getId()); + updateTenantInfo(record); + if (record.getTotalArea() != null) { + setTotalArea(record.getTotalArea()); + } + if (record.getOperatingArea() != null) { + setOperatingArea(record.getOperatingArea()); + } + }}; wxMallFloorMapper.updateById(mallFloor); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java index a9800980e..ce324cc79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallFloor; import com.iformall.mapper.WxMallFloorMapper; import com.iformall.service.WxMallFloorService; @@ -50,9 +51,9 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { @Override - public ResultData getfloorlist(String tenantId,Long buildingId) { + public ResultData getFloorList(TenantEntity tenantEntity, Long buildingId) { WxMallFloor wxMallFloor = new WxMallFloor(); - wxMallFloor.setTenantId(tenantId); + wxMallFloor.updateTenantInfo(tenantEntity); wxMallFloor.setBuildingId(buildingId); List list = wxMallFloorMapper.findList(wxMallFloor); return new ResultData(list); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 26eb18d65..876260ee9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -1,7 +1,9 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; @@ -117,6 +119,69 @@ public class WxMallServiceImpl implements WxMallService { } } + @Override + public WxMall getByTenantInfo(TenantEntity tenantEntity) { + StringBuilder sb = new StringBuilder(); + sb.append(Constant.TENANT_KEY_PREV).append(tenantEntity.getTenantId()); + String key = sb.toString(); + + ValueOperations operations = mallRedisTemplate.opsForValue(); + // 缓存 + boolean hasKey = mallRedisTemplate.hasKey(key); + if(hasKey) { + // 从缓存获取用户信息 + WxMall mall = operations.get(key); + return mall; + } + // 不存在,从数据库中获取 + WxMall mall = null; + try { + mall = wxMallMapper.getByTenantId(tenantEntity.getTenantId()); + } catch (Exception e) { + logger.error(e.getMessage()); + } + // 插入缓存 + if (mall != null) { + operations.set(key, mall, 3600, TimeUnit.SECONDS); + } + return mall; + } + + @Override + public WxMall getByTenantInfoExt(TenantEntity tenantEntity) { + WxMall mall = getByTenantInfo(tenantEntity); + if (mall == null) { + return null; + } + WxMallBuilding wxMallBuilding = new WxMallBuilding() {{ + updateTenantInfo(tenantEntity); + }}; + List buildings = wxMallBuildingMapper.findList(wxMallBuilding); + List wxMallBuildings = buildings.stream().map(b -> { + WxMallBuilding tempb = new WxMallBuilding(); + tempb.setId(b.getId()); + tempb.setName(b.getName()); + return tempb; + }).collect(Collectors.toList()); + + for(WxMallBuilding building:wxMallBuildings){ + WxMallFloor wxMallFloor = new WxMallFloor(); + wxMallFloor.setBuildingId(building.getId()); + List wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { + WxMallFloor tempf = new WxMallFloor(); + tempf.setId(f.getId()); + tempf.setFloorName(f.getFloorName()); + tempf.setTotalArea(f.getTotalArea()); + tempf.setOperatingArea(f.getOperatingArea()); + return tempf; + }).collect(Collectors.toList()); + building.setFloors(wxMallFloors); + + } + mall.setBuildings(wxMallBuildings); + return mall; + } + @Override public WxMall getByTenantId(String id) { String key = Constant.MALL_KEY_PREV + String.valueOf(id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 90eeb3d79..ffeda3ad5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -8,6 +9,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxAppinfoMapper; @@ -88,27 +90,27 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { } @Override - public boolean hasphone(String phone, String tenantId) { + public boolean hasPhone(TenantEntity tenantEntity, String phone) { WxMerchantBUser bUser = new WxMerchantBUser(); - bUser.setTenantId(tenantId); + bUser.updateTenantInfo(tenantEntity); bUser.setPhone(phone); bUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); - List list = wxMerchantBUserMapper.findList(bUser); - return list.size() >= 1 ? true : false; + Integer buSize = wxMerchantBUserMapper.selectCount(new QueryWrapper<>(bUser)); + return buSize >= 1 ? true : false; } @Override - public ResultData updatepwd(String appId, String phone, String code, String pwd) { + public ResultData updatePwd(String appId, String phone, String code, String pwd) { WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(appinfo.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setCode(code); - List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); + List msgValidationCodeList = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); Date currentdate = new Date(); - wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> + msgValidationCodeList = msgValidationCodeList.stream().filter(validationcode -> validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); - if (wxmsgvalidationcodelist.size() > 0) { + if (msgValidationCodeList.size() > 0) { //更新 WxMerchantBUser bUser = new WxMerchantBUser(); bUser.setTenantId(appinfo.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 0b3b6e750..9eccbeef2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantSimpleVo; import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; @@ -135,9 +136,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { } @Override - public List findList(String tenantId) { + public List findList(TenantEntity tenantEntity) { WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(tenantId); + wxMerchant.updateTenantInfo(tenantEntity); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List wxMerchantList = wxMerchantMapper.findList(wxMerchant); List collect = wxMerchantList.stream().map(x -> { @@ -273,7 +274,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { //解绑商铺-没有租赁合同或物业合同才可以 if (countRentContract == 0 || countPropertyContract == 0) { WxMerchantShop wxMerchantShopQuery = new WxMerchantShop(); - wxMerchantShopQuery.setTenantId(wxMerchant.getTenantId()); + wxMerchantShopQuery.updateTenantInfo(wxMerchant); wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); wxMerchantShopQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery); @@ -282,7 +283,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantShopMapper.updateById(wxMerchantShop); //更新商铺状态 WxShop wxShop = new WxShop(); - wxShop.setTenantId(wxMerchant.getTenantId()); + wxShop.updateTenantInfo(wxMerchant); wxShop.setId(wxMerchantShop.getShopId()); wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); wxShopMapper.updateById(wxShop); @@ -298,7 +299,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } //作废卡券 WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); - wxCouponMerchant.setTenantId(wxMerchant.getTenantId()); + wxCouponMerchant.updateTenantInfo(wxMerchant); wxCouponMerchant.setMerchantId(wxMerchant.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); List wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); @@ -307,7 +308,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { couponIds.stream().filter(cid->!isCouponMerchantValid(cid)).forEach(cid->{ WxCoupon wxCoupon = new WxCoupon(); wxCoupon.setId(cid); - wxCoupon.setTenantId(wxMerchant.getTenantId()); + wxCoupon.updateTenantInfo(wxMerchant); wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); wxCouponService.saveOrUpdate(wxCoupon); }); @@ -349,7 +350,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { //关联表插入 wxMerchantShop.setId(idWorker.nextId()); wxMerchantShop.setMerchantId(merchantId); - wxMerchantShop.setTenantId(wxMerchant.getTenantId()); + wxMerchantShop.updateTenantInfo(wxMerchant); wxMerchantShop.setShopId(shopid); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); Date shopdate = new Date(); @@ -500,7 +501,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { final IdWorker idWorker = IdWorker.get(); WxMerchantCorp record = wxMerchant.getWxMerchantCorp(); record.setId(idWorker.nextId()); - record.setTenantId(wxMerchant.getTenantId()); + record.updateTenantInfo(wxMerchant); record.setMerchantId(wxMerchant.getId()); Date date = new Date(); record.setCreateDate(date); @@ -534,7 +535,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { final IdWorker idWorker = IdWorker.get(); WxMerchantTax record = wxMerchant.getWxMerchantTax(); record.setId(idWorker.nextId()); - record.setTenantId(wxMerchant.getTenantId()); + record.updateTenantInfo(wxMerchant); record.setMerchantId(wxMerchant.getId()); Date date = new Date(); record.setCreateDate(date); @@ -586,7 +587,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { long id = idWorker.nextId(); user.setId(id); user.setMerchantId(wxMerchant.getId()); - user.setTenantId(wxMerchant.getTenantId()); + user.updateTenantInfo(wxMerchant); user.setAppId(wxAppinfo.getAppId()); Date date = new Date(); user.setCreateDate(date); @@ -595,7 +596,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantBUserMapper.insert(user); } else {//有id的更新 user.setMerchantId(wxMerchant.getId()); - user.setTenantId(wxMerchant.getTenantId()); + user.updateTenantInfo(wxMerchant); user.setAppId(wxAppinfo.getAppId()); Date date = new Date(); user.setUpdateDate(date); @@ -617,7 +618,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } wxMerchantMapper.updateById(wxMerchant); - wxLevelConfigService.batchSaveByMerchantId(wxMerchant.getTenantId(), wxMerchant.getId(), wxMerchant.getLevelConfigList()); + wxLevelConfigService.batchSaveByMerchantId(wxMerchant, wxMerchant.getId(), wxMerchant.getLevelConfigList()); } catch (Exception e) { logger.error("db failed: 账号操作失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -705,7 +706,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (isUse.equals(EnumProfitSharingUse.NO.getCode())) { type = EnumMsgModel.ACCEPT_SHARING_ACCOUNT_NOTIFY_MANAGER.getCode(); } - wxProfitSharingReceiverService.sendMsg(linkPhone, accout, merchantName, null, type, tenantId); + wxProfitSharingReceiverService.sendMsg(linkPhone, accout, merchantName, null, type, wxMerchant); return new ResultData(Result.SUCCESS, "操作成功"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 803e6da56..8d503363c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantTradeDaily; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.mapper.WxMerchantTradeDailyMapper; import com.iformall.mapper.WxShopMapper; @@ -117,7 +118,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ final IdWorker idWorker = IdWorker.get(); wxMerchantTradeDaily.setId(idWorker.nextId()); - wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(merchant); wxMerchantTradeDaily.setMerchantId(merchant.getId()); wxMerchantTradeDaily.setbUserId(userId); wxMerchantTradeDaily.setTradeAmt(volume + ""); @@ -156,7 +157,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ final IdWorker idWorker = IdWorker.get(); wxMerchantTradeDaily.setId(idWorker.nextId()); - wxMerchantTradeDaily.setTenantId(tradeDaily.getTenantId()); + wxMerchantTradeDaily.updateTenantInfo(tradeDaily); wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt() + ""); wxMerchantTradeDaily.setCreateDate(new Date()); @@ -245,11 +246,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } @Override - public ResultData getVolumeTotalOfMonth(String tenantId) { + public ResultData getVolumeTotalOfMonth(TenantEntity tenantEntity) { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setTenantId(tenantId); + wxMerchantTradeDaily.updateTenantInfo(tenantEntity);; List recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); Map recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index 84dc8326e..4cacc054e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxMsgModel; import com.iformall.enums.EnumMsgModelStatus; @@ -123,9 +124,9 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { } @Override - public ResultData getmodellist(String tenantId) { + public ResultData getModelList(TenantEntity tenantEntity) { WxMsgModel wxMsgModel = new WxMsgModel(); - wxMsgModel.setTenantId(tenantId); + wxMsgModel.updateTenantInfo(tenantEntity); wxMsgModel.setStatus(1); List list = wxMsgModelMapper.findList(wxMsgModel); return new ResultData(list); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 84353eae2..f3f9e33da 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -177,17 +178,20 @@ public class WxMsgServiceImpl implements WxMsgService { @Override public ResultData add(WxMsg wxMsg){ - //不是草稿检验疲劳度 + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(wxMsg.getTenantId()); + }}; + //不是草稿检验疲劳度 if (!wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) { if (wxMsg.getIsright().equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { try { - pushLimitService.checkSendTime(wxMsg.getTenantId()); + pushLimitService.checkSendTime(tenantEntity); } catch (MallinkException e) { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } } else { - PushLimit pushLimit = pushLimitService.getPushLimit(wxMsg.getTenantId()); + PushLimit pushLimit = pushLimitService.getPushLimit(tenantEntity); if(pushLimit.getEnable().equals(EnumEnableType.Enable.getCode())) { // 1.2 疲劳度时间是否启用 if(pushLimit.getTimeEnable().equals(EnumEnableType.Enable.getCode())) { @@ -222,7 +226,7 @@ public class WxMsgServiceImpl implements WxMsgService { if (phones.isEmpty()) {//没有手工输入手机号时解析标签,有,继续流转 List list = - wxCUserBasicInfoService.listByFilterList(wxMsg.getTenantId(),wxMsg.getFilterList()); + wxCUserBasicInfoService.listByFilterList(tenantEntity,wxMsg.getFilterList()); wxMsg.setExpectSendNumber(list.size());//预计发送数量 phones = list.stream().map(u -> u.getPhone()).collect(Collectors.joining(",")); if (phones==null || phones.isEmpty()) {//解析之后手机号依然不存在时返回 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java index d51dbac75..265a8df4a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMsgSignature; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxMsgSignatureMapper; import com.iformall.service.WxMsgSignatureService; import org.slf4j.Logger; @@ -50,9 +51,9 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { } @Override - public ResultData getsignaturelist(String tenantId) { + public ResultData getSignatureList(TenantEntity tenantEntity) { WxMsgSignature wxMsgSignature = new WxMsgSignature(); - wxMsgSignature.setTenantId(tenantId); + wxMsgSignature.updateTenantInfo(tenantEntity); List list = wxMsgSignatureMapper.findList(wxMsgSignature); return new ResultData(list); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 724af92a4..a5712fbc8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -110,7 +110,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.VALIDATION_CODE.getCode()); wxMsgRecord.setReceiver(wxMsgValidationcode.getPhone()); - wxMsgRecord.setTenantId(wxMsgValidationcode.getTenantId()); + wxMsgRecord.updateTenantInfo(wxMsgValidationcode); wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); return new ResultData(Result.SUCCESS,"发送成功"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 91e49488d..42dc0e54c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -17,6 +17,7 @@ import com.iformall.mapper.WxOrderPressMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgLimitService; import com.iformall.service.WxOrderPressService; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import com.iformall.utils.PressUtils; import org.apache.commons.lang3.StringUtils; @@ -186,14 +187,14 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } - String gotopage = "pages/index/index?type=mb"; + String gotopage = Constant.mainPageUrl + "?type=mb"; // 小程序 消息 String formId = null; Date curDate = new Date(); Date dateAfter7Day = DateUtils.getHourTimeAfter(7, order.getCreateDate()); if(StringUtils.isNotBlank(order.getFormId()) && curDate.before(dateAfter7Day) - && !order.getFormId().equalsIgnoreCase("undefined")) { + && !order.getFormId().equalsIgnoreCase(Constant.UNDEFINED)) { formId = order.getFormId(); } int formType = EnumMsgLimitType.WEAPP_FORMID.getCode(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 5ccf892eb..af2a14a07 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.OrderSaveDto; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.FmInsideOrderSuccessMsg; import com.iformall.domain.vo.*; import com.iformall.enums.*; @@ -206,7 +207,7 @@ public class WxOrderServiceImpl implements WxOrderService { // + Order 待支付 try { WxOrder orderQ = new WxOrder(); - orderQ.setTenantId(user.getTenantId()); + orderQ.updateTenantInfo(counpon); orderQ.setProductId(counpon.getId()); orderQ.setType(EnumOrderType.COUPON.getCode()); orderQ.setCUserId(user.getId()); @@ -231,7 +232,7 @@ public class WxOrderServiceImpl implements WxOrderService { // + Order 待支付 try { WxOrder orderQ = new WxOrder(); - orderQ.setTenantId(user.getTenantId()); + orderQ.updateTenantInfo(counpon); orderQ.setProductId(counpon.getId()); orderQ.setType(EnumOrderType.COUPON.getCode()); orderQ.setCUserId(user.getId()); @@ -260,7 +261,7 @@ public class WxOrderServiceImpl implements WxOrderService { // + Order 待支付 try { WxOrder orderQ = new WxOrder(); - orderQ.setTenantId(user.getTenantId()); + orderQ.updateTenantInfo(counpon); orderQ.setProductId(counpon.getId()); orderQ.setType(EnumOrderType.COUPON.getCode()); orderQ.setCUserId(user.getId()); @@ -323,7 +324,7 @@ public class WxOrderServiceImpl implements WxOrderService { // + couponOrder ---待使用 try { WxCouponOrder couponOrderQ = new WxCouponOrder(); - couponOrderQ.setTenantId(user.getTenantId()); + couponOrderQ.updateTenantInfo(counpon); couponOrderQ.setCouponId(counpon.getId()); couponOrderQ.setCUserId(user.getId()); if (counpon.getSendType().equals(EnumCouponSendType.PASSIVE)) { @@ -594,6 +595,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setProductId(user.getId()); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); record.setPayment(payment); + record.setTotalPayment(payment); record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); record.setDetail(bodyStr); record.setCreateDate(curr); @@ -650,6 +652,7 @@ public class WxOrderServiceImpl implements WxOrderService { } record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); record.setPayment(payment); + record.setTotalPayment(payment); record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); record.setDetail(bodyStr); record.setCreateDate(curr); @@ -679,13 +682,14 @@ public class WxOrderServiceImpl implements WxOrderService { WxOrder record = new WxOrder(); record.setId(orderNumber); - record.setTenantId(merchant.getTenantId()); + record.updateTenantInfo(merchant); record.setOrderNumber(orderNumber); record.setType(EnumOrderType.PREPAIDCARD.getCode()); record.setProductId(merchant.getId()); record.setCUserId(cUserId); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); record.setPayment(payment); + record.setTotalPayment(payment); record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); record.setDetail(bodyStr); record.setCreateDate(curr); @@ -742,7 +746,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxCouponOrder couponOrder = new WxCouponOrder(); couponOrder.setId(idWorker.nextId()); - couponOrder.setTenantId(user.getTenantId()); + couponOrder.updateTenantInfo(order); couponOrder.setCouponId(order.getProductId()); couponOrder.setCouponType(coupon.getType()); couponOrder.setCUserId(user.getId()); @@ -767,7 +771,7 @@ public class WxOrderServiceImpl implements WxOrderService { Integer fee = 0; WxCardInfo cardInfo = new WxCardInfo(); cardInfo.setId(couponOrder.getId()); - cardInfo.setTenantId(user.getTenantId()); + cardInfo.updateTenantInfo(order); cardInfo.setCouponId(order.getProductId()); cardInfo.setAmount(coupon.getPrice()); cardInfo.setSaleAmount(coupon.getSalePrice()); @@ -777,7 +781,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 有价卡 try { WxPayOrder payOrderQ = new WxPayOrder(); - payOrderQ.setTenantId(user.getTenantId()); + payOrderQ.updateTenantInfo(order); payOrderQ.setOrderId(order.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); payOrder = wxPayOrderMapper.selectOne(new QueryWrapper(payOrderQ)); @@ -795,7 +799,7 @@ public class WxOrderServiceImpl implements WxOrderService { // 未开启分账 WxPayAccount payAccount = null; WxPayAccount payAccountQ = new WxPayAccount(); - payAccountQ.setTenantId(cardInfo.getTenantId()); + payAccountQ.updateTenantInfo(order); try { payAccount = wxPayAccountMapper.selectOne(new QueryWrapper<>(payAccountQ)); fee = PayUtils.getPayRate(payOrder.getPayAmount(), payAccount.getRate(), false); @@ -893,7 +897,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxOrder record = new WxOrder(); record.setId(orderNumber); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(coupon); record.setOrderNumber(orderNumber); record.setProductId(couponId); record.setType(EnumOrderType.COUPON.getCode()); @@ -976,7 +980,7 @@ public class WxOrderServiceImpl implements WxOrderService { private void sendInsideOrderSuccessMsg(WxOrder updateOrder, WxCoupon coupon, WxCUser user) { FmInsideOrderSuccessMsg orderSuccess = new FmInsideOrderSuccessMsg(); orderSuccess.setMsgType(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode()); - orderSuccess.setTenantId(updateOrder.getTenantId()); + orderSuccess.updateTenantInfo(updateOrder); orderSuccess.setOrderId(updateOrder.getId()); orderSuccess.setCUserId(user.getId()); orderSuccess.setCouponId(coupon.getId()); @@ -1132,7 +1136,7 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setOperatorId(user.getId()); creditHistory.setCUserId(user.getId()); creditHistory.setCreateDate(new Date()); - creditHistory.setTenantId(user.getTenantId()); + creditHistory.updateTenantInfo(wxMerchant); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); if (updateOrder.getCouponChannelId() != null) { WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId()); @@ -1225,9 +1229,9 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public void updateOrderGroupStatusByCouponId(Long couponId, String tenantId, Integer orderStatus) { + public void updateOrderGroupStatusByCouponId(Long couponId, TenantEntity tenantEntity, Integer orderStatus) { WxOrder updateOrder = new WxOrder(); - updateOrder.setTenantId(tenantId); + updateOrder.updateTenantInfo(tenantEntity); updateOrder.setOrderStatus(orderStatus); updateOrder.setProductId(couponId); updateOrder.setUpdateDate(new Date()); @@ -1235,9 +1239,9 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public void updateOrderGroupStatusByCouponChannelId(Long couponChannelId, String tenantId, Integer orderStatus) { + public void updateOrderGroupStatusByCouponChannelId(Long couponChannelId, TenantEntity tenantEntity, Integer orderStatus) { WxOrder updateOrder = new WxOrder(); - updateOrder.setTenantId(tenantId); + updateOrder.updateTenantInfo(tenantEntity); updateOrder.setOrderStatus(orderStatus); updateOrder.setCouponChannelId(couponChannelId); updateOrder.setUpdateDate(new Date()); @@ -1250,10 +1254,10 @@ public class WxOrderServiceImpl implements WxOrderService { @Override public ResultData orderClose(WxOrder order) { // 1. get c appid - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(order.getTenantId()); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(order); // 2. get pay order WxPayOrder payOrderQ = new WxPayOrder(); - payOrderQ.setTenantId(order.getTenantId()); + payOrderQ.updateTenantInfo(order); payOrderQ.setOrderId(order.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); List payOrders = wxPayOrderMapper.selectList(new QueryWrapper(payOrderQ)); @@ -1310,11 +1314,11 @@ public class WxOrderServiceImpl implements WxOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void shareForMicroPay(String tenantId, Long orderId, Long payOrderId) { + public void shareForMicroPay(TenantEntity tenantEntity, Long orderId, Long payOrderId) { // 微信分账 try { WxPayOrder wxPayOrder = new WxPayOrder(); - wxPayOrder.setTenantId(tenantId); + wxPayOrder.updateTenantInfo(tenantEntity); wxPayOrder.setId(payOrderId); wxPayOrder.setOrderId(orderId); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); @@ -1333,7 +1337,7 @@ public class WxOrderServiceImpl implements WxOrderService { sharingOrder.setOrderId(wxPayOrder.getId()); sharingOrder.setPayTimeStart(wxPayOrder.getPayTimeStart()); sharingOrder.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); - sharingOrder.setTenantId(wxPayOrder.getTenantId()); + sharingOrder.updateTenantInfo(wxPayOrder); sharingOrder.setTransactionId(wxPayOrder.getTransactionId()); sharingOrder.setShareAmount(wxPayOrder.getShareAmount()); ResultData resultData = wxProfitSharingOrderService.createSharingOrder(sharingOrder); @@ -1351,18 +1355,19 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public Map queryOrderSummary(String tenantId) { + public Map queryOrderSummary(TenantEntity tenantEntity) { Map result = new HashMap<>(); - queryOrderCount(tenantId, result); - queryOrderSummary(tenantId, result); + queryOrderCount(tenantEntity, result); + queryOrderSummary(tenantEntity, result); return result; } - public void queryMerchantCount(String tenantId, Map result) { + @Deprecated + public void queryMerchantCount(TenantEntity tenantEntity, Map result) { String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部商户个数 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); @@ -1403,11 +1408,11 @@ public class WxOrderServiceImpl implements WxOrderService { } } - public void queryOrderSummary(String tenantId, Map result) { + public void queryOrderSummary(TenantEntity tenantEntity, Map result) { String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //总数 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); @@ -1465,11 +1470,11 @@ public class WxOrderServiceImpl implements WxOrderService { } } - public void queryOrderCount(String tenantId, Map result) { + public void queryOrderCount(TenantEntity tenantEntity, Map result) { String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //总数 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); @@ -1524,9 +1529,9 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public void updateStatusByPressCouponId(Long couponId, String tenantId, int orderStatus) { + public void updateStatusByPressCouponId(Long couponId, TenantEntity tenantEntity, int orderStatus) { WxOrder updateOrder = new WxOrder(); - updateOrder.setTenantId(tenantId); + updateOrder.updateTenantInfo(tenantEntity); updateOrder.setOrderStatus(orderStatus); updateOrder.setProductId(couponId); updateOrder.setUpdateDate(new Date()); @@ -1555,7 +1560,7 @@ public class WxOrderServiceImpl implements WxOrderService { } // couponActionLog try { - wxCouponActionLogService.addOne(user.getTenantId(), order.getProductId(), order.getOrderNumber(), EnumCouponSendSendType.ACTIVE.getCode(), orderSaveDto.getCouponChannelId()); + wxCouponActionLogService.addOne(order, order.getProductId(), order.getOrderNumber(), EnumCouponSendSendType.ACTIVE.getCode(), orderSaveDto.getCouponChannelId()); } catch (Exception e) { // 库存恢复 stockBack(order); @@ -1641,7 +1646,7 @@ public class WxOrderServiceImpl implements WxOrderService { final IdWorker idWorker = IdWorker.get(); Long orderNumber = idWorker.nextId(); record.setId(orderNumber); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(coupon); record.setOrderNumber(orderNumber); record.setProductId(coupon.getId()); record.setCUserId(user.getId()); @@ -1694,7 +1699,7 @@ public class WxOrderServiceImpl implements WxOrderService { } creditHistory.setCreditNum(coupon.getCreditPrice()); creditHistory.setCUserId(user.getId()); - creditHistory.setTenantId(user.getTenantId()); + creditHistory.updateTenantInfo(coupon); creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); creditHistory.setCouponId(coupon.getId()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 @@ -1824,7 +1829,7 @@ public class WxOrderServiceImpl implements WxOrderService { final IdWorker idWorker = IdWorker.get(); orderNumber = idWorker.nextId(); record.setId(orderNumber); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(coupon); record.setOrderNumber(orderNumber); record.setProductId(coupon.getId()); //record.setType(EnumOrderType.COUPON.getCode()); 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 f41371517..06c51eafc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountBillServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.mapper.WxBillPropertyMapper; import com.iformall.mapper.WxBillRentMapper; @@ -38,9 +39,9 @@ public class WxPayAccountBillServiceImpl implements WxPayAccountBillService { } @Override - public WxPayAccountBill getByTenantId(String tenantId) { + public WxPayAccountBill getByTenantInfo(TenantEntity tenantEntity) { WxPayAccountBill payAccountBillQ = new WxPayAccountBill(); - payAccountBillQ.setTenantId(tenantId); + payAccountBillQ.updateTenantInfo(tenantEntity); return wxPayAccountBillMapper.selectOne(new QueryWrapper(payAccountBillQ)); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index 3d6a0345b..cc3243421 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -96,7 +96,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { try { //查询账单是否存在 WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setTenantId(appInfo.getTenantId()); + wxBillAll.updateTenantInfo(record); wxBillAll.setId(record.getBillId()); List> bills = wxBillAllMapper.listData(wxBillAll); if (bills.size()==0) { @@ -131,7 +131,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { Long id = idworker.nextId(); payBillNo = id+DateUtils.getSystemTime("yyMMddHHmmss"); record.setId(id); - record.setTenantId(appInfo.getTenantId()); + record.updateTenantInfo(record); record.setbUserId(record.getbUserId()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); @@ -716,7 +716,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { } WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setId(record.getBillId()); - wxBillAll.setTenantId(record.getTenantId()); + wxBillAll.updateTenantInfo(record); List> bills = wxBillAllMapper.listData(wxBillAll); if (bills.size()==0) { logger.error("pay success handle, bill " + record.getBillId() + " not found , payBillNo : " + record.getPayBillNo()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index bd660ed31..6cae873e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -223,7 +223,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Long id = idworker.nextId(); payOrderNo = String.valueOf(id); record.setId(id); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(order); record.setCUserId(user.getId()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); @@ -420,7 +420,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { public ResultData createMicroPayOrder(WxMerchantBUser user, WxPayOrder record, EnumPayWay payWay) { final IdWorker idworker = IdWorker.get(); - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user); EnumPayShare isShare = EnumPayShare.NO; @@ -454,7 +454,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Long id = idworker.nextId(); payOrderNo = String.valueOf(id); record.setId(id); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(order); record.setBUserId(user.getId()); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); @@ -707,7 +707,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), "Order not found"); } - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(record.getTenantId()); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(record); String response = wechatPayOrderQuery(appInfo, record); @@ -969,7 +969,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Override public ResultData payOrderReverse(WxPayOrder record) { - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(record.getTenantId()); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(record); try { String response = wechatPayOrderReverse(appInfo, record); @@ -1314,9 +1314,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order.getTenantId()); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order); - // add c_user + // add c_user, 收银台支付和券支付可能不是同一个人 Date curDate = new Date(); WxCUser userQ = new WxCUser(); userQ.setOpenId(openId); @@ -1360,15 +1360,25 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); } - // B端收银台核销券处理 + // B端收银台核销券处理, 收银台支付和券支付可能不是同一个人 WxPayOrder payOrderQ = new WxPayOrder(); payOrderQ.setOrderId(order.getId()); - payOrderQ.setCUserId(userQ.getId()); payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); try { WxPayOrder unPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper<>(payOrderQ)); if (unPayOrder != null) { + // 更新券支付状态 + try { + WxPayOrder payOrderCoupon = new WxPayOrder(); + payOrderCoupon.setId(unPayOrder.getId()); + payOrderCoupon.setOrderId(order.getId()); + payOrderCoupon.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); + wxPayOrderMapper.updateById(updateOrder); + } catch (Exception e) { + logger.error("支付订单数据库更新失败: " + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); + } if (unPayOrder.getPosPayOrderId() != null) { try { wxCouponOrderService.microPayVerify(user, unPayOrder.getPosPayOrderId()); @@ -1376,7 +1386,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error(e.getMessage()); } // 更新后处理 - wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder.getTenantId(), unPayOrder.getPosPayOrderId(), user.getId()); + wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder, unPayOrder.getPosPayOrderId(), user.getId()); } } } catch (Exception e) { @@ -1396,12 +1406,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新"); } - // TODO B端收银台支付,核销券相关操作 - // B端刷卡支付发券 logger.info("订单刷卡发券 开始"); try { - wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getCUserId()); + wxCouponOrderService.sendCouponAfterMicroPay(record, record.getOrderId(), record.getCUserId()); } catch (Exception e) { logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId()); logger.error("订单刷卡发券失败: " + e.getMessage()); @@ -1430,7 +1438,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { // 支付分账 logger.info("订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); try { - wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId); + wxOrderService.shareForMicroPay(order, orderId, payOrderId); } catch (MallinkException e) { logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); logger.error("订单分账失败: " + e.getMessage()); @@ -1451,30 +1459,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order.getTenantId()); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order); if (record.getPayAmount().equals(0)) { - // B端收银台核销券处理 - WxPayOrder payOrderQ = new WxPayOrder(); - payOrderQ.setOrderId(order.getId()); - payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); - payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); - try { - WxPayOrder unPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper<>(payOrderQ)); - if (unPayOrder != null) { - if (unPayOrder.getPosPayOrderId() != null) { - try { - wxCouponOrderService.microPayVerify(user, unPayOrder.getPosPayOrderId()); - } catch (Exception e) { - logger.error(e.getMessage()); - } - // 更新后处理 - wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder.getTenantId(), unPayOrder.getPosPayOrderId(), user.getId()); - } - } - } catch (Exception e) { - logger.error(e.getMessage()); - } + doCouponPayOrder(user, record, order); } else { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR); } @@ -1492,6 +1480,42 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } + private void doCouponPayOrder(WxMerchantBUser user, WxPayOrder record, WxOrder order) { + // B端收银台核销券处理 + WxPayOrder payOrderQ = new WxPayOrder(); + payOrderQ.setOrderId(order.getId()); + payOrderQ.setCUserId(record.getCUserId()); + payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); + payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); + try { + WxPayOrder unPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper<>(payOrderQ)); + if (unPayOrder != null) { + // 更新券支付状态 + try { + WxPayOrder payOrderCoupon = new WxPayOrder(); + payOrderCoupon.setId(unPayOrder.getId()); + payOrderCoupon.setOrderId(order.getId()); + payOrderCoupon.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); + wxPayOrderMapper.updateById(payOrderCoupon); + } catch (Exception e) { + logger.error("支付订单数据库更新失败: " + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); + } + if (unPayOrder.getPosPayOrderId() != null) { + try { + wxCouponOrderService.microPayVerify(user, unPayOrder.getPosPayOrderId()); + } catch (Exception e) { + logger.error(e.getMessage()); + } + // 更新后处理 + wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder, unPayOrder.getPosPayOrderId(), user.getId()); + } + } + } catch (Exception e) { + logger.error(e.getMessage()); + } + } + public void createMerchantSubsidy(WxPayOrder record, WxOrder order, Date curDate) { final IdWorker idWorker = IdWorker.get(); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); @@ -1520,7 +1544,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void handlePayOrderFail(WxPayOrder record, int status) { // 判断支付状态 - if (record.getPayOrderStatus() == EnumPayStatus.PAY_STATUS_WAIT.getCode()) { + if (record.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_WAIT.getCode())) { logger.error("pay handle, payOrder " + record.getPayOrderNo() + "is complete, orderId : " + record.getOrderId()); return; @@ -1550,7 +1574,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { // 有价券 if (EnumPayStatus.PAY_STATUS_FAIL.getCode() == status) { // 1. get appinfo - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(order.getTenantId()); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(order); // 前端支付取消, // 回调未返回,主动检查支付订单状态 try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java index 0c6df8fe8..cf0322f8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPowerBillAutoConfigServiceImpl.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxPowerBillAutoConfig; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxPowerBillAutoConfigMapper; import com.iformall.service.WxPowerBillAutoConfigService; @@ -40,9 +41,9 @@ public class WxPowerBillAutoConfigServiceImpl implements WxPowerBillAutoConfigSe } @Override - public WxPowerBillAutoConfig getConfig(String tenantId) { + public WxPowerBillAutoConfig getConfig(TenantEntity tenantEntity) { WxPowerBillAutoConfig wxPowerBillAutoConfig = new WxPowerBillAutoConfig(); - wxPowerBillAutoConfig.setTenantId(tenantId); + wxPowerBillAutoConfig.updateTenantInfo(tenantEntity); return wxPowerBillAutoConfigMapper.selectOne(new QueryWrapper(wxPowerBillAutoConfig)); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java index 9ef819a19..8e0396cfc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPrepaymentServiceImpl.java @@ -64,7 +64,7 @@ public class WxPrepaymentServiceImpl implements WxPrepaymentService { WxPrepaymentHistory wxPrepaymentHistory = new WxPrepaymentHistory(); final IdWorker idWorker = IdWorker.get(); wxPrepaymentHistory.setId(idWorker.nextId()); - wxPrepaymentHistory.setTenantId(wxPrepayment.getTenantId()); + wxPrepaymentHistory.updateTenantInfo(wxPrepayment); wxPrepaymentHistory.setMerchantId(wxPrepayment.getMerchantId()); String lastPayAmount = new BigDecimal(wxPrepayment.getLastPayAmount()).divide(new BigDecimal(100)).setScale(2).toPlainString(); wxPrepaymentHistory.setAmountDetail("+" + lastPayAmount + "元"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 287f7044a..d4d6410e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxProfitSharingOrderDetailsVo; import com.iformall.domain.vo.WxProfitSharingOrderQueryVo; import com.iformall.domain.vo.WxProfitSharingOrderVo; @@ -658,10 +659,10 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } @Override - public Map queryOrderSummary(String tenantId) { + public Map queryOrderSummary(TenantEntity tenantEntity) { Map result = new HashMap<>(); - queryMerchantCount(tenantId, result); - queryOrderSummary(tenantId,result); + queryMerchantCount(tenantEntity, result); + queryOrderSummary(tenantEntity,result); return result; } @@ -677,11 +678,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(result); } - public void queryMerchantCount(String tenantId, Map result) { + public void queryMerchantCount(TenantEntity tenantEntity, Map result) { String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部商户个数 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); @@ -722,11 +723,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ } } - public void queryOrderSummary(String tenantId, Map result) { + public void queryOrderSummary(TenantEntity tenantEntity, Map result) { String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); //全部分账总数 Map params = new HashMap<>(); - params.put("tenantId", tenantId); + params.put("tenantId", tenantEntity.getTenantId()); String thirtyTime = DateUtils.getTimeBefore(29, new Date()); params.put("startdate", thirtyTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index aada3acef..f71e358dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxProfitSharingReceiver; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; @@ -108,13 +109,13 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv public ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, List delList) { WxAppinfo appInfo = new WxAppinfo(); - appInfo.setTenantId(merchant.getTenantId()); + appInfo.updateTenantInfo(merchant); appInfo.setType(EnumAppType.C.getCode()); appInfo = wxAppinfoMapper.findList(appInfo).get(0); WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); - receiver.setTenantId(merchant.getTenantId()); + receiver.updateTenantInfo(merchant); receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); receiver.setId(IdWorker.get().nextId()); @@ -186,15 +187,15 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (size == 0) { //发送添加短信 - sendMsgByType(EnumMsgModel.ADD_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver.getTenantId()); + sendMsgByType(EnumMsgModel.ADD_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver); } else { //添加变更短信 - sendMsgByType(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver.getTenantId()); + sendMsgByType(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver); } return new ResultData(returnMap); } - private void sendMsgByType(Integer type, Long merchantId, String account, String tenantId) { + private void sendMsgByType(Integer type, Long merchantId, String account, TenantEntity tenantEntity) { WxMerchantDto wxMerchantDto = new WxMerchantDto(); wxMerchantDto.setId(merchantId); List listCVo = wxMerchantMapper.findListCVo(wxMerchantDto); @@ -211,12 +212,12 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv } String time = DateUtils.getSystemTime("yyyy年MM月dd日HH时mm分"); String merchantName = wxMerchant.getMerchantName(); - sendMsg(phone, account, merchantName, time, type, tenantId); + sendMsg(phone, account, merchantName, time, type, tenantEntity); } @Override - public void sendMsg(String phone, String account, String merchant, String time, Integer modelType, String tenantId) { + public void sendMsg(String phone, String account, String merchant, String time, Integer modelType, TenantEntity tenantEntity) { // 发送短信 logger.info("》》》》》》》》》》》"); logger.info("商户分账账户发送短信开始"); @@ -239,7 +240,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(modelType); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); + wxMsgRecord.updateTenantInfo(tenantEntity); wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("》》》》》》》》》》》"); @@ -250,7 +251,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv @Override public ResultData delReceiver(WxProfitSharingReceiver receiver, Integer send) { WxAppinfo appInfo = new WxAppinfo(); - appInfo.setTenantId(receiver.getTenantId()); + appInfo.updateTenantInfo(receiver); appInfo.setType(EnumAppType.C.getCode()); appInfo = wxAppinfoMapper.findList(appInfo).get(0); @@ -264,7 +265,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv //检查此接受者是否注册在同一个商场的别的商户下 final WxProfitSharingReceiver receiverParam = receiver; WxProfitSharingReceiver params = new WxProfitSharingReceiver(); - params.setTenantId(receiver.getTenantId()); + params.updateTenantInfo(receiver); params.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); List receiverList = wxProfitSharingReceiverMapper.findList(params); if (receiverList.stream().anyMatch(r -> ( @@ -328,7 +329,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv //发送短信 if (send.equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) { - sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver.getTenantId()); + sendMsgByType(EnumMsgModel.DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), receiver.getMerchantId(), receiver.getReceiverAccount(), receiver); } return new ResultData(); @@ -338,7 +339,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv public ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { WxProfitSharingReceiver oldReceiver = new WxProfitSharingReceiver(); - oldReceiver.setTenantId(merchant.getTenantId()); + oldReceiver.updateTenantInfo(merchant); oldReceiver.setMerchantId(merchant.getId()); oldReceiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); oldReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 8e7486c34..24d2debad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -219,7 +219,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return; } wxBillPropertyMapper.deletePreviewBill(record); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); final IdWorker idWorker = IdWorker.get(); int count = 1; for (WxBillProperty bill:record.getPreviewBillRentList()) { @@ -403,11 +403,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (hasFlow) { if (record.getOperationType().equals(EnumContractOperationType.PART.getCode())) { - if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null) { + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null) { updatePropertyContractStatus(record.getId()); } else { record.getFlowParams().put("businessId", record.getId().toString()); - wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record); // 合同状态改成待签约 WxPropertyContract updateRentContract = new WxPropertyContract(); @@ -417,7 +417,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService logger.info("id:{},启动审批流成功", record.getId().toString()); } } else { - if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null && record.getMerchantId() != null) { wxRentContractService.updateRentContractStatus(record.getId()); } else { @@ -425,7 +425,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record); // 合同状态改成待签约 WxRentContract updateRentContract = new WxRentContract(); @@ -625,7 +625,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } public Map buildRent(int receivePeriod,long[] priceArrs, List yearList,int dayType, WxPropertyContract wxPropertyContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview,Map shopInfo,boolean saveDb) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxPropertyContract.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxPropertyContract); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashedMap(); List resultList = new ArrayList<>(); @@ -890,7 +890,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override - public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { + public void download(HttpServletRequest request, HttpServletResponse response) { String id = request.getParameter("id"); WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectById(id); @@ -913,8 +913,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } - @Transactional(rollbackFor = {Exception.class}) @Override + @Transactional(rollbackFor = {Exception.class}) public Object getRentContractStatusInfo(WxPropertyContract record) { Map resultData = new HashMap(); @@ -1026,7 +1026,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService public Map updateStatus(WxPropertyContract record) { Map resultData = new HashMap(); WxPropertyContract wxPropertyContract = new WxPropertyContract(); - wxPropertyContract.setTenantId(record.getTenantId()); + wxPropertyContract.updateTenantInfo(record); wxPropertyContract.setRentShopType(record.getRentShopType()); int allCount = wxPropertyContractMapper.selectCount(new QueryWrapper(wxPropertyContract)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index a4f6b6e86..b5f34710d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -322,7 +322,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 创建 refund Order WxOrder rOrder = new WxOrder(); rOrder.setId(refundOrderId); - rOrder.setTenantId(appInfo.getTenantId()); + rOrder.updateTenantInfo(wxCouponOrder); rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber rOrder.setProductId(wxOrder.getProductId()); rOrder.setType(EnumOrderType.COUPON.getCode()); @@ -363,7 +363,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 查找支付订单 WxPayOrder payOrderQ = new WxPayOrder(); - payOrderQ.setTenantId(appInfo.getTenantId()); + payOrderQ.updateTenantInfo(wxCouponOrder); payOrderQ.setCUserId(wxOrder.getCUserId()); payOrderQ.setOrderId(wxOrder.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); @@ -390,7 +390,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { String out_refund_id = String.valueOf(refundId); record.setId(refundId); - record.setTenantId(appInfo.getTenantId()); + record.updateTenantInfo(wxCouponOrder); record.setCreateTime(currentDate); record.setUpdateTime(currentDate); // 微信内部订单号 @@ -631,7 +631,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 创建 refund Order WxOrder rOrder = new WxOrder(); rOrder.setId(refundOrderId); - rOrder.setTenantId(appInfo.getTenantId()); + rOrder.updateTenantInfo(wxOrder); rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber rOrder.setType(EnumOrderType.MICROPAY.getCode()); rOrder.setCUserId(wxOrder.getCUserId()); @@ -652,7 +652,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 查找支付订单 WxPayOrder payOrderQ = new WxPayOrder(); - payOrderQ.setTenantId(appInfo.getTenantId()); + payOrderQ.updateTenantInfo(wxOrder); payOrderQ.setCUserId(wxOrder.getCUserId()); payOrderQ.setOrderId(wxOrder.getId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 79b0b89e9..277375b51 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.BillTimeVo; import com.iformall.domain.vo.RatioVo; import com.iformall.enums.*; @@ -500,7 +501,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有模板,启动审批流,没有,直接生产账单 if (!CollectionUtils.isEmpty(record.getFlowParams())){ - if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null && record.getMerchantId() != null) { updateRentContractStatus(record.getId()); }else{ @@ -508,7 +509,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record); // 合同状态改成待签约 WxRentContract updateRentContract = new WxRentContract(); @@ -589,7 +590,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有模板,启动审批流,没有,直接生产账单 if (!CollectionUtils.isEmpty(record.getFlowParams())) { - if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null && record.getMerchantId() != null) { updateRentContractStatus(record.getId()); }else{ @@ -598,7 +599,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record); //合同状态改成补录状态 WxRentContract updateRentContract = new WxRentContract(); @@ -632,7 +633,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return; } wxBillRentMapper.deletePreviewBill(record); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); final IdWorker idWorker = IdWorker.get(); int count = 1; for (WxBillRent bill:record.getPreviewBillRentList()) { @@ -640,7 +641,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Date date = new Date(); bill.setRentContractId(record.getId()); bill.setCreatetime(date); - bill.setTenantId(record.getTenantId()); + bill.updateTenantInfo(record); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(date); bill.setRentShopType(record.getRentShopType()); @@ -936,14 +937,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("合同id:{},开始停止...", id); //结束审批流 by luozukai - WxFlowModel flowModel = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_CONTRACT.getCode().intValue(),record.getTenantId()); - WxFlowModel flowModelPoint = wxFlowService.getModelByType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode().intValue(),record.getTenantId()); + WxFlowModel flowModel = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_CONTRACT.getCode().intValue(),record); + WxFlowModel flowModelPoint = wxFlowService.getModelByType(EnumFlowKey.NEW_SHOP_CONTRACT.getCode().intValue(),record); - WxFlowModel flowModel_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_CONTRACT.getCode().intValue(),record.getTenantId()); - WxFlowModel flowModelPoint_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().intValue(),record.getTenantId()); + WxFlowModel flowModel_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_CONTRACT.getCode().intValue(),record); + WxFlowModel flowModelPoint_pro = wxFlowService.getModelByType(EnumFlowKey.NEW_PRO_POINT_CONTRACT.getCode().intValue(),record); - WxFlowModel flowModel_rent = wxFlowService.getModelByType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode().intValue(),record.getTenantId()); - WxFlowModel flowModelPoint_rent = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().intValue(),record.getTenantId()); + WxFlowModel flowModel_rent = wxFlowService.getModelByType(EnumFlowKey.NNEW_RENT_CONTRACT.getCode().intValue(),record); + WxFlowModel flowModelPoint_rent = wxFlowService.getModelByType(EnumFlowKey.NEW_RENT_POINT_CONTRACT.getCode().intValue(),record); List keyList = new ArrayList<>(); if(flowModel != null){ @@ -1222,7 +1223,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public Map buildRent(int receivePeriod, long[] priceArrs, List yearList, int dayType, WxRentContract wxRentContract, Long userId, int billcount, Integer isPreview, String shopInfoStr,boolean saveDb) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxRentContract.getTenantId()); + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxRentContract); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); Map resultMap = new HashedMap(); List resultList = new ArrayList<>(); @@ -1473,7 +1474,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public void download(HttpServletRequest request, HttpServletResponse response, String tenantId) { + public void download(HttpServletRequest request, HttpServletResponse response) { String id = request.getParameter("id"); WxRentContract wxRentContract = wxRentContractMapper.selectById(id); String filesuffix = wxRentContract.getFilepath().substring(wxRentContract.getFilepath().lastIndexOf(".")); @@ -1642,7 +1643,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id) { + public void exportContract(HttpServletRequest request, HttpServletResponse response, Long id) { String contracType = "0"; String templatePath = null; Map result = null; @@ -1682,7 +1683,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有模板,启动审批流,没有,直接生产账单 if (!CollectionUtils.isEmpty(record.getFlowParams())) { - if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record) == null && record.getMerchantId() != null) { updateRentContractStatus(record.getId()); }else{ @@ -1690,7 +1691,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record); // 合同状态改成待签约 WxRentContract updateRentContract = new WxRentContract(); @@ -2497,8 +2498,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp,String tenantId) { - List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp,tenantId); + public Map selectRentContractByShopIds(Collection shopIds, String shopIdsRegexp, TenantEntity tenantEntity) { + List list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp, tenantEntity.getTenantId()); List shopIdArr = Arrays.asList(StringUtils.split(shopIdsRegexp,"|")) ; Map allShopContract = new HashMap<>(); for (WxRentContract wxRentContract : list) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 3e2fbfa02..8c906125b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumBusiness; import com.iformall.enums.EnumCUserBasicInfoStatus; import com.iformall.enums.EnumScoreRules; @@ -47,9 +48,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxMerchantMapper wxMerchantMapper; @Override - public WxScoreRules getScoreRules(String tenantId) { + public WxScoreRules getScoreRules(TenantEntity tenantEntity) { // get pushLime from cache - String key = Constant.SCORE_RULES_KEY_PREV + tenantId; + String key = Constant.SCORE_RULES_KEY_PREV + tenantEntity.getTenantId(); // 缓存存在 if (scoreRulesRedisTemplate.hasKey(key)) { @@ -59,7 +60,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } WxScoreRules scoreRules = new WxScoreRules(); - scoreRules.setTenantId(tenantId); + scoreRules.updateTenantInfo(tenantEntity); scoreRules.setType(EnumScoreRules.SCORE.getCode()); List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { @@ -123,9 +124,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } @Override - public WxScoreRules getCreditRules(String tenantId) { + public WxScoreRules getCreditRules(TenantEntity tenantEntity) { // get pushLime from cache - String key = Constant.CREDIT_RULES_KEY_PREV + tenantId; + String key = Constant.CREDIT_RULES_KEY_PREV + tenantEntity.getTenantId(); // 缓存存在 if (scoreRulesRedisTemplate.hasKey(key)) { @@ -135,7 +136,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } WxScoreRules scoreRules = new WxScoreRules(); - scoreRules.setTenantId(tenantId); + scoreRules.updateTenantInfo(tenantEntity); scoreRules.setType(EnumScoreRules.CREDIT.getCode()); List list = wxScoreRulesMapper.findList(scoreRules); if (list.size() > 0) { @@ -251,7 +252,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { //修改basic表积分 WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); wxCUserBasicInfo.setId(wxCUser.getId()); - wxCUserBasicInfo.setTenantId(wxCUser.getTenantId()); + wxCUserBasicInfo.updateTenantInfo(wxCUser); wxCUserBasicInfo.setPhone(wxCUser.getPhone()); wxCUserBasicInfo.setPoins(newScore); wxCUserBasicInfoMapper.updateScore(wxCUserBasicInfo); @@ -274,7 +275,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { // 3. 修改 c_user表积分 score if (user.getPhone() != null) { WxCUser wxCUser = new WxCUser(); - wxCUser.setTenantId(user.getTenantId()); + wxCUser.updateTenantInfo(user); wxCUser.setPhone(user.getPhone()); List list = wxCUserMapper.findList(wxCUser); if (!list.isEmpty()) { @@ -306,7 +307,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { private int checkTodayLoginScoreCount(WxCUser cUser) { WxScoreHistory scoreHistory = new WxScoreHistory(); - scoreHistory.setTenantId(cUser.getTenantId()); + scoreHistory.updateTenantInfo(cUser); scoreHistory.setCUserId(cUser.getId()); scoreHistory.setScoreType(EnumScoreType.LOGIN.getCode()); return wxScoreHistoryMapper.countTodayList(scoreHistory); @@ -319,7 +320,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { return 0; // 1. score_rules - WxScoreRules scoreRules = getScoreRules(user.getTenantId()); + WxScoreRules scoreRules = getScoreRules(user); // 2. 增长的成长值 addScoreNumber = scoreRules.getRule(EnumScoreType.LOGIN,WxScoreRules.SCORE); @@ -338,7 +339,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { if (order.getPayment() == 0) return 0; // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(order.getTenantId()); + WxScoreRules scoreRules = getScoreRules(order); // 2. 获取成长值 by id JSONObject payRule = scoreRules.getRuleObj(EnumScoreType.CONSUMPTION); @@ -394,7 +395,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { private int bindCarAddScore(WxCUserCar userCar) { int addScoreNumber = 0; // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(userCar.getTenantId()); + WxScoreRules scoreRules = getScoreRules(userCar.getTenantInfo()); // 2. 获取成长值 addScoreNumber = scoreRules.getRule(EnumScoreType.BIND_CAR,WxScoreRules.SCORE); @@ -410,7 +411,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { private int personAddScore(WxCUser user) { int addScoreNumber = 0; // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(user.getTenantId()); + WxScoreRules scoreRules = getScoreRules(user); // 2. 获取成长值 addScoreNumber = scoreRules.getRule(EnumScoreType.WECHAT_PERSION,WxScoreRules.SCORE); @@ -426,7 +427,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { private int phoneAddScore(WxCUser user) { int addScoreNumber = 0; // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(user.getTenantId()); + WxScoreRules scoreRules = getScoreRules(user); // 2. 获取成长值 addScoreNumber = scoreRules.getRule(EnumScoreType.WECHAT_PHONE,WxScoreRules.SCORE); @@ -455,7 +456,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { return 0; // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(user.getTenantId()); + WxScoreRules scoreRules = getScoreRules(user); // 2. 获取成长值 addScoreNumber = scoreRules.getRule(EnumScoreType.COMPLETE_INFO,WxScoreRules.SCORE); @@ -668,7 +669,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { public void updateMerchantCreditLocked(WxScoreRules wxScoreRules) { WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(wxScoreRules.getTenantId()); + wxMerchant.updateTenantInfo(wxScoreRules); wxMerchant.setStatus(wxScoreRules.getCreditLocked()); wxMerchant.setUpdateDate(new Date()); wxMerchantMapper.updateCreditLocked(wxMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index cda357ce5..96a41258c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.enums.EnumCouponChannelType; import com.iformall.enums.EnumScreenAdType; @@ -125,9 +126,9 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { @Override - public void updateStatusByCouponChannelId(Long couponChannelId, String tenantId, int status) { + public void updateStatusByCouponChannelId(Long couponChannelId, TenantEntity tenantEntity, int status) { WxScreenAd wxScreenAd = new WxScreenAd(); - wxScreenAd.setTenantId(tenantId); + wxScreenAd.updateTenantInfo(tenantEntity); wxScreenAd.setStatus(status); wxScreenAd.setTargetId(couponChannelId); wxScreenAd.setUpdateDate(new Date()); @@ -135,17 +136,17 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { } @Override - public void updateStatusByCouponId(Long couponId, String tenantId, int status) { + public void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status) { WxCouponChannel wxCouponChannel = new WxCouponChannel(); - wxCouponChannel.setTenantId(tenantId); + wxCouponChannel.updateTenantInfo(tenantEntity); wxCouponChannel.setCouponId(couponId); List list = wxCouponChannelMapper.findList(wxCouponChannel); list.stream().forEach(cc->{ WxScreenAd wxScreenAd = new WxScreenAd(); - wxScreenAd.setTenantId(tenantId); + wxScreenAd.updateTenantInfo(tenantEntity); wxScreenAd.setStatus(status); wxScreenAd.setTargetId(cc.getId()); wxScreenAd.setUpdateDate(new Date()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index f5b79d217..3bf2abeb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchantShop; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxNotRentShopVo; import com.iformall.domain.vo.WxShopVo; import com.iformall.enums.*; @@ -125,7 +126,7 @@ public class WxShopServiceImpl implements WxShopService { //3、合同 两种 都要查一下 存在时不能删除 WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setShopId(wxShop.getId()); - wxRentContract.setTenantId(wxShop.getTenantId()); + wxRentContract.updateTenantInfo(wxShop); long count = 0; if (wxShop.getType().equals(EnumRentShopType.SHOP.getCode())) { count = wxRentContractMapper.selectRentContractByShopId(wxRentContract).parallelStream() @@ -165,30 +166,25 @@ public class WxShopServiceImpl implements WxShopService { } @Override - public ResultData getbshoplist(String tenantId, String shopNumber) { + public ResultData getShopList(TenantEntity tenantEntity, String shopNumber) { Map params=new HashMap<>(); - params.put("tenantId",tenantId); + params.put("tenantId",tenantEntity.getTenantId()); params.put("shopNumber",shopNumber); - List> list=wxShopMapper.getbshoplist(params); + List> list=wxShopMapper.getShopList(params); return new ResultData(ResultData.SUCCESS,"",list); } @Override - public ResultData getMerchantShopByShopId(String tenantId, String shopId) { + public ResultData getMerchantShopByShopId(TenantEntity tenantEntity, String shopId) { Map params=new HashMap<>(); - params.put("tenantId",tenantId); + params.put("tenantId",tenantEntity.getTenantId()); params.put("shopId",shopId); Map map=wxShopMapper.getMerchantShopByShopId(params); return new ResultData(ResultData.SUCCESS,"",map); } @Override - public ResultData hasShopNumber(String tenantId, String shopNumber, Long id, Integer type) { - WxShop wxShop = new WxShop(); - wxShop.setTenantId(tenantId); - wxShop.setShopNumber(shopNumber); - wxShop.setType(type); - wxShop.setId(id); + public ResultData hasShopNumber(WxShop wxShop) { int count = wxShopMapper.hasShopNumber(wxShop); return new ResultData(ResultData.SUCCESS, "查询成功", count > 0 ? true : false); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java index 06db1696d..56f3e7b1a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java @@ -88,7 +88,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { EnumPayShare isShare = EnumPayShare.NO; Date curDate = new Date(); // 1. 获取c端小程序 - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user); // 2. 获取payAccount WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); if (payAccount.checkShare()) { @@ -102,7 +102,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { String payOrderNo = String.valueOf(id); WxSubsidy record = new WxSubsidy(); record.setId(id); - record.setTenantId(user.getTenantId()); + record.updateTenantInfo(user); record.setOperatorUserId(user.getId()); record.setCreateTime(curDate); record.setUpdateTime(curDate); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index aa52b828c..900fc3178 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -16,6 +16,7 @@ import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxTopicMapper; import com.iformall.service.QrCodeService; import com.iformall.service.WxTopicService; +import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -71,7 +72,7 @@ public class WxTopicServiceImpl implements WxTopicService { //验证是否存在已发放的专题 if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) { WxTopic query = new WxTopic(); - query.setTenantId(record.getTenantId()); + query.updateTenantInfo(record); if(record.getId() != null && record.getBeginTime() == null){ WxTopic wt = wxTopicMapper.selectById(record.getId()); query.setBeginTime(wt.getBeginTime()); @@ -81,7 +82,7 @@ public class WxTopicServiceImpl implements WxTopicService { query.setEndTime(record.getEndTime()); } WxTopic dbquery = new WxTopic(); - dbquery.setTenantId(record.getTenantId()); + dbquery.updateTenantInfo(record); dbquery.setStatus(EnumWxTopicStatus.VAILD.getCode()); List onLineTopicList = wxTopicMapper.findList(dbquery); for (WxTopic topic:onLineTopicList) { @@ -127,7 +128,7 @@ public class WxTopicServiceImpl implements WxTopicService { wxCouponChannel.setEndTime(record.getEndTime()); wxCouponChannel.setCouponId(Long.parseLong(couponArray[1])); wxCouponChannel.setSubTargetId(record.getId()); - wxCouponChannel.setTenantId(record.getTenantId()); + wxCouponChannel.updateTenantInfo(record); wxCouponChannel.setTitle(wxCoupon.getTitle()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_TOPIC.getCode()); wxCouponChannel.setType(wxCoupon.getType()); @@ -135,12 +136,12 @@ public class WxTopicServiceImpl implements WxTopicService { wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness()); wxCouponChannelMapper.insert(wxCouponChannel); - String pageUrl = "pages/index/index"; + String pageUrl = Constant.mainPageUrl; WxCouponChannel couponChannel = new WxCouponChannel(); couponChannel.setId(wxCouponChannel.getId()); couponChannel.setType(wxCouponChannel.getType()); String param = couponChannel.getWeappScene(); - ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon.getTenantId(),1,pageUrl,param,0,"","","卷"); + ResultData resultDataQ = qrCodeService.uploadQrcode(wxCoupon,1,pageUrl,param,0,"","","券"); Map map = (Map)resultDataQ.data; if(map!=null && map.get("url") !=null) { String url = map.get("url"); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java index 1ad68489d..20abda320 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java @@ -1,11 +1,11 @@ package com.iformall.service.invest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.enums.EnumFollowType; import com.iformall.enums.EnumInvestMessageTag; -import com.iformall.enums.EnumInvestMessageType; import java.io.Serializable; import java.util.List; @@ -33,7 +33,7 @@ public interface InvestBaseService { * @param tid * @return */ - default boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid,String tenantId) { + default boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid, TenantEntity tenantEntity) { return false; } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index c04dbd6cc..4d87f6b62 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.common.ErrorCode; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.invest.*; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; @@ -95,16 +96,17 @@ public class InvestBaseServiceImpl, T> extends ServiceIm } void checkUserAndTenant(T input, Consumer consumer) { + MallUserInfo userInfo = InvestUserContext.getUser(); InvestHelper.notNull(input, "参数 " + input); - InvestHelper.notNull(InvestUserContext.getUser(), ErrorCode.USER_IS_EMPTY); - ((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId()); + InvestHelper.notNull(userInfo, ErrorCode.USER_IS_EMPTY); + ((InvestBaseEntity) input).updateTenantInfo(userInfo); if (consumer != null) { consumer.accept(input); } } @Override - public boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid,String tenantId) { + public boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid, TenantEntity tenantEntity) { if (CollectionUtils.isEmpty(ownerArray)) { return false; } @@ -124,7 +126,7 @@ public class InvestBaseServiceImpl, T> extends ServiceIm messageEntity.setOwner(aLong); messageEntity.setTid(tid); messageEntity.setType(type); - messageEntity.setTenantId(tenantId); + messageEntity.updateTenantInfo(tenantEntity); messageEntity.setMessage(message); messageEntity.setTag(tag); messageEntityList.add(messageEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index c2572b2f4..07a3d39c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -328,7 +328,7 @@ public class InvestBizServiceImpl implements InvestBizService { //商铺信息 WxShop shopQuery = new WxShop(); - shopQuery.setTenantId(InvestUserContext.getUser().getTenantId()); + shopQuery.updateTenantInfo(InvestUserContext.getUser()); List shops = shopService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); Map shopMap = getMap(shops, WxShop::getShopNumber); @@ -553,8 +553,9 @@ public class InvestBizServiceImpl implements InvestBizService { if (CollectionUtils.isNotEmpty(shops)) { Collection shopPointIds = buildShopContractQuery(shops, EnumRentShopType.POINT); Collection shopIds = buildShopContractQuery(shops, EnumRentShopType.SHOP); - shopContractMap = rentContractService.selectRentContractByShopIds(shopPointIds, StringUtils.join(shopIds, "|"), - InvestUserContext.getUser().getTenantId()); + shopContractMap = rentContractService.selectRentContractByShopIds(shopPointIds, + StringUtils.join(shopIds, "|"), + InvestUserContext.getUser()); } for (WxShop shop : shops) { WxRentContract contract = shopContractMap.get(shop.getId()); @@ -767,7 +768,9 @@ public class InvestBizServiceImpl implements InvestBizService { WxShop shop = shopService.getById(shopId); InvestHelper.notNull(shop, "shop 不存在"); //3、商品合同信息 - Map shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId()), InvestUserContext.getUser().getTenantId()); + Map shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), + StringUtils.join(shop.getId()), + InvestUserContext.getUser()); WxRentContract contract = shopContractMap.get(shop.getId()); InvestHelper.notNull(contract, "合同信息不存在"); Map map = new HashMap<>(); @@ -803,7 +806,7 @@ public class InvestBizServiceImpl implements InvestBizService { if (Objects.equals(customerEntity.getType(), EnumCustomerType.COOPERATIVE)) { InvestHelper.notNull(customerEntity.getContractNo(), "合同编号"); WxRentContract contract = new WxRentContract(); - contract.setTenantId(InvestUserContext.getUser().getTenantId()); + contract.updateTenantInfo(InvestUserContext.getUser()); contract.setContractNumber(customerEntity.getContractNo()); ResultData resultData = rentContractService.hasContractNumber(contract); InvestHelper.isTrue(Objects.equals(resultData.data, true),ErrorCode.INVEST_RESULT_NOT_FOUND,"合同编号"); @@ -844,7 +847,7 @@ public class InvestBizServiceImpl implements InvestBizService { if (Objects.nonNull(owner) && !Objects.equals(owner, 0L)) { List ownerArray = Collections.singletonList(owner); demandService.saveBatchMessage(ownerArray, EnumInvestMessageType.CUSTOMER_CREATE.getInfo(), - EnumInvestMessageTag.CUSTOMER_CREATE, EnumFollowType.DEMAND, customerEntity.getId(), customerEntity.getTenantId()); + EnumInvestMessageTag.CUSTOMER_CREATE, EnumFollowType.DEMAND, customerEntity.getId(), customerEntity); } } @@ -918,8 +921,9 @@ public class InvestBizServiceImpl implements InvestBizService { if (Objects.isNull(shop)) { return new HashMap<>(); } - return rentContractService.selectRentContractByShopIds(Collections.singletonList(shop.getId()), StringUtils.join(shop.getId(), ""), - InvestUserContext.getUser().getTenantId()); + return rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), + StringUtils.join(shop.getId(), ""), + InvestUserContext.getUser()); } @Override @@ -1126,7 +1130,7 @@ public class InvestBizServiceImpl implements InvestBizService { investTaskEntity.setStatus(EnumTaskStatus.FINISH); } else { WxRentContract contractQuery = new WxRentContract(); - contractQuery.setTenantId(InvestUserContext.getUser().getTenantId()); + contractQuery.updateTenantInfo(InvestUserContext.getUser()); contractQuery.setShopId(investTaskEntity.getTargetId()); contractQuery.setStatus(EnumRentContractStatus.INTENTION.getCode()); //获取意向合同 diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index 8a1ae6dd9..7cdd1ad5d 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -59,7 +59,7 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl ownerArray = JSONArray.parseArray(owner, Long.class); this.saveBatchMessage(ownerArray, EnumInvestMessageType.TASK_CREATE.getInfo(), - EnumInvestMessageTag.TASK_CREATE, EnumFollowType.TASK, entity.getId(),entity.getTenantId()); + EnumInvestMessageTag.TASK_CREATE, EnumFollowType.TASK, entity.getId(),entity); } } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java index aba7178de..f449a195a 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.domain.vo.MerchantMeterVo; @@ -54,7 +55,7 @@ public interface KwMerchantMeterService { int unbind(Long meterId); int unbindBatch(Long merchantId); - List getMerchantMeter(String tenantId); + List getMerchantMeter(TenantEntity tenantEntity); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index d123d1772..d481e45a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -109,7 +109,7 @@ public class KwBoxServiceImpl implements KwBoxService { KwMeterData kwMeterData = new KwMeterData(); kwMeterData.setId(idWorker.nextId()); - kwMeterData.setTenantId(kwBox.getTenantId()); + kwMeterData.updateTenantInfo(kwBox); kwMeterData.setAddress(address); kwMeterData.setBoxId(kwBox.getId()); kwMeterData.setCreateTime(recordTime); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index c1f4dfde1..70d185bcc 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.domain.dto.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.domain.vo.MerchantMeterVo; @@ -88,8 +89,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { } @Override - public List getMerchantMeter(String tenantId) { - return kwMerchantMeterMapper.getMerchantMeter(tenantId); + public List getMerchantMeter(TenantEntity tenantEntity) { + return kwMerchantMeterMapper.getMerchantMeter(tenantEntity.getTenantId()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java index d343a694a..34600bcd5 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java @@ -78,11 +78,11 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { { KwMeterDataVo usedPower = new KwMeterDataVo(); usedPower.setMeterId(dto.getMeterId()); - usedPower.setTenantId(dto.getTenantId()); + usedPower.updateTenantInfo(dto); usedPower.setReportTime(new Date().toString()); if (dto.getStartTime() != null && dto.getEndTime() != null) { KwMeterDataDto param = new KwMeterDataDto(); - param.setTenantId(dto.getTenantId()); + param.updateTenantInfo(dto); param.setMeterId(dto.getMeterId()); param.setReportType(dto.getReportType()); param.setStartTime(dto.getStartTime()); @@ -99,7 +99,7 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { if (dto.getStartTime() != null) { KwMeterDataDto param = new KwMeterDataDto(); - param.setTenantId(dto.getTenantId()); + param.updateTenantInfo(dto); param.setMeterId(dto.getMeterId()); param.setReportType(dto.getReportType()); param.setStartTime(dto.getStartTime()); @@ -112,7 +112,7 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { } if (dto.getEndTime() != null) { KwMeterDataDto param = new KwMeterDataDto(); - param.setTenantId(dto.getTenantId()); + param.updateTenantInfo(dto); param.setMeterId(dto.getMeterId()); param.setReportType(dto.getReportType()); param.setEndTime(dto.getEndTime()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 093e95df1..dd2be9a21 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.EnumMsgSendStatus; @@ -53,10 +54,12 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { public void send(BaseMsg baseMsg) throws Exception{ WxMsg record = (WxMsg)baseMsg; + TenantEntity tenantEntity = record.getTenantInfo(); + WxMsgConfig wxMsgConfig = record.getWxMsgConfig(); if(wxMsgConfig == null){ wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(record.getTenantId()); + wxMsgConfig.updateTenantInfo(tenantEntity); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if (wxMsgConfigs.size() == 0) { throw new MallinkException(ErrorCode.MSG_CONFIG_NOT_FOUND); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index 1567015f1..b105d18d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.msg.impl; import com.iformall.domain.po.WxMsgValidationcodeModel; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MailMsg; import com.iformall.enums.EnumMsgOpen; @@ -44,10 +45,12 @@ public class SendEmailServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ MailMsg mailMsg = (MailMsg)baseMsg; + + TenantEntity tenantEntity = mailMsg.getTenantInfo(); //根据模板替换动态内容 if(mailMsg.getModelId() != null){ WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel(); - msgModel.setTenantId(mailMsg.getTenantId()); + msgModel.updateTenantInfo(tenantEntity); msgModel.setType(mailMsg.getModelType()); msgModel.setModelId(mailMsg.getModelId()); msgModel.setOpen(EnumMsgOpen.OPEN.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java index 7bc7249ab..b8dce4782 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MpAppMsg; import com.iformall.mapper.WxTemplateMsgMapper; @@ -40,11 +41,13 @@ public class SendMpMsgServiceImpl implements MsgSendService { MpAppMsg mpAppMsg = (MpAppMsg)baseMsg; WxTemplateMsg msg = null; + TenantEntity tenantEntity = mpAppMsg.getTenantInfo(); + WxMpService wxMpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(mpAppMsg.getAppId()); // 查询信息模板 WxTemplateMsg msgQ = new WxTemplateMsg(); - msgQ.setTenantId(mpAppMsg.getTenantId()); + msgQ.updateTenantInfo(tenantEntity); msgQ.setType(mpAppMsg.getTemplateType()); try { msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ)); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index ec3ce094f..8e4392258 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.SmartAppMsg; import com.iformall.mapper.WxTemplateMsgMapper; @@ -45,6 +46,9 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ SmartAppMsg smartAppMsg = (SmartAppMsg)baseMsg; + + TenantEntity tenantEntity = smartAppMsg.getTenantInfo(); + WxTemplateMsg msg = null; WxMaTemplateMessage templateMessage; @@ -58,7 +62,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { //查询信息模板 WxTemplateMsg msgQ = new WxTemplateMsg(); - msgQ.setTenantId(smartAppMsg.getTenantId()); + msgQ.updateTenantInfo(tenantEntity); msgQ.setType(smartAppMsg.getTemplateType()); List list = wxTemplateMsgMapper.selectList(new QueryWrapper(msgQ)); if (list.size() > 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index a06a3bc7e..518c06827 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.EnumMsgOpen; @@ -43,14 +44,15 @@ public class SendSmsServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ WxMsgRecord record = (WxMsgRecord)baseMsg; + TenantEntity tenantEntity = record.getTenantInfo(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setPhone(record.getReceiver()); - wxMsgValidationcode.setTenantId(record.getTenantId()); + wxMsgValidationcode.updateTenantInfo(tenantEntity); wxMsgValidationcode.setType(record.getModelType()); //3、从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(record.getTenantId()); + wxMsgConfig.updateTenantInfo(wxMsgValidationcode); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if(CollectionUtils.isEmpty(wxMsgConfigs)){ throw new MallinkException(ErrorCode.MSG_CONFIG_NOT_FOUND); @@ -61,7 +63,7 @@ public class SendSmsServiceImpl implements MsgSendService { } WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); - wxMsgValidationcodeModel.setTenantId(record.getTenantId()); + wxMsgValidationcodeModel.updateTenantInfo(wxMsgValidationcode); wxMsgValidationcodeModel.setType(record.getModelType()); wxMsgValidationcodeModel.setOpen(EnumMsgOpen.OPEN.getCode()); List modelList = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java index ab5f92e10..94378c1ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.mapper.WxTemplateMsgMapper; @@ -38,13 +39,15 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ AppUniformMsg appUniformMsg = (AppUniformMsg)baseMsg; + + TenantEntity tenantEntity = appUniformMsg.getTenantInfo(); WxTemplateMsg msg = null; WxMaService wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appUniformMsg.getAppId()); // 查询信息模板 WxTemplateMsg msgQ = new WxTemplateMsg(); - msgQ.setTenantId(appUniformMsg.getTenantId()); + msgQ.updateTenantInfo(tenantEntity); msgQ.setType(appUniformMsg.getTemplateType()); try { msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ)); diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java index 8f9df1df8..ab8cd049e 100644 --- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java @@ -1,6 +1,7 @@ package com.iformall.utils; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxLevelConfigMapper; import com.iformall.service.WxScoreRulesService; import lombok.extern.slf4j.Slf4j; @@ -102,14 +103,14 @@ public class CreditUtil { if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) { //设置过生日的用户 if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) { - birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantId(), wxScoreRulesService); + birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantInfo(), wxScoreRulesService); } else { log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate()); } } else { //发过生日券的用户或者享受过生日积分倍率的用户 if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) { - birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantId(), wxScoreRulesService); + birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getTenantInfo(), wxScoreRulesService); } } @@ -123,13 +124,13 @@ public class CreditUtil { /** * 获取生日积分倍率 * - * @param tenantId + * @param tenantEntity * @param wxScoreRulesService * @return */ - public static int getBirthdayScoreScale(String tenantId, WxScoreRulesService wxScoreRulesService) { + public static int getBirthdayScoreScale(TenantEntity tenantEntity, WxScoreRulesService wxScoreRulesService) { int birthdayScale = WxScoreRules.DEFAULT_SCALE; - WxScoreRules rules = wxScoreRulesService.getCreditRules(tenantId); + WxScoreRules rules = wxScoreRulesService.getCreditRules(tenantEntity); if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) { //规则存使用积分倍率 birthdayScale = rules.getScale(); diff --git a/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java b/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java index f9ec744e4..2acabd605 100644 --- a/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/QRCodeUtils.java @@ -12,7 +12,7 @@ import java.io.File; */ public class QRCodeUtils { - public static String PAGE_URL = "pages/index/index"; + public static String PAGE_URL = Constant.mainPageUrl; public static final int QR_WIDTH = 430; public static final int QR_HIGHT = 430; diff --git a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml index 32a58c7ab..dd51e8230 100644 --- a/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosMallConfigMapper.xml @@ -58,6 +58,13 @@ from pos_mall_config where 1=1 and `tenant_id` = #{value} + + diff --git a/mallinkService/src/main/resources/mapper/PosOrderMapper.xml b/mallinkService/src/main/resources/mapper/PosOrderMapper.xml index b3663fc51..4e5491b48 100644 --- a/mallinkService/src/main/resources/mapper/PosOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosOrderMapper.xml @@ -24,7 +24,7 @@ and `id` = #{id} - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} and `pos_order_no` like concat('%', #{posOrderNo},'%') diff --git a/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml index 8b4b28166..21e0e5b5b 100644 --- a/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml @@ -37,7 +37,7 @@ and `id` = #{id} - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} and `create_time` = #{createTime} diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index b852e2343..1f18cb79b 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -21,7 +21,9 @@ - `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id`,`type`,`pay_bill_id` + `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, + `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, + `pay_id`,`type`,`pay_bill_id` diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index de913c631..754b1a6f6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -62,25 +62,31 @@ bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime, endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments,'' price_detail,updatetime,freeze,ifnull(late_pay_price,0) late_pay_price,service_charge_pay - from wx_bill_rent where tenant_id=#{tenantId} and is_preview = 0 + from wx_bill_rent + where tenant_id=#{tenantId} + and is_preview = 0 union all select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime, endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze,0 late_pay_price,0 service_charge_pay - from wx_bill_rent_deposit where tenant_id=#{tenantId} + from wx_bill_rent_deposit + where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime, endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments,'' price_detail,updatetime,freeze,ifnull(late_pay_price,0) late_pay_price,service_charge_pay - from wx_bill_property where tenant_id=#{tenantId} and is_preview = 0 + from wx_bill_property + where tenant_id=#{tenantId} + and is_preview = 0 union all select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime, endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze,0 - late_pay_price,0 service_charge_pay from wx_bill_property_deposit where - tenant_id=#{tenantId} + late_pay_price,0 service_charge_pay + from wx_bill_property_deposit + where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,case when type=1 then '水费' when type=2 then '电费' else '空调费' end name, case when type=1 then 5 when type=2 then 6 else 9 end bill_type_value, @@ -92,13 +98,15 @@ select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,concat('其他费用-',name) as bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime, rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime,freeze,0 late_pay_price,service_charge_pay - from wx_bill_other where tenant_id=#{tenantId} + from wx_bill_other + where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime, rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime,freeze,0 late_pay_price,service_charge_pay - from wx_bill_other_deposit where tenant_id=#{tenantId} + from wx_bill_other_deposit + where tenant_id=#{tenantId} ) bill left join wx_merchant m on bill.merchant_id=m.id left join wx_shop s on bill.shop_id=s.id @@ -177,7 +185,8 @@ select id,merchant_id,shop_id,tenant_id,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit ) bill - where bill.tenant_id=#{tenantId} and bill.status=#{status} + where bill.tenant_id=#{tenantId} + and bill.status=#{status} and bill.receive_date between #{starttime} and #{endtime} @@ -232,7 +241,8 @@ select id,merchant_id,shop_id,tenant_id,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit ) bill - where bill.tenant_id=#{tenantId} and bill.status=#{status} + where bill.tenant_id=#{tenantId} + and bill.status=#{status} and bill.receive_date between #{starttime} and #{endtime} @@ -256,22 +266,28 @@ bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' price_detail,freeze,ifnull(late_pay_price,0) late_pay_price,service_charge_pay - from wx_bill_rent where is_preview = 0 and tenant_id=#{tenantId} and rent_contract_id in (select id from - wx_rent_contract where status in - (2,3,4)) + from wx_bill_rent + where is_preview = 0 + and tenant_id=#{tenantId} + and rent_contract_id in (select id from wx_rent_contract where status in (2,3,4)) union all select '' settle_number,id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' bill_type,need_pay,receive_pay,pay,(receive_pay-pay) owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' price_detail,freeze,0 late_pay_price,0 service_charge_pay - from wx_bill_rent_deposit where tenant_id=#{tenantId} and rent_contract_id in (select id from wx_rent_contract + from wx_bill_rent_deposit + where tenant_id=#{tenantId} + and rent_contract_id in (select id from wx_rent_contract where status in (2,3,4)) union all select '' settle_number,id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' price_detail,freeze,ifnull(late_pay_price,0) late_pay_price,service_charge_pay - from wx_bill_property where is_preview = 0 and tenant_id=#{tenantId} and property_contract_id in (select id from + from wx_bill_property + where is_preview = 0 + and tenant_id=#{tenantId} + and property_contract_id in (select id from wx_property_contract where status in(2,3,4)) union all @@ -279,7 +295,9 @@ bill_type,need_pay,receive_pay,pay,(receive_pay-pay) owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' price_detail,freeze,0 late_pay_price,0 service_charge_pay - from wx_bill_property_deposit where tenant_id=#{tenantId} and property_contract_id in (select id from + from wx_bill_property_deposit + where tenant_id=#{tenantId} + and property_contract_id in (select id from wx_property_contract where status in (2,3,4)) union all @@ -403,7 +421,8 @@ ,0 pay,0 owe,s.createtime receive_date,'' pay_date,0 expired_day, status,'' starttime,'' endtime,'' rent_shop_type,'' price_detail, 0 freeze, 0 late_pay_price,0 service_charge_pay - from wx_bill_settle s where s.tenant_id=#{tenantId} and s.status >0 + from wx_bill_settle s where s.tenant_id=#{tenantId} + and s.status >0 ) bill left join wx_merchant m on bill.merchant_id=m.id @@ -772,7 +791,8 @@ select id,merchant_id,shop_id,tenant_id,'其他费用' name,5 bill_type_value,'其他费用' bill_type,0 as need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date, expired_day,status,'' starttime,'' endtime,rent_shop_type,service_charge_pay - from wx_bill_daily where tenant_id = #{tenantId} and type in(1,2,3) + from wx_bill_daily where tenant_id = #{tenantId} + and type in(1,2,3) union all select id,merchant_id,shop_id,tenant_id,'其他费用' name,7 bill_type_value,'其他费用' bill_type,0 as diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 956776081..633ba5730 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -93,7 +93,8 @@ @@ -101,13 +102,16 @@ select round(sum(res.receivepay)/100,2) receivepay,round(sum(res.pay)/100,2) pay,res.tenant_id from ( select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_rent_deposit - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_property_deposit - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other_deposit - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} ) res @@ -115,26 +119,31 @@ select IFNULL(round(sum(res.owe)/100,2),0) owe,res.tenant_id from ( select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_rent_deposit - where status = 1 and tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where status = 1 and tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_property_deposit - where status = 1 and tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where status = 1 and tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} union all select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_other_deposit - where status = 1 and tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where status = 1 and tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} ) res update wx_bill_rent_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 + where tenant_id=#{tenantId} + and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 update wx_bill_rent_deposit set status=#{waitPay} where id in( select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_rent_deposit br left join wx_rent_contract rc on br.rent_contract_id=rc.id - where br.tenant_id=#{tenantId} and br.status!=#{paid} and br.status!=5 and now() < br.receive_date + where br.tenant_id=#{tenantId} + and br.status!=#{paid} and br.status!=5 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index f4250bfce..c935e17a0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -101,11 +101,14 @@ update wx_bill_other_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 + where tenant_id=#{tenantId} + and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 - update wx_bill_other_deposit set status=#{waitPay} where tenant_id=#{tenantId} and status!=5 + update wx_bill_other_deposit set status=#{waitPay} + where tenant_id=#{tenantId} + and status!=5 and status!=#{paid} and DATEDIFF(now(),receive_date) <=0 diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 6ea76173c..4d4869f14 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -100,7 +100,8 @@ update wx_bill_other set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and DATEDIFF(now(),receive_date)>0 + where tenant_id=#{tenantId} + and status!=#{paid} and DATEDIFF(now(),receive_date)>0 @@ -113,10 +114,12 @@ select round(sum(t.receivepay)/100,2) receivepay,round(sum(t.pay)/100,2) pay from ( select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_other - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} union select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_daily - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} ) t @@ -125,10 +128,12 @@ select IFNULL(round(sum(res.owe)/100,2),0) owe,res.tenant_id from ( select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_daily - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} and status = 1 + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} and status = 1 union all select IFNULL(sum(owe),0) owe,tenant_id from wx_bill_daily - where tenant_id=#{tenantId} and receive_date between #{startdate} and #{enddate} and status = 1 + where tenant_id=#{tenantId} + and receive_date between #{startdate} and #{enddate} and status = 1 ) res diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 47d1dca61..61ba0831c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -82,9 +82,9 @@ left join wx_shop s on br.shop_id=s.id and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} and br.`merchant_id` = #{merchantId} and m.`name` like concat('%',#{merchantName},'%') - and br.`tenant_id` = #{tenantId} and br.`status` = #{status} and br.`is_del` = #{isDel} and br.`rent_shop_type` = #{rentShopType} @@ -97,20 +97,23 @@ update wx_bill_property_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 + where tenant_id=#{tenantId} + and status!=#{paid} and status!=5 and DATEDIFF(now(),receive_date)>0 update wx_bill_property_deposit set status=#{waitPay} where id in( select a.id from (select br.id,rc.receive_period,br.property_contract_id,br.receive_date from wx_bill_property_deposit br left join wx_property_contract rc on br.property_contract_id=rc.id - where br.tenant_id=#{tenantId} and br.status!=#{paid} and br.status!=5 and now() < br.receive_date + where br.tenant_id=#{tenantId} + and br.status!=#{paid} and br.status!=5 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 958eadc43..b43a07bea 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -3,6 +3,7 @@ + @@ -10,7 +11,6 @@ - @@ -45,7 +45,7 @@ - `id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, + `id`,`tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`, `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, @@ -124,26 +124,30 @@ update wx_bill_property b set b.status=#{notPaid},b.expired_day= DATEDIFF(now(), b.receive_date) - where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and + where b.tenant_id=#{tenantId} + and b.status!=#{paid} and b.status!=6 and DATEDIFF(now(), b.receive_date) >0 @@ -151,7 +155,8 @@ update wx_bill_property set status=#{waitPay} where id in( select a.id from (select br.id,rc.receive_period,br.property_contract_id,br.receive_date from wx_bill_property br left join wx_property_contract rc on br.property_contract_id=rc.id - where br.tenant_id=#{tenantId} and br.status!=#{paid} and br.status != 6 and now() < br.receive_date + where br.tenant_id=#{tenantId} + and br.status!=#{paid} and br.status != 6 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index c32d69594..84439550d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -3,6 +3,7 @@ + @@ -10,7 +11,6 @@ - @@ -137,25 +137,29 @@ update wx_bill_rent b set b.status=#{notPaid},b.expired_day= DATEDIFF(now(), b.receive_date) - where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and + where b.tenant_id=#{tenantId} + and b.status!=#{paid} and b.status!=6 and DATEDIFF(now(), b.receive_date) >0 @@ -163,7 +167,8 @@ update wx_bill_rent set status=#{waitPay} where id in( select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_rent br left join wx_rent_contract rc on br.rent_contract_id=rc.id - where br.tenant_id=#{tenantId} and br.status!=#{paid} and br.status!=6 and now() < br.receive_date + where br.tenant_id=#{tenantId} + and br.status!=#{paid} and br.status!=6 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) @@ -199,16 +204,17 @@ - INSERT INTO wx_bill_rent (id,rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, - expired_day, - tenant_id, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, + INSERT INTO wx_bill_rent (id,tenant_id, + rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime,expired_day, + owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, pay_way, late_pay_status, comments,service_charge_pay) VALUES ( - #{item.id},#{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, - #{item.expiredDay},#{item.tenantId},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, + #{item.id},#{item.tenantId}, + #{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, + #{item.expiredDay},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, #{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay} diff --git a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml index f4cba5536..067a046fc 100644 --- a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml @@ -38,8 +38,11 @@ - + select id,`name` value from wx_brand + + and `tenant_id` = #{tenantId} + select count(c.id) carcount,c.create_date from ( select id,DATE_FORMAT(create_date,'%Y-%m-%d') create_date - from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType} + from wx_car_cmd_log where tenant_id = #{tenantId} + and cmd_type=#{cmdType} and create_date BETWEEN #{startdate} and #{enddate} ) c group by c.create_date @@ -73,21 +74,24 @@ diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index c20ec503a..ea1b2770e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -112,7 +112,8 @@ update wx_coupon_action_log - set create_time_md = DATE_FORMAT(create_time,'%m/%d') where tenant_id = #{tenantId}; + set create_time_md = DATE_FORMAT(create_time,'%m/%d') + where tenant_id = #{tenantId}; diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 5359563fe..7d380ac0d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -102,7 +102,8 @@ `b_user_id` = #{bUserId}, `update_date` = #{updateDate}, `verify_type` = #{verifyType} - where `tenant_id`=#{tenantId} and id=#{id} and `b_user_id` is null + where `tenant_id`=#{tenantId} + and id=#{id} and `b_user_id` is null @@ -129,7 +130,8 @@ `b_user_id` = null, `update_date` = #{updateDate}, `verify_type` = null - where `tenant_id`=#{tenantId} and id=#{id} + where `tenant_id`=#{tenantId} + and id=#{id} SELECT DATE_FORMAT(create_date,'%Y-%m-%d') as xTime,IFNULL(SUM(coupon_price),0) as price from wx_coupon_order - where tenant_id=#{tenantId} AND create_date >= #{startTime} and create_date < #{endTime} GROUP BY xTime + where tenant_id=#{tenantId} + AND create_date >= #{startTime} and create_date < #{endTime} GROUP BY xTime @@ -899,7 +902,8 @@ from wx_coupon_order co inner join wx_coupon c on c.id = co.coupon_id inner join wx_coupon_merchant cm on cm.product_id = co.coupon_id - where co.tenant_id = #{tenantId} and co.c_user_id = #{cUserId} + where co.tenant_id = #{tenantId} + and co.c_user_id = #{cUserId} and co.coupon_order_status = 0 and cm.merchant_id = #{merchantId} and co.expired_time > now() @@ -910,7 +914,8 @@ inner join wx_coupon c on c.id = co.coupon_id inner join wx_coupon_merchant cm on cm.product_id = co.coupon_id inner join pos_coupon_order_verify pco on pco.coupon_order_id = co.id - where co.tenant_id = #{tenantId} and co.c_user_id = #{cUserId} + where co.tenant_id = #{tenantId} + and co.c_user_id = #{cUserId} and co.coupon_order_status = 100 and cm.merchant_id = #{merchantId} and co.expired_time > now() diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 83749cb13..6468f0672 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -141,7 +141,8 @@ (select count(*) as coupon_count,coupon_id from wx_coupon_password where tenant_id=#{tenantId} and status=0 group by coupon_id) cp inner join wx_coupon c on cp.coupon_id = c.id - where c.tenant_id=#{tenantId} and c.status=0 and c.put_apply_status in(0,2) + where c.tenant_id=#{tenantId} + and c.status=0 and c.put_apply_status in(0,2) and cp.`coupon_id` = #{couponId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml index 960e88421..3b4abc187 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml @@ -62,7 +62,8 @@ diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 04910652c..b5d888853 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -53,32 +53,26 @@ and cs.coupon_id = #{couponId} - and cs.title like concat('%', #{title},'%') - and cs.send_type = #{sendType} - and cs.status = #{status} - and cs.create_date = #{createDate} - and cs.update_date = #{updateDate} - and cs.conditions -> '$.title' like concat('%',#{merchantName},'%') @@ -104,14 +98,17 @@ @@ -69,7 +70,8 @@ left join wx_coupon c on o.product_id=c.id left join wx_order_group g on o.order_group_id=g.id left join wx_c_user u on o.c_user_id=u.id - where o.tenant_id=#{tenantId} and c.type=9 + where o.tenant_id=#{tenantId} + and c.type=9 and o.c_user_id=#{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f75e545d9..82bdaa62c 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -21,13 +21,13 @@ - + `id`,`order_number`,`tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`type`,`payment_type`,`payment`,`payment_time`,`order_status`,`create_date`,`update_date`,`detail`, - `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`real_payment` + `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment` @@ -559,7 +559,8 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,2 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type!=100 and o.order_status in(0,1,2,3,4,5) + where o.tenant_id=#{tenantId} + and c.type!=100 and o.order_status in(0,1,2,3,4,5) and ifnull(press_current_num,0)=0 and ifnull(order_group_id,0)=0 union all select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, @@ -568,7 +569,8 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,3 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type=8 and press_current_num>0 + where o.tenant_id=#{tenantId} + and c.type=8 and press_current_num>0 union all select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, case o.order_status when 10 then 1 when 11 then 1 @@ -577,7 +579,8 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,4 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type=9 and order_group_id>0 + where o.tenant_id=#{tenantId} + and c.type=9 and order_group_id>0 ) o @@ -796,7 +799,9 @@ - update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and order_group_id=#{orderGroupId} and order_status=10 + update wx_order set order_status=#{orderStatus} + where tenant_id=#{tenantId} + and order_group_id=#{orderGroupId} and order_status=10 diff --git a/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml index 92f5510d8..ac4964d31 100644 --- a/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxQuestionLogMapper.xml @@ -34,10 +34,6 @@ and `question_id` = #{questionId} - - and `tenant_id` = #{tenantId} - - and `answer` = #{answer} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 8074f95f2..6f92b3e4b 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -437,7 +437,8 @@ - select id,shop_number shopNumber from wx_shop where tenant_id=#{tenantId} and shop_number = #{shopNumber} and is_del=0 diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index d1de62baa..ee8410e56 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -8,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.service.WxAppinfoService; import com.iformall.service.wechat.FmOpenService; @@ -123,7 +124,7 @@ public class WxAppinfoController extends BaseController { } try { exportQrcode(request, response, - getTenantId(), type, pageUrl, sceneParam, + getTenantInfo(), type, pageUrl, sceneParam, withText, text1, text2, name); } catch (Exception e) { @@ -133,12 +134,12 @@ public class WxAppinfoController extends BaseController { } private void exportQrcode(HttpServletRequest request, HttpServletResponse response, - String tenantId, int type, String pageUrl, String sceneParam, - int withText, String text1, String text2, + TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, + int withText, String text1, String text2, String name) { // type 0 有限二维码, 1 无限制二维码 // withText 0 不带字 1. 带下面的字,2 带下面的两行字 - WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantId); + WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantEntity); boolean autoColor = false; boolean isHyaline = true; WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 2767ffb3b..8e1168e78 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -6,9 +6,11 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.shiro.UserSession; import com.iformall.utils.IPUtil; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.session.Session; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; @@ -50,12 +52,27 @@ public class BaseController { Long userId = (Long) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId); return userId; } - + + @Deprecated public String getTenantId(){ String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); return tenantId; } + /** + * 返回租户信息 + * @return + */ + public TenantEntity getTenantInfo(){ + Session session = SecurityUtils.getSubject().getSession(); + String tenantId = (String)session.getAttribute(UserSession.tenantId); + + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + }}; + return tenantEntity; + } + public String getIpAddr() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 9253d4f9b..e333ca756 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -50,7 +50,7 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-增加") public ResultData add(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::add"); - wxBrand.setTenantId(getTenantId()); + wxBrand.updateTenantInfo(getTenantInfo()); return wxBrandService.save(wxBrand); } @@ -58,7 +58,7 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-更新") public ResultData update(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); - wxBrand.setTenantId(getTenantId()); + wxBrand.updateTenantInfo(getTenantInfo()); return wxBrandService.update(wxBrand); } @@ -81,7 +81,7 @@ public class WxBrandController extends BaseController { @GetMapping("/queryBrand") @SystemControllerLog(description = "品牌-租户-全部") public ResultData queryBrand() { - List> brandList = wxBrandService.queryBrand(getTenantId()); + List> brandList = wxBrandService.queryBrand(getTenantInfo()); return new ResultData(brandList); } @@ -94,7 +94,12 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-名称是否存在") public ResultData hasBrand(String name, Long id) { logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); - return wxBrandService.hasBrand(getTenantId(), name, id); + WxBrand wxBrand = new WxBrand() {{ + setName(name); + setId(id); + }}; + wxBrand.updateTenantInfo(getTenantInfo()); + return wxBrandService.hasBrand(wxBrand); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 056d362ec..ee56d1f14 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -7,6 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxMallBuildingFloorDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; import com.iformall.service.WxMallBuildingService; @@ -83,17 +84,17 @@ public class WxMallBuildingController extends BaseController { @ApiOperation("获取所有数据") @GetMapping("getbuildinglist") @SystemControllerLog(description = "商城-楼座-获取所有数据") - public ResultData getbuildinglist() { + public ResultData getBuildingList() { logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildinglist"); - return wxMallBuildingService.getbuildinglist(getTenantId()); + return wxMallBuildingService.getBuildingList(getTenantInfo()); } @ApiOperation("获取楼层楼座数据") @GetMapping("getbuildingfloorlist") @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") - public ResultData getbuildingfloorlist() { + public ResultData getBuildingFloorList() { logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); - return wxMallBuildingService.getbuildingfloorlist(getTenantId()); + return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); } @ApiOperation("新增接口(3)") @@ -113,6 +114,7 @@ public class WxMallBuildingController extends BaseController { if(StringUtils.isBlank(mallBuildingFloorDto.getFloors())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + mallBuildingFloorDto.updateTenantInfo(getTenantInfo()); wxMallBuildingService.addBuildingAndFloors(mallBuildingFloorDto); return new ResultData(); } @@ -131,7 +133,7 @@ public class WxMallBuildingController extends BaseController { if (record.getTotalArea() == null && record.getOperatingArea() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - record.setTenantId(getTenantId()); + record.updateTenantInfo(getTenantInfo()); wxMallBuildingService.saveFloorArea(record); return new ResultData(); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java index c7d53152b..d3637e8c2 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java @@ -84,7 +84,7 @@ public class WxMallFloorController extends BaseController { @SystemControllerLog(description = "商城-楼座-楼层") public ResultData getfloorlist(Long buildingId) { logger.debug("[" + getIpAddr() + "] WxMallFloorController::getfloorlist"); - return wxMallFloorService.getfloorlist(getTenantId(), buildingId); + return wxMallFloorService.getFloorList(getTenantInfo(), buildingId); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 672d12c2a..4a6e95a17 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -37,11 +37,9 @@ public class WxMerchantController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "商户-列表") public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); @@ -52,11 +50,9 @@ public class WxMerchantController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "商户-列表") public ResultData listVo(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); @@ -64,11 +60,9 @@ public class WxMerchantController extends BaseController { @ApiOperation("ETCP商户列表") @GetMapping("etcplist") - @SystemControllerLog(description = "商户-ETCP商户列表") public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::etcpList"); if (null == wxMerchant) wxMerchant = new WxMerchant(); - wxMerchant.setTenantId(getTenantId()); final List merchantList = wxMerchantService.etcpList(wxMerchant); return new ResultData(merchantList); } @@ -86,11 +80,9 @@ public class WxMerchantController extends BaseController { @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "商户-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxMerchantController::findById"); WxMerchant wxMerchant = wxMerchantService.getById(id); - return new ResultData(wxMerchant); } @@ -109,7 +101,6 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-新增") public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.addMerchant(wxMerchant, getUserId()); } @@ -118,7 +109,6 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新") public ResultData updateMerchant(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchant"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchant(wxMerchant); } @@ -127,7 +117,6 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新账户") public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantAccount(wxMerchant); } @@ -136,7 +125,6 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新管理员") public ResultData updateMerchantAdmin(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantAdmin(wxMerchant); } @@ -145,7 +133,6 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新法人") public ResultData updateMerchantCopr(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantCorp"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantCorp(wxMerchant); } @@ -154,7 +141,6 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新税务") public ResultData updateMerchantTax(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantTax"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantTax(wxMerchant); } @@ -163,22 +149,19 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-更新会员等级权益") public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.updateMerchantLevel(wxMerchant); } @ApiOperation("查询当前租户下商户名称列表") @GetMapping("/name_list") - @SystemControllerLog(description = "查询当前租户下商户名称列表") public ResultData nameList() { logger.debug("[" + getIpAddr() + "] WxMerchantController::name_list"); - return new ResultData(wxMerchantService.findList(getTenantId())); + return new ResultData(wxMerchantService.findList(getTenantInfo())); } @ApiOperation("根据id查询接口") @GetMapping("/findMerchantById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "商户-查询") public ResultData findMerchantById(Long id) { logger.debug("[" + getIpAddr() + "] WxMerchantController::findMerchantById"); WxMerchantVo wxMerchant = wxMerchantService.findMerchantById(id); @@ -187,18 +170,14 @@ public class WxMerchantController extends BaseController { @ApiOperation("商户数据导出") @GetMapping("/exportData") - @SystemControllerLog(description = "商户-商户数据导出") public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { - wxMerchant.setTenantId(getTenantId()); wxMerchantService.exportData(wxMerchant,request,response); } @ApiOperation("置顶") @PostMapping("top") - @SystemControllerLog(description = "商户-置顶") public ResultData top(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::top"); - wxMerchant.setTenantId(getTenantId()); return wxMerchantService.top(wxMerchant); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index e3f530038..2a7770e4f 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -33,7 +33,7 @@ public class WxMsgCallbackController extends BaseController { public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); - wxMsgCallback.setTenantId(getTenantId()); + wxMsgCallback.updateTenantInfo(getTenantInfo()); wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); @@ -46,7 +46,7 @@ public class WxMsgCallbackController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::add"); //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgCallback.setTenantId(getTenantId()); + wxMsgCallback.updateTenantInfo(getTenantInfo()); wxMsgCallbackService.saveOrUpdate(wxMsgCallback); return new ResultData(); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 4a2954819..474ad93fc 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -45,7 +45,7 @@ public class WxMsgController extends BaseController { public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgController::list"); if (null == wxMsg) wxMsg = new WxMsg(); - wxMsg.setTenantId(getTenantId()); + wxMsg.updateTenantInfo(getTenantInfo()); //wxMsg.setWay(EnumSendWay.TAG.getCode()); wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); @@ -57,7 +57,7 @@ public class WxMsgController extends BaseController { @SystemControllerLog(description = "标签短信-新增") public ResultData add(@RequestBody WxMsg wxMsg) { logger.debug("[" + getIpAddr() + "] WxMsgController::add"); - wxMsg.setTenantId(getTenantId()); + wxMsg.updateTenantInfo(getTenantInfo()); return wxMsgService.add(wxMsg); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index 5db428975..9ebc89d08 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -33,7 +33,7 @@ public class WxMsgModelController extends BaseController { public ResultData list(@ModelAttribute WxMsgModel wxMsgModel, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); - wxMsgModel.setTenantId(getTenantId()); + wxMsgModel.updateTenantInfo(getTenantInfo()); wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); @@ -46,7 +46,7 @@ public class WxMsgModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgModelController::add"); //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgModel.setTenantId(getTenantId()); + wxMsgModel.updateTenantInfo(getTenantInfo()); return wxMsgModelService.saveOrUpdate(wxMsgModel); } @@ -83,7 +83,7 @@ public class WxMsgModelController extends BaseController { @SystemControllerLog(description = "短信模板-获取所有数据") public ResultData getmodellist() { logger.debug("[" + getIpAddr() + "] WxMsgModelController::getmodellist"); - return wxMsgModelService.getmodellist(getTenantId()); + return wxMsgModelService.getModelList(getTenantInfo()); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index c8c480276..a63a75db7 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -33,7 +33,7 @@ public class WxMsgSignatureController extends BaseController { public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); - wxMsgSignature.setTenantId(getTenantId()); + wxMsgSignature.updateTenantInfo(getTenantInfo()); wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); @@ -46,7 +46,7 @@ public class WxMsgSignatureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::add"); //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgSignature.setTenantId(getTenantId()); + wxMsgSignature.updateTenantInfo(getTenantInfo()); wxMsgSignatureService.saveOrUpdate(wxMsgSignature); return new ResultData(); } @@ -84,7 +84,7 @@ public class WxMsgSignatureController extends BaseController { @SystemControllerLog(description = "消息签名-获取所有") public ResultData getmodellist() { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::getmodellist"); - return wxMsgSignatureService.getsignaturelist(getTenantId()); + return wxMsgSignatureService.getSignatureList(getTenantInfo()); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index a67e4a93c..4b29f1aff 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -30,7 +30,7 @@ public class WxMsgValidationcodeModelController extends BaseController { public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); - wxMsgValidationcodeModel.setTenantId(getTenantId()); + wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); final PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); return new ResultData(page); } @@ -41,7 +41,7 @@ public class WxMsgValidationcodeModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::add"); //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgValidationcodeModel.setTenantId(getTenantId()); + wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 47e3799e8..4acaa91f5 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -7,6 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; @@ -145,7 +146,7 @@ public class HomeController extends BaseController { if(isLogin) { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); WxMall mall = mallService.getByTenantId(info.getTenantId()); if(mall == null) { @@ -199,15 +200,18 @@ public class HomeController extends BaseController { logger.error("appid未找到"); return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } + TenantEntity tenantEntity = new TenantEntity() {{ + setTenantId(appinfo.getTenantId()); + }}; if (StringUtils.isNotBlank(user.getPhone())) { // 领导登录 - user = mallUserInfoService.getByPhone(user.getPhone(), appinfo.getTenantId()); + user = mallUserInfoService.getByPhone(user.getPhone(), tenantEntity); if (user == null || !isInMobileAdmin(user)) { return new ResultData(ErrorCode.USER_NO_PERMISSION); } } else if (StringUtils.isNotBlank(user.getBopenId())) { // 领导登录 - user = mallUserInfoService.getByBOpenId(user.getBopenId(), appinfo.getTenantId()); + user = mallUserInfoService.getByBOpenId(user.getBopenId(), tenantEntity); if (user == null || !isInMobileAdmin(user)) { return new ResultData(ErrorCode.USER_NO_PERMISSION); } @@ -239,7 +243,7 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户登录"); WxMall mall = mallService.getByTenantId(info.getTenantId()); if (mall == null) { @@ -339,7 +343,7 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.protectInfos(); - mallUserActionService.saveActionInfo(info.getTenantId(), EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户手机号登录"); + mallUserActionService.saveActionInfo(info, EnumMallUserAction.CONTROLLER.getCode(), ipaddress, info.getId(), "用户手机号登录"); WxMall mall = mallService.getByTenantId(info.getTenantId()); if (mall == null) { diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index d18d0ed2b..64eb4833b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.MallRole; import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserRole; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRoleService; @@ -87,7 +88,7 @@ public class MallRoleController extends BaseController { MallRole role = sysRoleService.getById(sysRole.getId()); MallRolePermission p = new MallRolePermission(); p.setRoleId(role.getId()); - p.setTenantId(getTenantId()); + p.updateTenantInfo(getTenantInfo()); List pers = sysRolePermissionService.getList(p); String menus = ""; for (MallRolePermission rp : pers) { @@ -111,12 +112,11 @@ public class MallRoleController extends BaseController { if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色"); } - String tenantId = currentUser.getTenantId(); - int count = checkUnique(sysRole.getName(), tenantId); + int count = checkUnique(sysRole.getName(), currentUser); if (sysRole.getId() == null && count > 0) { return new ResultData(ResultData.ERROR, "角色名已存在"); } - sysRole.setTenantId(tenantId); + sysRole.updateTenantInfo(currentUser); sysRoleService.saveOrUpdate(sysRole); // SysRolePermissionService.deleteById(id); if (StringUtils.isNoneBlank(sysRole.getMenus())) { @@ -124,7 +124,7 @@ public class MallRoleController extends BaseController { for (String mId : sysRole.getMenus().split(",")) { mIds.add(Long.valueOf(mId)); } - sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); + sysRolePermissionService.savePermissions(currentUser, sysRole.getId(), mIds.toArray(new Long[]{})); } return new ResultData(); } @@ -140,7 +140,7 @@ public class MallRoleController extends BaseController { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加角色"); } Assert.notNull(sysRole.getName(), "角色名不能为空"); - Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); + Assert.isTrue(checkUnique(sysRole.getName(), currentUser)>0, "重复的角色名"); sysRoleService.saveOrUpdate(sysRole); return new ResultData(); } @@ -156,7 +156,7 @@ public class MallRoleController extends BaseController { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能更新角色"); } if (sysRole.getName() != null) { - Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); + Assert.isTrue(checkUnique(sysRole.getName(), currentUser)>1, "角色名已存在"); } sysRoleService.saveOrUpdate(sysRole); // Assert.notNull(sysRole.getName(), "角色名不能为空"); @@ -184,10 +184,10 @@ public class MallRoleController extends BaseController { return new ResultData(Result.SUCCESS, "删除成功", null); } - private int checkUnique(String name, String tenantId) { + private int checkUnique(String name, TenantEntity tenantEntity) { MallRole role = new MallRole(); role.setName(name); - role.setTenantId(tenantId); + role.updateTenantInfo(tenantEntity); return sysRoleService.countList(role); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 9df687d47..2655afec4 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { @SystemControllerLog(description = "用户管理-列表") public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); - userInfo.setTenantId(getTenantId()); + userInfo.updateTenantInfo(getTenantInfo()); userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { @@ -130,7 +130,7 @@ public class MallUserInfoController extends BaseController { Assert.notNull(userInfo.getPassword(), "密码不能为空"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); - userInfo.setTenantId(getTenantId()); + userInfo.updateTenantInfo(getTenantInfo()); // 无法创建超管 userInfo.setIsAdmin(EnumUserAdmin.Normal.getCode()); userInfoService.saveOrUpdate(userInfo); @@ -169,7 +169,7 @@ public class MallUserInfoController extends BaseController { bChangedPhone = true; } - userInfo.setTenantId(getTenantId()); + userInfo.updateTenantInfo(getTenantInfo()); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); @@ -250,7 +250,7 @@ public class MallUserInfoController extends BaseController { } MallUserInfo updateUserInfo = new MallUserInfo(); updateUserInfo.setId(userInfo.getId()); - updateUserInfo.setTenantId(getTenantId()); + updateUserInfo.updateTenantInfo(getTenantInfo()); updateUserInfo.setStatus(userInfo.getStatus()); userInfoService.saveOrUpdate(userInfo); return new ResultData(); @@ -336,7 +336,7 @@ public class MallUserInfoController extends BaseController { } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcode.setPhone(user.getPhone()); wxMsgValidationcode.setType(type); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 4a84c9237..f59d94a42 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -13,6 +13,7 @@ import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.MallResourceService; import com.iformall.utils.Constant; import com.iformall.utils.ImgUtil; diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index 34528e993..68e9ca110 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -1,13 +1,9 @@ package com.iformall.controller.sys; -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAdminLog; import com.iformall.service.WxAdminLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,8 +22,7 @@ public class WxAdminLogController extends BaseController { @PostMapping("pvlog") public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); - String tenantId = getTenantId(); - wxAdminLog.setTenantId(tenantId); + wxAdminLog.updateTenantInfo(getTenantInfo()); wxAdminLogService.saveLogCount(wxAdminLog); return new ResultData(); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index e01d23700..e433a5bcc 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -33,7 +33,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(getTenantId(),null); + final List busList = wxBusinessService.findListAll(getTenantInfo(),null); return new ResultData(busList); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/log/SystemLogAspect.java b/mallinkSysAdmin/src/main/java/com/iformall/log/SystemLogAspect.java index 02bbae52a..f4d155700 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/log/SystemLogAspect.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/log/SystemLogAspect.java @@ -60,7 +60,7 @@ public class SystemLogAspect { " ip:" + ipaddress); MallUserAction action = new MallUserAction(); - action.setTenantId(user.getTenantId()); + action.updateTenantInfo(user); action.setType(EnumMallUserAction.CONTROLLER.getCode()); action.setIp(ipaddress); action.setUserId(user.getId()); diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java index 9d64c38ec..f38ff1dae 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.interceptor.AuthHandshakeInterceptor; import com.iformall.service.WxAppinfoService; @@ -82,12 +83,27 @@ public class BaseController { return user; } + @Deprecated public String getTenantId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(AuthHandshakeInterceptor.TENANT_ID); return tenantId; } + /** + * 返回租户信息 + * @return + */ + public TenantEntity getTenantInfo(){ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String tenantId = (String)request.getAttribute(AuthHandshakeInterceptor.TENANT_ID); + + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + }}; + return tenantEntity; + } + public WxAppinfo getAppInfo(String appId) { return wxAppinfoService.getByAppId(appId); } @@ -115,6 +131,7 @@ public class BaseController { public void saveToBasicInfo(WxCUser user) { + TenantEntity tenantEntity = getTenantInfo(); String phone = user.getPhone(); if (phone != null && phone.contains("*")) { phone = user.getVerifyCodePhone(); @@ -122,7 +139,7 @@ public class BaseController { if (StringUtils.isBlank(phone)) return; - List list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); + List list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); if (list.size() > 0) { WxCUserBasicInfo basicInfo = list.get(0); // 微信名称 @@ -142,7 +159,7 @@ public class BaseController { Date cur = new Date(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); basicInfo.setId(user.getId()); - basicInfo.setTenantId(user.getTenantId()); + basicInfo.updateTenantInfo(tenantEntity); basicInfo.setPhone(phone); basicInfo.setNickName(user.getNickName()); basicInfo.setSex(user.getGender());