develop # Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.javarelease_toaliyun_real
| @@ -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<WxMerchant> 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<String, String> 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<WxCouponChannel> 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<String,String> 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) { | |||
| @@ -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); | |||
| @@ -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<WxBrand> 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<WxMerchant> 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<Map<String,Object>> brandList = wxBrandService.queryBrand(getTenantId()); | |||
| List<Map<String,Object>> 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); | |||
| } | |||
| @@ -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(); | |||
| } | |||
| @@ -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); | |||
| } | |||
| @@ -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<WxMerchant> 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<WxMerchant> 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<WxMerchant> 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<String,String> 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<WxMerchantTradeVo> 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<WxMerchantTradeDetailVo> 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); | |||
| } | |||
| @@ -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<Map<String, Object>> 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<Map<String, Object>> 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<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); | |||
| @@ -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))); | |||
| } | |||
| @@ -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) { | |||
| @@ -57,7 +57,7 @@ public class WxPropertyContractController extends BaseController { | |||
| if (null == wxPropertyContract) { | |||
| wxPropertyContract = new WxPropertyContract(); | |||
| } | |||
| wxPropertyContract.setTenantId(getTenantId()); | |||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | |||
| Map<String, Object> 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<String, Object> 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)); | |||
| } | |||
| @@ -104,7 +104,7 @@ public class WxRentContractController extends BaseController { | |||
| if (null == wxRentContract) { | |||
| wxRentContract = new WxRentContract(); | |||
| } | |||
| wxRentContract.setTenantId(getTenantId()); | |||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||
| Map<String, Object> 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<String, Object> 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<String, String> 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); | |||
| } | |||
| @@ -39,7 +39,7 @@ public class WxRentPropertyContractController extends BaseController { | |||
| if (null == wxRentPropertyContractVo) { | |||
| wxRentPropertyContractVo = new WxRentPropertyContractVo(); | |||
| } | |||
| wxRentPropertyContractVo.setTenantId(getTenantId()); | |||
| wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxRentPropertyContractVo> 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); | |||
| } | |||
| @@ -29,7 +29,7 @@ public class DataTowerController extends BaseController { | |||
| public ResultData queryRunningPotal() { | |||
| logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningPotal"); | |||
| Map<String, Object> data = dataTowerService.queryRunningPotal(getTenantId()); | |||
| Map<String, Object> 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<String, Object> data = dataTowerService.queryRunningMobile(getTenantId()); | |||
| Map<String, Object> 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<String, Object> data = dataTowerService.queryRunning(getTenantId()); | |||
| Map<String, Object> 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<String, Object> data = dataTowerService.queryCar(getTenantId()); | |||
| Map<String, Object> 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<String, Object> data = dataTowerService.queryCustomer(getTenantId()); | |||
| Map<String, Object> data = dataTowerService.queryCustomer(getTenantInfo()); | |||
| return new ResultData(data); | |||
| } | |||
| @@ -86,7 +86,7 @@ public class DataTowerController extends BaseController { | |||
| public ResultData queryCustomerData(@RequestParam Map<String,String> params) { | |||
| logger.debug("[" + getIpAddr() + "] DataTowerController::queryCustomer"); | |||
| return dataTowerService.queryCustomerData(getTenantId(), params); | |||
| return dataTowerService.queryCustomerData(getTenantInfo(), params); | |||
| } | |||
| @@ -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" + | |||
| @@ -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<WxMerchantTradeDailyVo> 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); | |||
| } | |||
| @@ -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<WxLevelConfig> 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<String, Object> 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)); | |||
| } | |||
| @@ -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<KwBox> 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); | |||
| @@ -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())); | |||
| } | |||
| } | |||
| @@ -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<KwMeter> 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<KwBox> 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<KwMeter> kwMeters = kwMeterService.findList(record); | |||
| @@ -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<KwMeterDataVo> kwMeterDataVos = kwMeterDataService.findVoList(kwMeterDataDto); | |||
| @@ -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); | |||
| @@ -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(); | |||
| @@ -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); | |||
| } | |||
| @@ -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(); | |||
| } | |||
| @@ -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<WxActivity> 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) { | |||
| @@ -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<WxActivityJoin> 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); | |||
| } | |||
| @@ -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<WxCampaign> 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()); | |||
| @@ -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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<Map<String, Object>> 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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<WxCouponChannelVo> 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<String,String> 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<Integer> channellist = new ArrayList<>(); | |||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | |||
| wxCouponChannel.setTenantId(getTenantId()); | |||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | |||
| wxCouponChannel.setStatus(0); | |||
| wxCouponChannel.setCouponId(id); | |||
| List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | |||
| @@ -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<String, Object> result = new HashedMap(); | |||
| wxCoupon.setTenantId(getTenantId()); | |||
| PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon, pageNum, pageSize); | |||
| Map<String,Object> result = new HashedMap(); | |||
| wxCoupon.updateTenantInfo(getTenantInfo()); | |||
| PageInfo<WxCouponStatisVo> 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); | |||
| } | |||
| @@ -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<WxCouponInject> 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); | |||
| @@ -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<WxAppinfo> 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); | |||
| @@ -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<WxCouponPassword> 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<WxCouponPasswordCountInfoVO> page = wxCouponPasswordService.findCouponList(wxCouponPassword, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -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<WxCouponPresent> 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<WxCouponPassword> list = wxCouponPasswordService.findList(wxCouponPassword); | |||
| @@ -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<WxCouponSendConfig> 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(); | |||
| @@ -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(); | |||
| // } | |||
| @@ -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<WxFloatingLayerVO> 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) { | |||
| @@ -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<WxGame> 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(); | |||
| } | |||
| @@ -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<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -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<WxMerchantPowerBillConfig> page = wxMerchantPowerBillConfigService.listAsPage(wxMerchantPowerBillConfig, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -96,7 +96,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||
| if (null == wxMerchantSubsidy) { | |||
| wxMerchantSubsidy = new WxMerchantSubsidyVo(); | |||
| } | |||
| wxMerchantSubsidy.setTenantId(getTenantId()); | |||
| wxMerchantSubsidy.updateTenantInfo(getTenantInfo()); | |||
| Map<String, Long> 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<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -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<WxOrder> 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<WxOrder> 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<String, Object> data = wxOrderService.queryOrderSummary(getTenantId()); | |||
| Map<String, Object> 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<String, Long> 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); | |||
| } | |||
| @@ -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<WxOrderGroupMarketing> page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -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<WxPowerBillAutoConfig> 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())); | |||
| } | |||
| @@ -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); | |||
| @@ -51,7 +51,7 @@ public class WxProfitSharingOrderController extends BaseController { | |||
| public ResultData queryOrderSummary() { | |||
| logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::queryOrderSummary"); | |||
| Map<String, Object> data = wxProfitSharingOrderService.queryOrderSummary(getTenantId()); | |||
| Map<String, Object> data = wxProfitSharingOrderService.queryOrderSummary(getTenantInfo()); | |||
| return new ResultData(data); | |||
| } | |||
| @@ -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<WxQuestionConfig> 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(); | |||
| } | |||
| @@ -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<WxTopic> 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); | |||
| } | |||
| @@ -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()); | |||
| } | |||
| @@ -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); | |||
| @@ -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<String, WxMerchant> 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<String, WxMerchant> 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()); | |||
| } | |||
| @@ -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<WxLevelConfig> levelList = wxLevelConfigService.getByTenantId(info.getTenantId()); | |||
| List<WxLevelConfig> 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<Long> 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<WxCUserBasicInfo> 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<WxCUserTags> 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<WxCouponOrder> 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<WxCouponOrder> 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<WxCUserBasicInfo>()); | |||
| } | |||
| List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); | |||
| List<WxCUserBasicInfo> 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<WxCUserBasicInfoFilterDto> 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<WxCUserBasicInfoFilterDto> filterList) { | |||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); | |||
| return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList)); | |||
| return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantInfo(),filterList)); | |||
| } | |||
| @ApiOperation("根据ID锁定") | |||
| @@ -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<TouchUsersReportVo> 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<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); | |||
| List<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantEntity, sTime, eTime); | |||
| Map<String, Integer> dataMap = new HashMap<>(); | |||
| for (CUserDateAmountVo v : datas) { | |||
| dataMap.put(v.getXTime(), v.getPrice()); | |||
| @@ -60,7 +60,7 @@ public class WxCreditHistoryController extends BaseController { | |||
| } | |||
| try { | |||
| Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId,getTenantId()) ; | |||
| Map<String, Integer> 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); | |||
| } | |||
| @@ -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<WxLevelConfig> 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<WxLevelConfig> 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<WxLevelConfig> 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); | |||
| @@ -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) { | |||
| @@ -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<WxMsgCallback> 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(); | |||
| } | |||
| @@ -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<WxMsg> 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); | |||
| } | |||
| @@ -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<WxMsgModel> 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()); | |||
| } | |||
| @@ -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<WxMsgRecord> 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()); | |||
| } | |||
| } | |||
| @@ -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<WxMsgSignature> 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()); | |||
| } | |||
| @@ -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); | |||
| @@ -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<WxMsgValidationcodeModel> 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); | |||
| } | |||
| @@ -42,7 +42,7 @@ public class WxBillActionController extends BaseController { | |||
| if (null == wxBillAction) { | |||
| wxBillAction = new WxBillAction(); | |||
| } | |||
| wxBillAction.setTenantId(getTenantId()); | |||
| wxBillAction.updateTenantInfo(getTenantInfo()); | |||
| PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | |||
| return new ResultData(result); | |||
| } | |||
| @@ -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<String, Object> 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<String, Object> 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()); | |||
| } | |||
| @@ -64,7 +64,7 @@ public class WxBillDailyController extends BaseController { | |||
| if (null == wxBillDaily) { | |||
| wxBillDaily = new WxBillDaily(); | |||
| } | |||
| wxBillDaily.setTenantId(getTenantId()); | |||
| wxBillDaily.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillDaily> 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); | |||
| } | |||
| @@ -35,7 +35,7 @@ public class WxBillDepositController extends BaseController { | |||
| if (null == wxBillDeposit) { | |||
| wxBillDeposit = new WxBillDeposit(); | |||
| } | |||
| wxBillDeposit.setTenantId(getTenantId()); | |||
| wxBillDeposit.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillDeposit> 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()); | |||
| } | |||
| @@ -40,7 +40,7 @@ public class WxBillOtherController extends BaseController { | |||
| if (null == wxBillOther) { | |||
| wxBillOther = new WxBillOther(); | |||
| } | |||
| wxBillOther.setTenantId(getTenantId()); | |||
| wxBillOther.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillOther> 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); | |||
| } | |||
| @@ -40,7 +40,7 @@ public class WxBillOtherDepositController extends BaseController { | |||
| if (null == wxBillOtherDeposit) { | |||
| wxBillOtherDeposit = new WxBillOtherDeposit(); | |||
| } | |||
| wxBillOtherDeposit.setTenantId(getTenantId()); | |||
| wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillOtherDeposit> 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); | |||
| } | |||
| @@ -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<WxBillProperty> 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<WxBillProperty> page = wxBillPropertyService.findByPropertyContractId(propertyContractId, getTenantId(), pageNum, pageSize); | |||
| final PageInfo<WxBillProperty> 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); | |||
| } | |||
| } | |||
| @@ -35,7 +35,7 @@ public class WxBillPropertyDepositController extends BaseController { | |||
| if (null == wxBillPropertyDeposit) { | |||
| wxBillPropertyDeposit = new WxBillPropertyDeposit(); | |||
| } | |||
| wxBillPropertyDeposit.setTenantId(getTenantId()); | |||
| wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); | |||
| PageInfo<WxBillPropertyDeposit> 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(); | |||
| } | |||
| @@ -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<WxBillRent> 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<WxBillRent> page = wxBillRentService.findByRentContractId(rentContractId, getTenantId(), pageNum, pageSize); | |||
| WxBillRent record = new WxBillRent(); | |||
| record.setRentContractId(rentContractId); | |||
| record.updateTenantInfo(getTenantInfo()); | |||
| final PageInfo<WxBillRent> 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); | |||
| } | |||
| @@ -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<WxBillSettle> 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); | |||
| } | |||
| } | |||
| @@ -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"); | |||
| @@ -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<MallRole> 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<MallRolePermission> 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<MallRolePermission> 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); | |||
| } | |||
| @@ -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<MallUserInfo> 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); | |||
| @@ -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; | |||
| @@ -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<Map<String, String>> dataList = new ArrayList<Map<String, String>>(); | |||
| for (MultipartFile multipartFile : files) { | |||
| List<Map<String,String>> dataList = new ArrayList<Map<String,String>>(); | |||
| for(MultipartFile multipartFile: files) { | |||
| Map<String, String> 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; | |||
| } | |||
| @@ -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()); | |||
| @@ -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(); | |||
| } | |||
| @@ -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<WxBusiness> busList = wxBusinessService.findListAll(getTenantId(),null); | |||
| final List<WxBusiness> 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)); | |||
| } | |||
| @@ -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, "模板正在导入"); | |||
| } | |||
| @@ -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<String, Object> 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<String, String> 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<String, Object> 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); | |||
| } | |||
| @@ -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()); | |||
| @@ -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<String, Object> 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()); | |||
| @@ -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`; | |||
| @@ -0,0 +1,2 @@ | |||
| ALTER TABLE `wx_order` | |||
| CHANGE COLUMN `real_payment` `total_payment` int(11) NULL COMMENT '总计支付金额'; | |||
| @@ -0,0 +1 @@ | |||
| UPDATE `mall_user_info` SET `invest_rule`=0 WHERE `is_admin`=1 ; | |||
| @@ -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); | |||
| } | |||
| @@ -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); | |||
| @@ -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<Map<String, String>> dataList = new ArrayList<Map<String, String>>(); | |||
| @@ -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")); | |||
| @@ -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<WxCUserBasicInfo> byPhone = wxCUserBasicInfoService.findByPhone(tenantId, phone); | |||
| List<WxCUserBasicInfo> 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()); | |||
| @@ -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<WxCardSpendVo> 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<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||
| return new ResultData(mapList); | |||
| @@ -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); | |||
| @@ -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<WxCouponSendVo> 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 { | |||
| @@ -69,7 +69,7 @@ public class WxCreditHistoryController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; | |||
| } | |||
| try { | |||
| Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantId()); | |||
| Map<String, Integer> 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<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); | |||
| List<WxCUserBasicInfo> 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()); | |||
| @@ -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); | |||
| @@ -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<String, String> 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); | |||
| } | |||
| @@ -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); | |||
| } | |||
| } | |||
| @@ -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()); | |||
| } | |||