diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 2d1cf24df..f8db06064 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.vo.WxCardCVo; import com.iformall.domain.vo.WxCouponOrderCVo; @@ -101,7 +102,9 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (cardCVo == null) cardCVo = new WxCardCVo(); - cardCVo.setOwnerId(getUserId()); + WxCUser user = getUser(); + cardCVo.setTenantId(user.getTenantId()); + cardCVo.setOwnerId(user.getId()); if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { String [] statusAttr = cardCVo.getStatusStr().split(","); List tmpList = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index 701066809..49487dd36 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -1,51 +1,17 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.iformall.domain.po.WxCardSpend; import com.iformall.domain.po.WxCouponOrder; -import javax.persistence.Id; import javax.persistence.Transient; -import java.util.Date; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) public class WxCardCVo extends WxCouponOrder { - /** - * - */ - private static final long serialVersionUID = 6687954932922444531L; - - - @Id - protected Long id; - - @Transient - protected List ids; @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - /* 券类型信息 */ /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") @@ -96,7 +62,6 @@ public class WxCardCVo extends WxCouponOrder { @Transient protected String statusStr; - public List getMerchantVoList() { return merchantVoList; } @@ -195,4 +160,73 @@ public class WxCardCVo extends WxCouponOrder { public void setStatusStr(String statusStr) { this.statusStr = statusStr; } + + public static enum Field { + Id_ASC("co.`id` ASC"), Id_DESC("co.`id` DESC"), + TenantId_ASC("co.`tenant_id` ASC"), TenantId_DESC("co.`tenant_id` DESC"), + CouponId_ASC("co.`coupon_id` ASC"), CouponId_DESC("co.`coupon_id` DESC"), + CouponType_ASC("co.`coupon_type` ASC"), CouponType_DESC("co.`coupon_type` DESC"), + CUserId_ASC("co.`c_user_id` ASC"), CUserId_DESC("co.`c_user_id` DESC"), + OwnerId_ASC("co.`owner_id` ASC"), OwnerId_DESC("co.`owner_id` DESC"), + BUserId_ASC("co.`b_user_id` ASC"), BUserId_DESC("co.`b_user_id` DESC"), + OrderId_ASC("co.`order_id` ASC"), OrderId_DESC("co.`order_id` DESC"), + ExpiredTime_ASC("co.`expired_time` ASC"), ExpiredTime_DESC("co.`expired_time` DESC"), + CouponOrderStatus_ASC("co.`coupon_order_status` ASC"), CouponOrderStatus_DESC("co.`coupon_order_status` DESC"), + CreateDate_ASC("co.`create_date` ASC"), CreateDate_DESC("co.`create_date` DESC"), + UpdateDate_ASC("co.`update_date` ASC"), UpdateDate_DESC("co.`update_date` DESC"), + CouponPrice_ASC("co.`coupon_price` ASC"), CouponPrice_DESC("co.`coupon_price` DESC"); + private String value; + + Field(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setCol(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxCouponOrder.Field... fields) { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + this.sortColumns = sb.toString(); + super.sortColumns = this.sortColumns; + + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxCouponOrder.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); + } else { + this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index fc7f72975..e652cf8ce 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -99,6 +99,6 @@ public interface WxCouponOrderMapper extends CommonMapper { List findExpiredCouponOrderByValidDate(); //// 卡相关接口 - List findCardListOfCUser(WxCouponOrder wxCouponOrder); + List findCardListOfCUser(WxCardCVo wxCardCVo); WxCardCVo findCardDetailOfCUser(@Param("id")Long id); }