|
|
|
@@ -11,6 +11,7 @@ import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
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; |
|
|
|
@@ -19,7 +20,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; |
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@@ -99,6 +102,16 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
} |
|
|
|
if (cardCVo == null) cardCVo = new WxCardCVo(); |
|
|
|
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) |
|
|
|
cardCVo.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); |
|
|
|
else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode()) |
|
|
|
|