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

根据商户过滤

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
ad14aa009f
3 измененных файлов: 8 добавлений и 4 удалений
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -57,7 +57,8 @@ public class WxMerchantController extends BaseController {
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
@SystemControllerLog(description = "商户-列表")
public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::list");


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

@@ -62,12 +62,12 @@ public class WxCouponSendController extends BaseController {
}

@ApiOperation("商户注券")
@GetMapping("/handsel")
@GetMapping("/handSel")
@ApiImplicitParams({
@ApiImplicitParam(name = "wxCouponSendId", value = "wxCouponSendId", dataType = "long", paramType = "query",required = true),
@ApiImplicitParam(name = "cUserId", value = "用户ID", dataType = "long", paramType = "query",required = true),
})
public ResultData handsel(Long[] wxCouponSendIds,Long cUserId) {
public ResultData handSel(Long[] wxCouponSendIds,Long cUserId) {
if(ArrayUtils.isEmpty(wxCouponSendIds)||Objects.isNull(cUserId)) {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL);
}


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

@@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import com.iformall.domain.vo.WxShopVo;
import com.iformall.enums.EnumBusiness;
import com.iformall.enums.EnumSubBusiness;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -25,7 +27,8 @@ import java.util.stream.Collectors;
public class WxMerchant extends BaseEntity {
@Id
protected Long id;

@ApiModelProperty(name = "ids", value = "商户ID数组")
@Transient
protected List<Long> ids;



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