Просмотр исходного кода

[卡密延期][新增]:支持卡密延期

release_toaliyun_real
Stormeye Wu 6 лет назад
committed by Burce
Родитель
Сommit
7db9f9258d
6 измененных файлов: 40 добавлений и 4 удалений
  1. +24
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
  6. +6
    -0
      mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml

+ 24
- 4
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.base.BaseEntity;
@@ -15,10 +16,7 @@ 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.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

/**
* @author gongbiao
@@ -59,5 +57,27 @@ public class WxCouponPasswordController extends BaseController {
return new ResultData(page);
}

@ApiOperation(value = "卡密延期", notes = "{\"couponId\":\"string\", \"expireDate\":\"string\"}")
@PostMapping("/postpone")
@SystemControllerLog(description = "卡密延期")
public ResultData postpone(@RequestBody WxCouponPassword wxCouponPassword) {
logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone");
if (wxCouponPassword.getCouponId() == null) {
logger.error("couponId不能为空: ");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
WxCouponPassword couponPassword = new WxCouponPassword();
couponPassword.updateTenantInfo(getTenantInfo());
couponPassword.setCouponId(wxCouponPassword.getCouponId());
couponPassword.setExpireDate(wxCouponPassword.getExpireDate());
try {
wxCouponPasswordService.postpone(couponPassword);
} catch (Exception e) {
logger.error(e.getMessage());
return new ResultData(ErrorCode.COUPON_PASSWORD_POSTPONE_ERR);
}
return new ResultData();
}


}

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

@@ -237,6 +237,7 @@ public enum ErrorCode{
COUPON_PASSWORD_NOT_FOUND(9501, "兑换码未找到"),
COUPON_PASSWORD_HAD_USED(9502, "兑换码已使用"),
COUPON_PASSWORD_IS_CANCELED(9503, "兑换码已作废"),
COUPON_PASSWORD_POSTPONE_ERR(9504, "卡密延期异常"),

/**
* 微信


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java Просмотреть файл

@@ -21,4 +21,6 @@ public interface WxCouponPasswordMapper extends CommonMapper<WxCouponPassword, L

void updateStatus(List<WxCouponPassword> tempList);

void updatePostpone(WxCouponPassword wxCouponPassword);

}

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

@@ -70,4 +70,6 @@ public interface WxCouponPasswordService {
PageInfo<WxCouponPasswordCountInfoVO> findCouponList(WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize);

List<WxCouponPassword> findList(WxCouponPassword wxCouponPassword);

void postpone(WxCouponPassword wxCouponPassword);
}

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

@@ -167,6 +167,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
return wxCouponPasswordMapper.findList(wxCouponPassword);
}

@Override
public void postpone(WxCouponPassword wxCouponPassword) {

}

/*
public static void main(String[] args) {
WxCouponPasswordServiceImpl ll = new WxCouponPasswordServiceImpl();


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

@@ -159,4 +159,10 @@
</foreach>
</update>

<update id="updatePostpone">
update wx_coupon_password
set expire_date=#{expireDate}
where tenant_id=#{tenantId} and coupon_id=#{couponId} and status=1
</update>

</mapper>

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