增加品牌搜索

zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java

@@ -120,7 +120,7 @@ public class CouponController {
     @GetMapping("/coupons/userFailure/{type}")
     @ApiOperation(value = "用户已失效优惠券",notes = "用户已失效优惠券")
     public ApiResult<List<YxStoreCouponUserQueryVo>> getUserFailureList(){
-        Long uid = LocalUser.getUser().getUid();
+        Long uid = LocalUser.getUidByToken();
         List<YxStoreCouponUserQueryVo> list = storeCouponUserService.getUserCoupon(uid);
         List<YxStoreCouponUserQueryVo> list1 = new ArrayList<>();
         for (YxStoreCouponUserQueryVo couponUser : list) {
@@ -149,7 +149,7 @@ public class CouponController {
                                                                  @RequestParam(value = "limit",defaultValue = "10") int limit,
                                                                  @RequestParam(value = "productId",required = false) Long productId,
                                                                  @RequestParam(value = "type",required = false) Integer type){
-        Long uid = LocalUser.getUser().getUid();
+        Long uid = LocalUser.getUidByToken();
         List<YxStoreCouponIssueQueryVo> list=couponIssueService.getCouponList(page, limit,uid,productId,type);
         List<YxStoreCouponIssueQueryVo> list1 = new ArrayList<>();
         for (YxStoreCouponIssueQueryVo couponIssue : list) {

zsw-bxg/src/main/java/co/yixiang/modules/store/service/dto/YxStoreBrandQueryCriteria.java

@@ -8,6 +8,7 @@
 */
 package co.yixiang.modules.store.service.dto;
 
+import co.yixiang.annotation.Query;
 import lombok.Data;
 
 /**
@@ -16,4 +17,23 @@ import lombok.Data;
 */
 @Data
 public class YxStoreBrandQueryCriteria{
+    // 模糊
+    @Query(type = Query.Type.INNER_LIKE)
+    private String brandName;
+
+//    // 精确
+//    @Query
+//    private Integer isDel;
+//
+//    @Query
+//    private Integer isShow;
+//
+//    @Query
+//    private Integer id;
+//
+//    @Query
+//    private Integer cateId;
+//
+//    @Query
+//    private Integer isIntegral;
 }