fix 个人优惠卷列表展示

netflix-dao/src/main/java/com/cyksj/model/views/CouponUserView.java

@@ -5,6 +5,7 @@ import com.cyksj.model.entity.CouponUser;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -136,6 +137,14 @@ public class CouponUserView {
 	@DbField("ca.expiry_status")
 	private Boolean expiryStatus;
 
+	@DbField("case when cu.status = 'unused' then 0" +
+			" when cu.status = 'expired' then 1" +
+			" when cu.status = 'invalid' then 2" +
+			" when cu.status = 'used' then 3" +
+			" end")
+	@JsonIgnore
+	private Integer orderBy;
+
 	/**
 	 * 0不可用/1可用
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuView.java

@@ -32,6 +32,6 @@ public class GoodsDonSkuView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
-	@DbField("gdk.money")
+	@DbField("gdk.price")
 	private BigDecimal money;
 }

netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -211,10 +211,12 @@ public class CouponFontServiceImpl implements CouponFontService {
 		}
 		if (isFlag) {
 			TASK_EXECUTOR.execute(() -> {
-				CouponUser couponUser = new CouponUser();
-				couponUser.setId(data.getId());
-				couponUser.setStatus(data.getCouponUserStatus());
-				couponUserMapper.updateById(couponUser);
+				if (data.getCouponUserStatus() != CouponUser.Status.notEffective) {
+					CouponUser couponUser = new CouponUser();
+					couponUser.setId(data.getId());
+					couponUser.setStatus(data.getCouponUserStatus());
+					couponUserMapper.updateById(couponUser);
+				}
 			});
 		}
 	}

netflix-web/src/main/java/com/cyksj/web/controller/coupon/CouponFrontController.java

@@ -73,7 +73,7 @@ public class CouponFrontController {
 		SearchResult<CouponUserView> search = beanSearcher.search(CouponUserView.class,
 				MapUtils.flatBuilder(request.getParameterMap())
 						.field(CouponUserView::getUserId, userId)
-						.orderBy(CouponUserView::getId).desc()
+						.orderBy(CouponUserView::getOrderBy).asc()
 						.build());
 		couponFontService.handleCouponStatus(search);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);