xhxu 2 лет назад
Родитель
Сommit
ba389fe8ec
12 измененных файлов: 495 добавлений и 4 удалений
  1. +303
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023062000001_online_wx_coupon_order_reservation.sql
  2. +89
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java
  3. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java
  4. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  5. +21
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java
  6. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderReservationStatus.java
  8. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
  9. +20
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
  10. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  11. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  12. +19
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml

+ 303
- 0
mallinkAdmin/src/main/resources/db/migration/V2023062000001_online_wx_coupon_order_reservation.sql Просмотреть файл

@@ -0,0 +1,303 @@
ALTER TABLE `mallink`.`wx_coupon_order_reservation`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_0`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_1`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_2`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_3`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_4`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_5`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_6`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_7`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_8`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_9`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_10`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_11`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_12`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_13`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_14`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_15`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_16`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_17`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_18`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_19`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_20`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_21`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_22`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_23`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_24`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_25`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_26`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_27`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_28`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_29`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_30`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_31`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_32`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_33`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_34`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_35`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_36`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_37`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_38`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_39`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_40`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_41`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_42`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_43`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_44`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_45`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_46`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_47`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_48`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_49`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_50`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_51`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_52`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_53`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_54`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_55`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_56`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_57`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_58`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_59`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_60`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_61`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_62`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_63`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_64`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_65`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_66`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_67`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_68`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_69`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_70`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_71`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_72`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_73`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_74`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_75`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_76`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_77`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_78`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_79`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_80`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_81`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_82`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_83`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_84`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_85`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_86`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_87`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_88`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_89`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_90`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_91`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_92`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_93`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_94`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_95`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_96`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_97`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_98`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_reservation_99`
ADD COLUMN `reservation_merchant_id` bigint(20) AFTER `user_address`,
ADD COLUMN `reservation_merchant_name` varchar(255) AFTER `reservation_merchant_id`;

+ 89
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java Просмотреть файл

@@ -0,0 +1,89 @@
package com.iformall.controller;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCouponOrderReservation;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.enums.EnumCouponOrderReservationStatus;
import com.iformall.service.WxCouponOrderReservationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/api/wxCouponOrderReservation")
@Api(description = "查询预约接口")
public class WxCouponOrderReservationController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxCouponOrderReservationService wxCouponOrderReservationService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute WxCouponOrderReservation reservation, Integer pageNum, Integer pageSize) {
if (reservation == null) reservation = new WxCouponOrderReservation();
reservation.updateTenantInfo(getTenantInfo());
reservation.setReservationMerchantId(getLoginBUser().getMerchantId());
reservation.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC);
PageInfo<WxCouponOrderReservation> wxCouponOrderReservationPageInfo = wxCouponOrderReservationService.listAsPage(reservation, pageNum, pageSize);
return new ResultData(wxCouponOrderReservationPageInfo);
}

@ApiOperation(value = "详情接口")
@GetMapping("detail")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "预约ID", dataType = "Long", paramType = "query", required = true)
})
public ResultData detail(@RequestParam("id") Long id) {
if(id == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
WxCouponOrderReservation reservation = wxCouponOrderReservationService.getById(id, getTenantInfo().getTenantId());
return new ResultData(reservation);
}

@ApiOperation(value = "修改状态")
@PostMapping("updateStatus")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "预约ID", dataType = "Long", paramType = "query", required = true)
})
public ResultData updateStatus(@RequestBody WxCouponOrderReservation reservation) {
if(reservation.getId() == null || reservation.getStatus() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortById(reservation.getId(), getTenantInfo().getTenantId());
if(sortReservation == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error");
}
if(EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(reservation.getStatus())){
if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(sortReservation.getStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持派单");
}
}
if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){
if(!EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(sortReservation.getStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消");
}
}

WxCouponOrderReservation updReservation = new WxCouponOrderReservation();
updReservation.updateTenantInfo(getTenantInfo());
updReservation.setId(reservation.getId());
updReservation.setStatus(reservation.getStatus());
updReservation.setRemark(reservation.getRemark());
wxCouponOrderReservationService.saveOrUpdate(updReservation);
return new ResultData();
}


}

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.domain.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
@@ -37,6 +38,12 @@ public class WxCouponOrderReservation extends TenantEntity {
private Date startDate;
@io.swagger.annotations.ApiModelProperty(value = "", name = "endDate")
private Date endDate;

@io.swagger.annotations.ApiModelProperty(value = "", name = "reservationMerchantId")
private Long reservationMerchantId;
@io.swagger.annotations.ApiModelProperty(value = "", name = "reservationMerchantName")
private String reservationMerchantName;

@io.swagger.annotations.ApiModelProperty(value = "描述", name = "describeStr")
private String describeStr;
@io.swagger.annotations.ApiModelProperty(value = "描述", name = "describeImg")
@@ -65,6 +72,11 @@ public class WxCouponOrderReservation extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate")
private Date updateDate;

@TableField(exist = false)
private Date serchStartDate;
@TableField(exist = false)
private Date serchEndDate;


public Long getcUserId() {
return cUserId;


+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -379,6 +379,14 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false)
private Long floor;

@io.swagger.annotations.ApiModelProperty(value="省",name="province")
@TableField(exist = false)
private String province;

@io.swagger.annotations.ApiModelProperty(value="市",name="city")
@TableField(exist = false)
private String city;

@io.swagger.annotations.ApiModelProperty(value="地址",name="addr")
@TableField(exist = false)
private String addr;


+ 21
- 2
mallinkService/src/main/java/com/iformall/domain/vo/MerchantPoiTNew.java Просмотреть файл

@@ -19,10 +19,29 @@ public class MerchantPoiTNew implements Serializable {
@Excel(name="富茂商户名称",width = 20,orderNum = "2")
@io.swagger.annotations.ApiModelProperty(value="富茂商户名称",name="merchantName")
private String merchantName;
@Excel(name = "来客门店名称", width = 20, orderNum = "3")
@Excel(name="经度",width = 20,orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="经度",name="longitude")
private BigDecimal longitude;
@Excel(name = "纬度", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude")
private BigDecimal latitude;

@Excel(name = "来客门店名称", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="来客门店名称",name="poiName")
private String poiName;
@Excel(name="来客门店ID",width = 20,orderNum = "4")
@Excel(name="来客门店ID",width = 20,orderNum = "6")
@io.swagger.annotations.ApiModelProperty(value="来客门店ID",name="poiId")
private String poiId;

@Excel(name = "省份", width = 20, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value="已匹配POI省份",name="province")
private String province;

@Excel(name = "城市", width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value="已匹配POI城市",name="city")
private String city;

@Excel(name = "地址", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="已匹配POI地址",name="address")
private String address;
}

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Просмотреть файл

@@ -36,6 +36,10 @@ public class WxMerchantVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="商户业态",name="parameter")
private String parameter;

@io.swagger.annotations.ApiModelProperty(value="省",name="province")
private String province;
@io.swagger.annotations.ApiModelProperty(value="市",name="city")
private String city;
@io.swagger.annotations.ApiModelProperty(value="地址",name="addr")
private String addr;
@io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi")
@@ -138,6 +142,8 @@ public class WxMerchantVo extends TenantEntity {
this.actionDesc = m.getActionDesc();
this.linkLinePhone = m.getLinkLinePhone();
this.topTime = m.getTopTime();
this.province = m.getProvince();
this.city = m.getCity();
this.addr = m.getAddr();
this.supplierExtId = m.getSupplierExtId();
this.ttPoi = m.getTtPoi();


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderReservationStatus.java Просмотреть файл

@@ -13,7 +13,7 @@ public enum EnumCouponOrderReservationStatus {
reservation_user_cancellation(1, "用户取消"),
reservation_expire_cancellation(2, "过期取消"),
reservation_refund_cancellation(3, "退款取消"),
reservation_refuse_cancellation(4, "拒绝服务"),
reservation_refuse_cancellation(4, "工作人员取消"),//拒绝服务
reservation_dispatch(5, "已派单"),
reservation_refuse_dispatch(6, "派单被拒绝"),
reservation_accept_dispatch(7, "派单已接受"),


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java Просмотреть файл

@@ -624,8 +624,13 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
merchantPoi.updateTenantInfo(user);
merchantPoi.setSupplierExtId(poiBase.getMerchantId());
merchantPoi.setMerchantName(poiBase.getMerchantName());
merchantPoi.setLatitude(poiBase.getLatitude());
merchantPoi.setLongitude(poiBase.getLongitude());
merchantPoi.setPoiId(poiBase.getPoiId());
merchantPoi.setPoiName(poiBase.getPoiName());
merchantPoi.setProvince(poiBase.getProvince());
merchantPoi.setCity(poiBase.getCity());
merchantPoi.setAddress(poiBase.getAddress());
merchantPoi.setMatchStatus(EnumSupplierMathStatus.match_success.getCode());
merchantPoi.setSyncStatus(EnumSupplierSyncStatus.sync_success.getCode());
merchantPoi.setLastSyncStatus(EnumSupplierSyncStatus.sync_success.getCode());


+ 20
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java Просмотреть файл

@@ -33,6 +33,12 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva
@Autowired
WxMerchantBUserMapper wxMerchantBUserMapper;

@Autowired
WxCouponMerchantMapper wxCouponMerchantMapper;

@Autowired
WxMerchantMapper wxMerchantMapper;

@Override
public PageInfo<WxCouponOrderReservation> listAsPage(WxCouponOrderReservation record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderReservationMapper.findList(record));
@@ -81,6 +87,20 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva
}
record.setCouponTitle(wxCoupon.getTitle());
}
if(record.getReservationMerchantId() != null){
if(record.getCouponId() == null){
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_EQUAL.getCode(),"商户信息查询异常");
}
List<Long> couponMerchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(record.getCouponId(), record.getTenantId());
if(!couponMerchantIds.contains(record.getReservationMerchantId())){
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_EQUAL.getCode(),"当前商户不匹配");
}
WxMerchant merchant = wxMerchantMapper.selectById(record.getReservationMerchantId());
if(merchant == null){
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
record.setReservationMerchantName(merchant.getName());
}
if(record.getcUserId() != null){
WxCUserBasicInfo basicInfo = wxCUserBasicInfoMapper.selectById(record.getcUserId(), record.getFinalTenantId());
if(basicInfo == null){


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -1525,6 +1525,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (null != m) {
TtMerchantPoi poi = poiMap.get(m.getId());
if(null != poi){
m.setProvince(poi.getProvince());
m.setCity(poi.getCity());
m.setAddr(poi.getAddress());
m.setSupplierExtId(poi.getSupplierExtId());
m.setTtPoi(poi.getPoiId());
@@ -1595,6 +1597,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (hasShop && null != merchantShopVoList) {
vo.setShopVoList(merchantShopVoList.get(vo.getId()));
}
vo.setProvince(m.getProvince());
vo.setCity(m.getCity());
vo.setAddr(m.getAddr());
vo.setSupplierExtId(m.getSupplierExtId());
vo.setTtPoi(m.getTtPoi());
@@ -1909,7 +1913,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (null != m) {
TtMerchantPoi poi = poiMap.get(m.getId());
if(null != poi){
m.setProvince(poi.getProvince());
m.setCity(poi.getCity());
m.setAddr(poi.getAddress());
m.setSupplierExtId(poi.getSupplierExtId());
m.setTtPoi(poi.getPoiId());
m.setLongitude(poi.getLongitude());
m.setLatitude(poi.getLatitude());
@@ -1934,7 +1941,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
vo.setParameter(cm.getParameter());

vo.setId(m.getId());
vo.setProvince(m.getProvince());
vo.setCity(m.getCity());
vo.setAddr(m.getAddr());
vo.setSupplierExtId(m.getSupplierExtId());
vo.setTtPoi(m.getTtPoi());
vo.setLongitude(m.getLongitude());
vo.setLatitude(m.getLatitude());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Просмотреть файл

@@ -180,7 +180,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
}


WxMerchant merchant = wxMerchantService.getById(sharingOrder.getMerchantId());
WxMerchant merchant = wxMerchantService.selectById(sharingOrder.getMerchantId());

Date currentDate = new Date();



+ 19
- 0
mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml Просмотреть файл

@@ -15,6 +15,10 @@
<result column="user_address" jdbcType="VARCHAR" property="userAddress" />
<result column="start_date" jdbcType="TIMESTAMP" property="startDate" />
<result column="end_date" jdbcType="TIMESTAMP" property="endDate" />

<result column="reservation_merchant_id" jdbcType="BIGINT" property="reservationMerchantId" />
<result column="reservation_merchant_name" jdbcType="VARCHAR" property="reservationMerchantName" />

<result column="describe_str" jdbcType="VARCHAR" property="describeStr" />
<result column="describe_img" jdbcType="VARCHAR" property="describeImg" />
<result column="status" jdbcType="INTEGER" property="status" />
@@ -75,6 +79,21 @@
and `user_phone` like concat('%', #{userPhone},'%')
</if>

<if test=" null != reservationMerchantId ">
and `reservation_merchant_id` = #{reservationMerchantId}
</if>

<if test=" null != reservationMerchantName and '' != reservationMerchantName">
and `reservation_merchant_name` like concat('%', #{reservationMerchantName},'%')
</if>

<if test=" null != serchStartDate">
and `start_date` &gt;= #{serchStartDate}
</if>
<if test=" null != serchEndDate">
and `start_date` &lt;= #{serchEndDate}
</if>

<if test=" null != status ">
and `status` = #{status}
</if>


Загрузка…
Отмена
Сохранить