diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java new file mode 100644 index 000000000..ec491e566 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contractv2/WxRentContractv2Controller.java @@ -0,0 +1,59 @@ +package com.iformall.controller.contractv2; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxRentContract; +import com.iformall.enums.EnumContractType; +import com.iformall.service.WxMerchantService; +import com.iformall.service.WxRentPropertyContractService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author: furunxin + * @Date: 2020/8/5 10:13 + * @Description: + */ + +@Slf4j +@RestController +@RequestMapping("wxRentContract_V2") +@Api(description = "租赁合同V2版本") +public class WxRentContractv2Controller extends BaseController { + + @Autowired + private WxMerchantService wxMerchantService; + + + @Autowired + private WxRentPropertyContractService wxRentPropertyContractService; + + @GetMapping("getMerchantList") + @SystemControllerLog(description = "获取商户列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)}) + public ResultData getMerchantList(Integer shopType) throws Exception{ + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setRentShopType(shopType); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant)); + } + + + @PostMapping("add") + @SystemControllerLog(description = "租赁合同-添加") + public ResultData add(@RequestBody WxRentContract wxRentContract) { + log.debug("[" + getIpAddr() + "] WxRentContractv2Controller::add"); + //查询合同类型 + Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); + wxRentContract.setContractType(contractType); + return null; + } +} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index fdcce57ea..a7811670d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -111,14 +111,18 @@ public class WxUserStructureController extends BaseController { public ResultData findUserLevelStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.updateTenantInfo(getTenantInfo()); + if(StringUtils.isNotBlank(getTenantInfo().getParentTenantId())){ + wxLevelConfig.setTenantId(getTenantInfo().getParentTenantId()); + }else{ + wxLevelConfig.setTenantId(getTenantInfo().getTenantId()); + } wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigService.findList(wxLevelConfig); for( int i = 0; i < levelList.size(); i++) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(getTenantInfo()); + dto.updateFinalTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); if (i + 1 < levelList.size()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index b0207201d..56a25fdc0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -4,6 +4,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +47,11 @@ 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.updateTenantInfo(getTenantInfo()); + if(StringUtils.isNotBlank(getTenantInfo().getParentTenantId())){ + wxLevelConfig.setTenantId(getTenantInfo().getParentTenantId()); + }else{ + wxLevelConfig.setTenantId(getTenantInfo().getTenantId()); + } wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); return new ResultData(page); @@ -57,6 +63,9 @@ public class WxLevelConfigController extends BaseController { public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); } catch (Exception e) { logger.error(e.getMessage()); @@ -71,6 +80,9 @@ public class WxLevelConfigController extends BaseController { public ResultData updateCapabilities(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); } catch (Exception e) { logger.error(e.getMessage()); @@ -84,6 +96,9 @@ public class WxLevelConfigController extends BaseController { @SystemControllerLog(description = "会员等级权益-删除") public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } wxLevelConfigService.deleteById(wxLevelConfig.getId()); return new ResultData(Result.SUCCESS, "删除成功", null); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 69ced7cb0..ac3c2bb36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -75,7 +75,9 @@ public class WxCarController extends BaseController { private WxPark getCurrentPark(TenantEntity tenantEntity) { WxPark parkQ = new WxPark(); - parkQ.updateTenantInfo(tenantEntity); + //parkQ.updateTenantInfo(tenantEntity); + parkQ.setTenantId("789"); + parkQ.setParentTenantId("788"); WxPark wxPark = wxParkService.getByObj(parkQ); // 1, get mall's park // future use redis to optimize diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 3840d552e..2ddf0e2a8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -40,4 +40,12 @@ public class TenantEntity extends BaseEntity { setTenantId(info.getTenantId()); } } + + public void updateFinalTenantInfo(BaseTenantEntity info){ + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); + }else{ + setTenantId(info.getTenantId()); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 9abd85f68..b93f079e1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -36,4 +36,6 @@ public interface WxMerchantMapper extends CommonMapper { WxMerchant findByTrade(HashMap params); List findListVo2(WxMerchant record); + + List getMerchantList(WxMerchant wxMerchant); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index e412c227f..a26410c9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -147,4 +147,6 @@ public interface WxMerchantService { PageInfo listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); + List getMerchantList(WxMerchant wxMerchant); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index a23afaf93..9b5130b0e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2168,7 +2168,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < levelList.size(); i++) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(tenantEntity); + dto.updateFinalTenantInfo(tenantEntity); dto.setStartTime(DateUtils.stringToDate(startdate)); dto.setEndTime(DateUtils.stringToDate(enddate)); if (i + 1 < levelList.size()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 76c92bc72..7abc8d2e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -27,8 +27,11 @@ import java.util.List; @Service public class WxLevelConfigServiceImpl implements WxLevelConfigService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount"; + @Autowired WxLevelConfigMapper wxLevelConfigMapper; @@ -56,7 +59,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { l.setScale(WxLevelConfig.DEFAULT_SCALE); } WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(record); + dto.updateFinalTenantInfo(record); dto.setLevelStartScore(l.getPoints()); if (i + 1 merchantList = wxMerchantMapper.selectList(new QueryWrapper(wxMerchant)); - if (merchantList.size() == 1) + if (merchantList.size() == 1){ return Optional.of(merchantList.get(0)); + } return Optional.empty(); } @@ -803,4 +804,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; } + + @Override + public List getMerchantList(WxMerchant wxMerchant) { + return wxMerchantMapper.getMerchantList(wxMerchant); + } } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 24e6c2703..d4ad86213 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -310,6 +310,11 @@ cal.channel_type as send_channel_type --> + + o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, + c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date + +