diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java index 117b7ae13..c8b06474d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java @@ -4,14 +4,14 @@ 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.BusinessCircleBase; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCardSpendVo; -import com.iformall.enums.EnumCouponType; +import com.iformall.enums.EnumShopStatus; import com.iformall.service.*; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author gongbiao + * @author */ @RestController @RequestMapping("map") @@ -53,6 +53,82 @@ public class WxMapController extends BaseController { @Autowired private WxCreditHistoryService wxCreditHistoryService; + @ApiOperation("根据id查询接口") + @GetMapping("/findShopBySid") + @ApiImplicitParam(name = "sid", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "店铺管理-id查询") + public ResultData findShopBySid(String sid) { + logger.debug("[" + getIpAddr() + "] WxMapController::findShopBySid"); + Map resultObject = new HashMap<>(); + Map wxShopObject = wxShopService.detailBySid(getTenantInfo(), sid); + Map wxMerchantObject = new HashMap<>(); + Map wxRentContractObject = new HashMap<>(); + if(wxShopObject != null && !wxShopObject.isEmpty() + && EnumShopStatus.RENT.getCode().equals(wxShopObject.get("status").toString())){ + //已出租 + long shopId = Long.parseLong(wxShopObject.get("id").toString()); + wxMerchantObject = wxMerchantService.detailByShopId(getTenantInfo(), shopId); + if(wxMerchantObject != null && !wxMerchantObject.isEmpty()){ + long merchantId = Long.parseLong(wxMerchantObject.get("id").toString()); + wxRentContractObject = wxRentContractService.currentValidByMerchantId(getTenantInfo(),merchantId); + } + } + resultObject.put("wxShop",wxShopObject); + resultObject.put("wxMerchant",wxMerchantObject); + resultObject.put("wxRentContract",wxRentContractObject); + return new ResultData(Result.SUCCESS, "查询成功", resultObject); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findStatisticsBySid") + @ApiImplicitParam(name = "sid", value = "sid", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "店铺管理-id查询") + public ResultData findStatisticsBySid(String sid, Date startDate, Date endDate) { + logger.debug("[" + getIpAddr() + "] WxMapController::findStatisticsBySid"); + Map resultMap = new HashMap<>(); + Map wxShopObject = wxShopService.detailBySid(getTenantInfo(), sid); + if(wxShopObject != null && !wxShopObject.isEmpty() + && EnumShopStatus.RENT.getCode().equals(wxShopObject.get("status").toString())){ + //已出租 + long shopId = Long.parseLong(wxShopObject.get("id").toString()); + Map wxMerchantObject = wxMerchantService.detailByShopId(getTenantInfo(), shopId); + if(wxMerchantObject != null && !wxMerchantObject.isEmpty()){ + long merchantId = Long.parseLong(wxMerchantObject.get("id").toString()); + WxCouponOrder wxCouponOrder = new WxCouponOrder(); + wxCouponOrder.updateTenantInfo(getTenantInfo()); + wxCouponOrder.setMerchantId(merchantId); + wxCouponOrder.setStartTime(startDate); + wxCouponOrder.setEndTime(endDate); + wxCouponOrderService.statisticsWriteOff(wxCouponOrder,resultMap); + + WxCardSpendVo wxCardSpend = new WxCardSpendVo(); + wxCardSpend.updateTenantInfo(getTenantInfo()); + wxCardSpend.setMerchantId(merchantId); + wxCardSpend.setStartdate(startDate); + wxCardSpend.setEnddate(endDate); + resultMap.put("sumRealPayment",wxCardSpendService.sumRealPayment(wxCardSpend)); + + BusinessCircleBase businessCircle = new BusinessCircleBase(); + businessCircle.updateTenantInfo(getTenantInfo()); + businessCircle.setMerchantId(merchantId); + businessCircle.setStartTime(startDate); + businessCircle.setEndTime(endDate); + Integer wxCircleSumPayment = wxBusinessCircleOrderService.sumCirclePayment(businessCircle); + Integer aliCircleSumPayment = aliBusinessCircleOrderService.sumCirclePayment(businessCircle); + resultMap.put("sumCirclePayment",wxCircleSumPayment + aliCircleSumPayment); + + WxCreditHistory wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxCreditHistory.setMerchantId(merchantId); + wxCreditHistory.setStartTime(startDate); + wxCreditHistory.setEndTime(endDate); + resultMap.put("sumCreditAmount",wxCreditHistoryService.getIncrementCreditAmount(wxCreditHistory)); + } + } + + return new ResultData(Result.SUCCESS, "查询成功", resultMap); + } + @ApiOperation("根据id查询接口") @GetMapping("/findShopById") @@ -96,34 +172,33 @@ public class WxMapController extends BaseController { parentTenantId = merchantByShop.get("parent_tenant_id").toString(); } - Long mercherId = Long.parseLong(merchantByShop.get("id").toString()); - wxCouponOrderService.statisticsWriteOff(tenantId,mercherId,startDate,endDate,resultMap); + Long merchantId = Long.parseLong(merchantByShop.get("id").toString()); + WxCouponOrder wxCouponOrder = new WxCouponOrder(); + wxCouponOrder.updateTenantInfo(getTenantInfo()); + wxCouponOrder.setMerchantId(merchantId); + wxCouponOrder.setStartTime(startDate); + wxCouponOrder.setEndTime(endDate); + wxCouponOrderService.statisticsWriteOff(wxCouponOrder,resultMap); WxCardSpendVo wxCardSpend = new WxCardSpendVo(); - wxCardSpend.setTenantId(tenantId); - wxCardSpend.setMerchantId(mercherId); + wxCardSpend.updateTenantInfo(getTenantInfo()); + wxCardSpend.setMerchantId(merchantId); wxCardSpend.setStartdate(startDate); wxCardSpend.setEnddate(endDate); resultMap.put("sumRealPayment",wxCardSpendService.sumRealPayment(wxCardSpend)); - Integer wxCircleSumPayment = wxBusinessCircleOrderService.sumCirclePayment(tenantId,mercherId,startDate,endDate); - Integer aliCircleSumPayment = aliBusinessCircleOrderService.sumCirclePayment(tenantId,mercherId,startDate,endDate); + BusinessCircleBase businessCircle = new BusinessCircleBase(); + businessCircle.updateTenantInfo(getTenantInfo()); + businessCircle.setMerchantId(merchantId); + businessCircle.setStartTime(startDate); + businessCircle.setEndTime(endDate); + Integer wxCircleSumPayment = wxBusinessCircleOrderService.sumCirclePayment(businessCircle); + Integer aliCircleSumPayment = aliBusinessCircleOrderService.sumCirclePayment(businessCircle); resultMap.put("sumCirclePayment",wxCircleSumPayment + aliCircleSumPayment); - WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); - wxCouponOrder.setSendMerchantId(mercherId); - wxCouponOrder.setStartTime(startDate); - wxCouponOrder.setEndTime(endDate); - wxCouponOrder.setCouponType(EnumCouponType.COUPON_TINGCHE.getCode()); - resultMap.put("countTingche",wxCouponOrderService.findCount(wxCouponOrder)); - WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(tenantId); - if(StringUtils.isNotBlank(parentTenantId)){ - wxCreditHistory.setTenantId(parentTenantId); - } - wxCreditHistory.setMerchantId(mercherId); + wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); + wxCreditHistory.setMerchantId(merchantId); wxCreditHistory.setStartTime(startDate); wxCreditHistory.setEndTime(endDate); resultMap.put("sumCreditAmount",wxCreditHistoryService.getIncrementCreditAmount(wxCreditHistory)); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 89b2b434e..297caf9f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -125,6 +125,23 @@ public class WxShopController extends BaseController { return wxShopService.hasShopNumber(wxShop); } + @ApiOperation("查询商铺地图sid是否存在") + @GetMapping("hasShopSid") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true), + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "type", value = "type", dataType = "Integer", paramType = "query", required = true)}) + @SystemControllerLog(description = "店铺管理-查询商铺号是否存在") + public ResultData hasShopSid(String shopSid, Long id) { + logger.debug("[" + getIpAddr() + "] WxShopController::hasShopSid"); + WxShop wxShop = new WxShop(); + wxShop.setSid(shopSid); + + wxShop.setId(id); + wxShop.updateTenantInfo(getTenantInfo()); + return wxShopService.hasShopSid(wxShop); + } + @ApiOperation("分页列表接品-合同访问") @GetMapping("listShopFromContract") diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108190005__add_wx_shop__sid.sql b/mallinkAdmin/src/main/resources/db/migration/V202108190005__add_wx_shop__sid.sql new file mode 100644 index 000000000..a55a8390f --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202108190005__add_wx_shop__sid.sql @@ -0,0 +1,3 @@ +ALTER TABLE `mallink`.`wx_shop` +ADD COLUMN `sid` varchar(50) COMMENT '店铺对应的sid' AFTER `y`, +ADD INDEX `sid_del`(`sid`, `is_del`) USING BTREE; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 3219d9c08..11c4a44ce 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -79,6 +79,9 @@ public class WxCouponOrder extends TenantEntity { @TableField(exist = false) private Integer subBusinessId; + @TableField(exist = false) + private Long merchantId; + @TableField(exist = false) private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index ad70c006d..4a1b7635f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -76,6 +76,9 @@ public class WxShop extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="店铺相对位置y",name="y") private BigDecimal y; + @io.swagger.annotations.ApiModelProperty(value="店铺对应地图的sid",name="sid") + private String sid; + @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") private String addr; diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index 421523f34..e956a49c1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.AliBusinessCircleOrder; +import com.iformall.domain.po.BusinessCircleBase; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -43,6 +44,5 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper { //查询待延期的idList List cardDeferCouponOrderId(@Param("couponId")Long couponId,@Param("tenantId")String tenantId); - Integer findWriteOffCount(@Param("tenantId")String tenantId, @Param("mercherId")Long mercherId, - @Param("startDate")Date startDate, @Param("endDate")Date endDate, - @Param("couponType")Integer couponType); + Integer findWriteOffCount(WxCouponOrder wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index d9bcdd2a2..09d66f79c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.dto.WxMerchantDto; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantTradeDetailVo; import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantVo; @@ -59,4 +60,6 @@ public interface WxMerchantMapper extends CommonMapper { int recordedAmount(WxMerchant record); List> findMerchantByShop(@Param("shopId")Long shopId); + + List> detailByShopId(@Param("tenantInfo")TenantEntity tenantInfo,@Param("shopId") Long shopId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 150e36cf4..7c67f7b0d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -85,5 +85,8 @@ public interface WxRentContractMapper extends CommonMapper List getMerchantIdsByStatuss(WxRentContract wxRentContract); + @Deprecated List> findRentByShop(@Param("shopId")Long shopId); + + List> currentValidByMerchantId(WxRentContract rentContract); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 3858409bb..a99b1fcd0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -30,6 +30,7 @@ public interface WxShopMapper extends CommonMapper { List> listShopFromContract(WxShop wxShop); int hasShopNumber(WxShop wxShop); + int hasShopSid(WxShop wxShop); List findListWithMerchantMap(WxShop record); @@ -44,4 +45,7 @@ public interface WxShopMapper extends CommonMapper { Map detailById(@Param("id") Long id); List selectBatchByIds(@Param("ids")List ids); + + List> detailBySid(WxShop wxShop); + } diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index 424cb16fd..63d00a15c 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -3,12 +3,12 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.AliBusinessCircleOrder; +import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; public interface AliBusinessCircleOrderService { @@ -54,5 +54,5 @@ public interface AliBusinessCircleOrderService { void exportData(AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); - Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate); + Integer sumCirclePayment(BusinessCircleBase circleOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 26617b329..25bac161f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.TenantEntity; @@ -57,5 +58,5 @@ public interface WxBusinessCircleOrderService { void exportData(WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); - Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate); + Integer sumCirclePayment(BusinessCircleBase circleOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 255e38cdc..9522aa58a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -217,7 +217,7 @@ public interface WxCouponOrderService { int findCount(WxCouponOrder wxCouponOrder,List tenantEntitys); - void statisticsWriteOff(String tenantId, Long mercherId, Date startDate, Date endDate, Map resultMap); + void statisticsWriteOff(WxCouponOrder wxCouponOrder, Map resultMap); Integer findCount(WxCouponOrder wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index af71d0071..b9caa1843 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -178,5 +178,8 @@ public interface WxMerchantService { ResultData ttstartusing(Long id); + @Deprecated Map findMerchantByShop(Long shopId); + + Map detailByShopId(TenantEntity tenantInfo, Long shopId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 27081b900..90b739f54 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -125,5 +125,8 @@ public interface WxRentContractService { */ boolean hasOtherValidContractShop(WxRentContract wxRentContract); + @Deprecated Map findRentByShop(Long shopId); + + Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index e357fa27c..a8492528b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -61,6 +61,7 @@ public interface WxShopService { ResultData getMerchantShopByShopId(TenantEntity tenantEntity, String shopId); ResultData hasShopNumber(WxShop wxShop); + ResultData hasShopSid(WxShop wxShop); PageInfo> listShopFromContract(WxShop wxShop, Integer pageNum, Integer pageSize); @@ -80,5 +81,9 @@ public interface WxShopService { */ void exportNotRentShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response); + @Deprecated Map detailById(Long id); + + Map detailBySid(TenantEntity tenantInfo, String sid); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 74ed8774a..8e18be496 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -360,8 +360,8 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } @Override - public Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate) { - Integer sumCirclePayment = aliBusinessCircleOrderMapper.sumCirclePayment(tenantId,mercherId,startDate,endDate); + public Integer sumCirclePayment(BusinessCircleBase circleOrder) { + Integer sumCirclePayment = aliBusinessCircleOrderMapper.sumCirclePayment(circleOrder); return sumCirclePayment==null?0:sumCirclePayment; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index d1130c668..4cb47959e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -373,8 +373,8 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe } @Override - public Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate) { - Integer sumCirclePayment = wxBusinessCircleOrderMapper.sumCirclePayment(tenantId,mercherId,startDate,endDate); + public Integer sumCirclePayment(BusinessCircleBase circleOrder) { + Integer sumCirclePayment = wxBusinessCircleOrderMapper.sumCirclePayment(circleOrder); return sumCirclePayment==null?0:sumCirclePayment; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index e5e181093..a9d34e102 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1546,11 +1546,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public void statisticsWriteOff(String tenantId, Long mercherId, Date startDate, Date endDate, Map resultMap) { - - resultMap.put("couponWriteOff",wxCouponOrderMapper.findWriteOffCount(tenantId, mercherId, startDate, endDate, null)); - resultMap.put("groupWriteOff",wxCouponOrderMapper.findWriteOffCount(tenantId, mercherId, startDate, endDate, EnumCouponType.COUPON_GROUP.getCode())); - resultMap.put("pressWriteOff",wxCouponOrderMapper.findWriteOffCount(tenantId, mercherId, startDate, endDate, EnumCouponType.COUPON_PRESS.getCode())); + public void statisticsWriteOff(WxCouponOrder wxCouponOrder, Map resultMap) { + wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); + resultMap.put("couponWriteOff",wxCouponOrderMapper.findWriteOffCount(wxCouponOrder)); + wxCouponOrder.setCouponType(EnumCouponType.COUPON_GROUP.getCode()); + resultMap.put("groupWriteOff",wxCouponOrderMapper.findWriteOffCount(wxCouponOrder)); + wxCouponOrder.setCouponType(EnumCouponType.COUPON_PRESS.getCode()); + resultMap.put("pressWriteOff",wxCouponOrderMapper.findWriteOffCount(wxCouponOrder)); + wxCouponOrder.setCouponType(EnumCouponType.COUPON_TINGCHE.getCode()); + wxCouponOrder.setSendMerchantId(wxCouponOrder.getMerchantId()); + wxCouponOrder.setMerchantId(null); + wxCouponOrder.setCouponOrderStatus(null); + resultMap.put("countTingche",wxCouponOrderMapper.findWriteOffCount(wxCouponOrder)); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 399836565..2e5a068a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1149,4 +1149,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { return null; } + @Override + public Map detailByShopId(TenantEntity tenantInfo, Long shopId) { + List> merchants = wxMerchantMapper.detailByShopId(tenantInfo,shopId); + if(merchants != null && merchants.size() > 0){ + return merchants.get(0); + } + return null; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 683177a22..5497f0dbd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3175,6 +3175,22 @@ public class WxRentContractServiceImpl implements WxRentContractService { return null; } + @Override + public Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId) { + WxRentContract rentContract = new WxRentContract(); + rentContract.updateTenantInfo(tenantInfo); + rentContract.setMerchantId(merchantId); + List statuss = new ArrayList<>(); + statuss.add(EnumRentContractStatus.READY_FOR_PAING.getCode()); + statuss.add(EnumRentContractStatus.PAING.getCode()); + rentContract.setStatuss(statuss); + List> rentContracts = wxRentContractMapper.currentValidByMerchantId(rentContract); + if(rentContracts != null && rentContracts.size() > 0){ + return rentContracts.get(0); + } + return null; + } + public static void main(String[] args) { String s = "{\"siteMoney\":\"2\",\"facilityMoney\":\"3\",\"administratorMoney\":\"4\"}"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 872e1a56d..e4f21908f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -200,6 +200,12 @@ public class WxShopServiceImpl implements WxShopService { return new ResultData(ResultData.SUCCESS, "查询成功", count > 0 ? true : false); } + @Override + public ResultData hasShopSid(WxShop wxShop) { + int count = wxShopMapper.hasShopSid(wxShop); + return new ResultData(ResultData.SUCCESS, "查询成功", count > 0 ? true : false); + } + @Override public PageInfo> listShopFromContract(WxShop wxShop, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); @@ -242,4 +248,16 @@ public class WxShopServiceImpl implements WxShopService { public Map detailById(Long id) { return wxShopMapper.detailById(id); } + + @Override + public Map detailBySid(TenantEntity tenantInfo, String sid) { + WxShop wxShop = new WxShop(); + wxShop.updateTenantInfo(tenantInfo); + wxShop.setSid(sid); + List> shops = wxShopMapper.detailBySid(wxShop); + if(shops != null && shops.size() > 0){ + return shops.get(0); + } + return null; + } } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 6f8ccc0d9..e5755c273 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -212,17 +212,25 @@ where `id` = #{id} and `tenant_id` = #{tenantId} - select IFNULL(SUM(`pay_amount`),0) as sum_pay_amount from ali_business_circle_order - where `tenant_id` = #{tenantId} - and `merchant_id` = #{merchantId} - - AND `time_end` >= #{startDate} + where 1=1 + + and `tenant_id` = #{tenantId} - - AND `time_end` <= #{endDate} + + and `parent_tenant_id` = #{parentTenantId} + + + and `merchant_id` = #{merchantId} + + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 87e5689f0..3b417b09c 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -245,17 +245,25 @@ - select IFNULL(SUM(`pay_amount`),0) as sum_pay_amount from wx_business_circle_order - where `tenant_id` = #{tenantId} - and `merchant_id` = #{merchantId} - - AND `time_end` >= #{startDate} + where 1=1 + + and `tenant_id` = #{tenantId} - - AND `time_end` <= #{endDate} + + and `parent_tenant_id` = #{parentTenantId} + + + and `merchant_id` = #{merchantId} + + + and `time_end` >= #{startTime} + + + and `time_end` < #{endTime} diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 1fa22076d..7f88105b1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -1467,22 +1467,37 @@ - select count(co.id) from wx_coupon_order co left join wx_merchant_b_user mbu on co.b_user_id = mbu.id - where co.tenant_id = #{tenantId} and co.coupon_order_status = 1 - and mbu.merchant_id = #{mercherId} - - AND co.update_date >= #{startDate} + where where 1 = 1 + + + and co.`tenant_id` = #{tenantId} - - AND co.update_date <= #{endDate} + + and co.`parent_tenant_id` = #{parentTenantId} + + + and mbu.`merchant_id` = #{merchantId} - and co.`coupon_type` = #{couponType} + + and co.`coupon_order_status` = #{couponOrderStatus} + + + and co.`send_merchant_id` = #{sendMerchantId} + + + AND co.update_date >= #{startTime} + + + AND co.update_date <= #{endTime} + + \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index eda0d00f8..c5c7d94c0 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -723,4 +723,27 @@ where s.`id` = #{shopId} + + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index c451f56a8..49397fdc3 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -793,6 +793,39 @@ and rc.`rental_start_date` <= now() and rc.rental_end_date >= now() order by rc.`updatetime` desc; + + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 4eb54eb09..8cb2f3b55 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -15,6 +15,7 @@ + @@ -36,7 +37,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`, + `id`,`tenant_id`,`parent_tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`sid`,`addr`, `baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date`,`img_url`,`manager`,`manager_phone`, `type`,`point_type`,`comments`,`is_del`,DATEDIFF(now(),create_date) freeDay,rent,rent_unit,business_id @@ -87,6 +88,10 @@ and `y` = #{y} + + and `sid` = #{sid} + + and `addr` like concat('%', #{addr},'%') @@ -143,7 +148,7 @@ + + @@ -674,4 +702,26 @@ left join wx_business bu on s.business_id = bu.id where s.`id` = #{id} + + +