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

[储值卡][新增]:c端卡包列表

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
336ec15bdb
3 измененных файлов: 44 добавлений и 0 удалений
  1. +13
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +22
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java
  3. +9
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 13
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;


import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;


@RestController @RestController
@@ -99,6 +102,16 @@ public class WxCouponOrderController extends BaseController {
} }
if (cardCVo == null) cardCVo = new WxCardCVo(); if (cardCVo == null) cardCVo = new WxCardCVo();
cardCVo.setOwnerId(getUserId()); cardCVo.setOwnerId(getUserId());
if(StringUtils.isNotBlank(cardCVo.getStatusStr())) {
String [] statusAttr = cardCVo.getStatusStr().split(",");
List<Integer> tmpList = new ArrayList<Integer>();
for(String status: statusAttr) {
tmpList.add(Integer.valueOf(status));
}
if(!tmpList.isEmpty()) {
cardCVo.setStatusS(tmpList);
}
}
if (cardCVo.getCouponOrderStatus() == null) if (cardCVo.getCouponOrderStatus() == null)
cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);
else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode()) else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode())


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

@@ -90,6 +90,12 @@ public class WxCardCVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value="卡消费列表",name="cardSpendList") @io.swagger.annotations.ApiModelProperty(value="卡消费列表",name="cardSpendList")
private List<WxCardSpendVo> cardSpendList; private List<WxCardSpendVo> cardSpendList;


@Transient
protected List<Integer> statusS;

@Transient
protected String statusStr;



public List<WxMerchantVo> getMerchantVoList() { public List<WxMerchantVo> getMerchantVoList() {
return merchantVoList; return merchantVoList;
@@ -173,4 +179,20 @@ public class WxCardCVo extends WxCouponOrder {
public void setCardSpendList(List<WxCardSpendVo> cardSpendList) { public void setCardSpendList(List<WxCardSpendVo> cardSpendList) {
this.cardSpendList = cardSpendList; this.cardSpendList = cardSpendList;
} }

public List<Integer> getStatusS() {
return statusS;
}

public void setStatusS(List<Integer> statusS) {
this.statusS = statusS;
}

public String getStatusStr() {
return statusStr;
}

public void setStatusStr(String statusStr) {
this.statusStr = statusStr;
}
} }

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

@@ -696,6 +696,15 @@
<if test="couponOrderStatus != null"> <if test="couponOrderStatus != null">
and co.coupon_order_status = #{couponOrderStatus} and co.coupon_order_status = #{couponOrderStatus}
</if> </if>
<if test="status != null">
and co.status = #{status}
</if>
<if test=" null != statusS ">
and `status` in in
<foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")">
#{sItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if> <if test=" null != sortColumns"> order by ${sortColumns} </if>
</select> </select>




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