From 9c12d2c72ee9be0c894cc9ea517c83ca6950d784 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 30 Oct 2019 15:59:02 +0800 Subject: [PATCH] =?UTF-8?q?[PO][=E4=BF=AE=E6=94=B9]:=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E7=89=88=E9=A2=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/BaseController.java | 2 +- .../controller/basic/WxBrandController.java | 2 +- .../basic/WxMallBuildingController.java | 2 +- .../basic/WxMerchantController.java | 32 ++++++++--------- .../controller/basic/WxShopController.java | 12 +++---- .../controller/car/WxCarController.java | 35 +++++++++++-------- 6 files changed, 45 insertions(+), 40 deletions(-) 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..6387b36bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -74,7 +74,7 @@ public class BaseController { } public void setTenantInfo(TenantEntity dest, TenantEntity source) { - dest.setTenantId(source.getTenantId()); + dest.updateTenantInfo(source); } public String getIpAddr() { 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..c069dc065 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -57,7 +57,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); } 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..ffad1be56 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -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/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index d44dbbd39..eb4bca829 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()); @@ -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); } @@ -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..09a315795 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); } @@ -127,7 +127,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 +141,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 +154,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 +170,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/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index 7b6774fee..f0b15a4b9 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); @@ -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) {