diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java new file mode 100644 index 000000000..b6636b055 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java @@ -0,0 +1,134 @@ +package com.iformall.controller.basic; + +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.WxCouponOrder; +import com.iformall.domain.po.WxCreditHistory; +import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.enums.EnumCouponType; +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; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @author gongbiao + */ +@RestController +@RequestMapping("map") +public class WxMapController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxShopService wxShopService; + + @Autowired + private WxMerchantService wxMerchantService; + + @Autowired + private WxRentContractService wxRentContractService; + + @Autowired + private WxCouponOrderService wxCouponOrderService; + + @Autowired + private WxCardSpendService wxCardSpendService; + + @Autowired + private WxBusinessCircleOrderService wxBusinessCircleOrderService; + + @Autowired + private AliBusinessCircleOrderService aliBusinessCircleOrderService; + + @Autowired + private WxCreditHistoryService wxCreditHistoryService; + + + @ApiOperation("根据id查询接口") + @GetMapping("/findShopById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "店铺管理-id查询") + public ResultData findShopById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMapController::findShopById"); + return new ResultData(Result.SUCCESS, "查询成功", wxShopService.detailById(id)); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findMerchantByShop") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "店铺管理-id查询") + public ResultData findMerchantByShop(Long shopId) { + logger.debug("[" + getIpAddr() + "] WxMapController::findMerchantByShop"); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.findMerchantByShop(shopId)); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findRentByShop") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "店铺管理-id查询") + public ResultData findRentByShop(Long shopId) { + logger.debug("[" + getIpAddr() + "] WxMapController::findRentByShop"); + return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.findRentByShop(shopId)); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findStatisticsByShop") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "店铺管理-id查询") + public ResultData findStatisticsByShop(Long shopId, Date startDate, Date endDate) { + logger.debug("[" + getIpAddr() + "] WxMapController::findStatisticsByShop"); + Map resultMap = new HashMap<>(); + Map merchantByShop = wxMerchantService.findMerchantByShop(shopId); + if(merchantByShop != null && merchantByShop.get("id") != null){ + String tenantId = merchantByShop.get("tenantId").toString(); + String parentTenantId = ""; + if(merchantByShop.get("parentTenantId") != null){ + parentTenantId = merchantByShop.get("parentTenantId").toString(); + } + + Long mercherId = Long.parseLong(merchantByShop.get("id").toString()); + wxCouponOrderService.statisticsWriteOff(tenantId,mercherId,startDate,endDate,resultMap); + + WxCardSpendVo wxCardSpend = new WxCardSpendVo(); + wxCardSpend.setTenantId(tenantId); + wxCardSpend.setMerchantId(mercherId); + 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); + 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.setStartTime(startDate); + wxCreditHistory.setEndTime(endDate); + resultMap.put("sumCreditAmount",wxCreditHistoryService.getIncrementCreditAmount(wxCreditHistory)); + } + return new ResultData(Result.SUCCESS, "查询成功", resultMap); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index eef144ad3..27fca7475 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -3,7 +3,9 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.AliBusinessCircleOrder; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @@ -41,4 +43,6 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper { @@ -44,4 +46,6 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper { * POS */ int deleteForPrevCancel(WxCardSpend record); - - + + + Integer sumRealPayment(WxCardSpendVo wxCardSpend); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 00809b3dd..40fe1e9ed 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -92,4 +92,8 @@ public interface WxCouponOrderMapper extends CommonMapper { void cardDefer(@Param("couponId")Long couponId,@Param("tenantId")String tenantId,@Param("expireTime")Date expireTime); //查询待延期的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); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 9505db9b8..3cead89ae 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -57,4 +57,6 @@ public interface WxMerchantMapper extends CommonMapper { List findFollowList(WxMerchant record); int recordedAmount(WxMerchant record); + + Map findMerchantByShop(@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 adb57245e..150e36cf4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -84,4 +84,6 @@ public interface WxRentContractMapper extends CommonMapper Integer getCanApplyCount(@Param("id") Long id); List getMerchantIdsByStatuss(WxRentContract wxRentContract); + + List> findRentByShop(@Param("shopId")Long shopId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index d82af4f82..a34ac973a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -41,5 +41,7 @@ public interface WxShopMapper extends CommonMapper { void updateUnRentByIds(@Param("ids")List shopIds); + Map detailById(@Param("id") Long id); + // List selectBatchByIds(@Param("ids")List ids); } diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index 67e04a387..424cb16fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -8,6 +8,7 @@ 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 { @@ -52,4 +53,6 @@ public interface AliBusinessCircleOrderService { void updatePoints(AliBusinessCircleOrder record); void exportData(AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); + + Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 3136666c0..26617b329 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -7,6 +7,7 @@ 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 WxBusinessCircleOrderService { @@ -55,4 +56,6 @@ public interface WxBusinessCircleOrderService { void updateIsPointsNotify(WxBusinessCircleOrder record); void exportData(WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); + + Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java index 438b9386d..8e4303c9a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardSpendService.java @@ -111,4 +111,6 @@ public interface WxCardSpendService { WxCardSpend cardSpendForPosPrePay(WxCardSpend record) throws MallinkException; WxCardInfo cardSpendForPosPrePayCancel(WxCardInfo cardInfo, WxCardSpend record) throws MallinkException; WxCardSpend cardSpendForPosPay(PromotionCalc scoreCreditCalc, WxCardSpend record, WxMerchant merchant, WxMerchantBUser buUser,Integer payWay) throws MallinkException; + + Integer sumRealPayment(WxCardSpendVo wxCardSpend); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 8921ddbea..255e38cdc 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -217,4 +217,7 @@ public interface WxCouponOrderService { int findCount(WxCouponOrder wxCouponOrder,List tenantEntitys); + void statisticsWriteOff(String tenantId, Long mercherId, Date startDate, Date endDate, Map resultMap); + + Integer findCount(WxCouponOrder wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index 60b3e1cb5..10b0bac25 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -86,4 +86,5 @@ public interface WxCreditHistoryService { PageInfo listAsPageMcrv(WxCreditHistory record, Integer pageIndex, Integer pageSize); + long getIncrementCreditAmount(WxCreditHistory wxCreditHistory); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 1988a4f0c..af71d0071 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; /** @@ -176,4 +177,6 @@ public interface WxMerchantService { ResultData ttdisable(Long id); ResultData ttstartusing(Long id); + + Map findMerchantByShop(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 9cb9495a5..27081b900 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -125,4 +125,5 @@ public interface WxRentContractService { */ boolean hasOtherValidContractShop(WxRentContract wxRentContract); + Map findRentByShop(Long shopId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index e740eb44c..e357fa27c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -79,4 +79,6 @@ public interface WxShopService { * @param response */ void exportNotRentShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response); + + Map detailById(Long id); } 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 34d5bcdb7..74ed8774a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -359,4 +359,10 @@ 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); + 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 46110f135..d1130c668 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -372,5 +372,11 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe excelService.exportExcel(list, null, "微信商圈交易", WxBusinessCircleOrder.class, "微信商圈交易.xlsx", response, false); } + @Override + public Integer sumCirclePayment(String tenantId, Long mercherId, Date startDate, Date endDate) { + Integer sumCirclePayment = wxBusinessCircleOrderMapper.sumCirclePayment(tenantId,mercherId,startDate,endDate); + return sumCirclePayment==null?0:sumCirclePayment; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 44718306c..b768e855c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -954,4 +954,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } return record; } + + @Override + public Integer sumRealPayment(WxCardSpendVo wxCardSpend) { + return wxCardSpendMapper.sumRealPayment(wxCardSpend); + } } 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 d6afe85bc..e5e181093 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1545,4 +1545,17 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return count; } + @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())); + } + + @Override + public Integer findCount(WxCouponOrder wxCouponOrder) { + return wxCouponOrderMapper.findCount(wxCouponOrder); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 48c012249..e6ceedfc5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -156,6 +156,11 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.merchantCreditRanking(record)); } + @Override + public long getIncrementCreditAmount(WxCreditHistory wxCreditHistory) { + return wxCreditHistoryMapper.getIncrementCreditAmount(wxCreditHistory); + } + @Override public PageInfo listAsPage(WxCreditHistory record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findList(record)); 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 85479bb4a..c5302b2f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1140,4 +1140,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { return new ResultData(); } + @Override + public Map findMerchantByShop(Long shopId) { + return wxMerchantMapper.findMerchantByShop(shopId); + } + } 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 2c8c4dc75..7c8373054 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3183,6 +3183,15 @@ public class WxRentContractServiceImpl implements WxRentContractService { return exists; } + @Override + public Map findRentByShop(Long shopId) { + List> rentByShop = wxRentContractMapper.findRentByShop(shopId); + if(rentByShop != null && rentByShop.size() > 0){ + return rentByShop.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 67fa2e0e1..03250fa5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -238,4 +238,9 @@ public class WxShopServiceImpl implements WxShopService { String name = "未出租商铺列表"; excelService.exportExcel(notRentShopVoList, null, name, WxNotRentShopVo.class, name + ".xlsx", response, false); } + + @Override + public Map detailById(Long id) { + return wxShopMapper.detailById(id); + } } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 0c1cb1307..6f8ccc0d9 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -212,4 +212,18 @@ where `id` = #{id} and `tenant_id` = #{tenantId} + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index 03a245b2f..87e5689f0 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -244,4 +244,19 @@ where `id` = #{id} and `tenant_id` = #{tenantId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 29fe3776c..f983ee23c 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -372,12 +372,6 @@ and cs.`card_before_real_amount` = #{cardBeforeRealAmount} - - and cs.`create_date` = #{createDate} - - - and cs.`update_date` = #{updateDate} - and cs.`pay_status` = #{payStatus} @@ -464,5 +458,19 @@ group by cs.owner_id + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index b5929e77f..1fa22076d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -403,6 +403,10 @@ and co.coupon_type = #{couponType} + + and co.send_merchant_id = #{sendMerchantId} + + and co.update_date >= #{startTime} @@ -1462,4 +1466,23 @@ select id from wx_coupon_order where coupon_id = #{couponId} and tenant_id = #{tenantId} and coupon_order_status in (4, 5) + + + \ 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 f1e300a9d..eda0d00f8 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -707,4 +707,20 @@ where id = #{id} + + + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 7d4a2c27e..27281eafa 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -766,7 +766,33 @@ #{statusItem} - + + + + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 8fe0e7da0..66879f2cc 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -659,4 +659,16 @@ #{idItem} + +