fix

netflix-common/src/main/java/com/cyksj/common/util/SmsUtil.java

@@ -0,0 +1,34 @@
+package com.cyksj.common.util;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.http.Method;
+import cn.hutool.json.JSONObject;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author chan
+ * @date 2022/10/13 11:29 AM
+ */
+public class SmsUtil {
+
+    private static final String URL =  "http://sms-api.luosimao.com/v1/send.json";
+
+    private static final String PASSWORD = "key-1bf2a2f243e18be640b2428ddf03ded9";
+
+    public static void main(String[] args) {
+        send("15720916464","尊敬的用户，您的验证码为123456，此验证码仅用于银河录像。【银河录像局】");
+    }
+
+    public static void send(String mobile, String msg){
+        HttpRequest request = new HttpRequest(URL);
+        request.setMethod(Method.POST);
+        request.basicAuth("api",PASSWORD);
+        request.form("mobile",mobile);
+        request.form("message",msg);
+        HttpResponse execute = request.execute();
+        System.out.println(execute.body());
+    }
+}

netflix-dao/src/main/java/com/cyksj/model/entity/Account.java

@@ -3,6 +3,7 @@ package com.cyksj.model.entity;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -19,14 +20,14 @@ public class Account extends BaseEntity {
 
     private String password;
 
-    private Long platformId;
-
-    private String platform;
+    private Long goodsId;
 
     private Date startTime;
 
     private Date expiryTime;
 
+    private BigDecimal amount;
+
     /**
      * 国区id
      */

netflix-dao/src/main/java/com/cyksj/model/entity/GoodsDon.java

@@ -13,6 +13,7 @@ import lombok.Setter;
 @SearchBean(tables = "goods_don")
 public class GoodsDon extends BaseEntity {
 
+
     /**
      * 商品录入人
      */
@@ -53,4 +54,11 @@ public class GoodsDon extends BaseEntity {
      * 详情
      */
     private String detail;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    private Integer type;
 }

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsTrips.java

@@ -1,5 +1,7 @@
 package com.cyksj.model.entity;
 
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,52 +14,83 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@SearchBean(tables = "groups_trips gt left join goods_don_sku sku on gt.sku_id = sku.id " +
+        "left join goods_don g on g.id = sku.goods_id " +
+        "left join account a on a.id = gt.account_id ")
 public class GroupsTrips extends BaseEntity {
 
     /**
      * 商品skuid
      */
+    @DbField("gt.sku_id")
     private Long skuId;
 
     /**
      * 账号id
      */
+    @DbField("gt.account_id")
     private Long accountId;
 
+
+    /**
+     * 账号
+     */
+    @DbField("a.account")
+    private String account;
+
+    /**
+     * 密码
+     */
+    @DbField("a.password")
+    private String password;
+
+    /**
+     * 标题
+     */
+    @DbField("g.title")
+    private String title;
+
+    /**
+     * 商品规格
+     */
+    @DbField("sku.spec_val")
+    private String seecVal;
     /**
      * 录入人
      */
+    @DbField("gt.writer")
     private Long writer;
 
     /**
      * 车位数量
      */
+    @DbField("gt.num")
     private Integer num;
 
     /**
      * 可用车位数
      */
+    @DbField("gt.available_num")
     private Integer availableNum;
 
     /**
      * 状态
      */
+    @DbField("gt.status")
     private Status status;
 
     /**
      * 备注
      */
+    @DbField("gt.remark")
     private String remark;
 
     /**
-     * 修改价格时间
+     * 开时间
      */
-    private Date upValTime;
+    @DbField("gt.start_time")
+    private Date startTime;
 
-    /**
-     * 续费时间
-     */
-    private Date renewalTime;
 
 
     @AllArgsConstructor

netflix-dao/src/main/java/com/cyksj/model/entity/Platform.java

@@ -1,15 +0,0 @@
-package com.cyksj.model.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author chan
- * @date 2022/9/26 5:31 PM
- */
-@Getter
-@Setter
-public class Platform extends BaseEntity {
-
-
-}

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSpuInsert.java

@@ -26,39 +26,43 @@ public class ReqGoodsSpuInsert {
     @NotBlank(message = "请填写标题")
     private String title;
 
+
+    private String logo;
+
+    private String img;
+
+    private String tags;
+
     /**
      * 缩略图
      */
     private String thumbnail;
 
+
     /**
-     * 轮播视频
+     * 详情
      */
-    private String video;
-
+    private String detail;
 
     /**
-     * 商品描述
+     * 描述
      */
-    private String desc;
-
+    private String remark;
 
     /**
-     * 轮播图
+     * true 上架 / false 下架
      */
-    private String carousel;
+    private Boolean status;
 
     /**
-     * 详情图
+     * true 存在 / false 删除
      */
-    private String details;
+    private Boolean deleted;
 
     /**
-     * 详情
+     * 分类 1账号 2.实物
      */
-    private String detail;
-
-
+    private Integer type;
 
 
 }

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

@@ -6,6 +6,7 @@ import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -14,13 +15,13 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "account a")
+@SearchBean(tables = "account a left join goods_don g on a.goods_id = g.id")
 public class AccountView {
 
     @DbField("a.id")
     private Long id;
 
-    @DbField("a.platform")
+    @DbField("g.title")
     private String title;
 
     @DbField("a.account")
@@ -35,6 +36,9 @@ public class AccountView {
     @DbField("a.expiry_time")
     private Date expiryTime;
 
+    @DbField("a.amount")
+    private BigDecimal amount;
+
     /**
      * 国区id
      */

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

@@ -1,5 +1,6 @@
 package com.cyksj.model.manage.views;
 
+import com.cyksj.model.entity.GroupsRelation;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -13,15 +14,16 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "groups_relation gr left join groups_trips g on gr.groups_id = g.id " +
-        "left join account a on a.id = g.account_id left join user u on gr.user_id = u.id")
+@SearchBean(tables = "groups_relation gr left join groups_trips gt on gr.groups_id = gt.id " +
+        "left join account a on a.id = gt.account_id left join user u on gr.user_id = u.id " +
+        "left join goods_don g on a.goods_id = g.id")
 public class GroupsRelationView {
 
     @DbField("gr.groups_id")
     private Long groupsId;
 
-    @DbField("a.platform")
-    private String platform;
+    @DbField("g.title")
+    private String title;
 
     @DbField("u.nickname")
     private String nickname;
@@ -48,7 +50,7 @@ public class GroupsRelationView {
      * none 无人
      */
     @DbField("gr.status")
-    private String status;
+    private GroupsRelation.Status status;
 
     /**
      * 创建时间
@@ -56,5 +58,10 @@ public class GroupsRelationView {
     @DbField("gr.created_time")
     private Date createdTime;
 
+    /**
+     * 账号
+     */
+    @DbField("gr.account")
+    private String account;
 
 }

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

@@ -25,8 +25,8 @@ public class HomeGroupView {
     @DbField("hp.account_id")
     private Long accountId;
 
-    @DbField("sku.sepc_val")
-    private String title;
+    @DbField("sku.spec_val")
+    private String specVal;
 
     @DbField("gr.start_time")
     private String startTime;

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

@@ -14,8 +14,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "order_don o,goods_don g,goods_don_sku sku,platform p,user u"
-        ,where = "o.sku_id = sku.id and g.id = sku.id and p.id = g.platform_id and o.user_id = u.id"
+@SearchBean(tables = "order_don o,goods_don g,goods_don_sku sku,user u"
+        ,where = "o.sku_id = sku.id and g.id = sku.id and o.user_id = u.id"
 )
 public class OrderDonView {
 
@@ -25,12 +25,12 @@ public class OrderDonView {
     @DbField("o.order_no")
     private String orderNo;
 
-    @DbField("p.title")
-    private String platform;
-
-    @DbField("sku.title")
+    @DbField("g.title")
     private String title;
 
+    @DbField("sku.spec_val")
+    private String specVal;
+
     @DbField("u.id")
     private Long userId;
 

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

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @SearchBean(tables = "user u")
-public class UserView extends BaseEntity {
+public class UserView {
 
     /**
      * id

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -10,9 +10,12 @@ import com.cyksj.model.manage.views.AccountView;
 import com.cyksj.service.mange.CmsAccountService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.operator.Equal;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -36,8 +39,12 @@ public class CmsAccountController {
     private final HomeGroupMapper homeGroupMapper;
 
     @GetMapping("/get")
-    public Result<SearchResult<AccountView>> get(){
-        SearchResult<AccountView> search = beanSearcher.search(AccountView.class, MapUtils.flat(request.getParameterMap()));
+    public Result<SearchResult<AccountView>> get(String account ,String expiryTime){
+        SearchResult<AccountView> search = beanSearcher.search(AccountView.class, MapUtils.flatBuilder(request.getParameterMap())
+                .field(AccountView::getAccount, StringUtils.isBlank(account) ? null : account).op(Operator.EndWith)
+                .field(AccountView::getExpiryTime, StringUtils.isBlank(expiryTime) ? null : expiryTime).op(Operator.LessEqual)
+                .build()
+        );
         search.getDataList().forEach((accountView)->{
             Integer invited = homeGroupMapper.selectCount(Wrappers.lambdaQuery(HomeGroup.class).eq(HomeGroup::getAccountId, accountView.getId()).eq(HomeGroup::getStatus, "invited"));
             Integer total = homeGroupMapper.selectCount(Wrappers.lambdaQuery(HomeGroup.class).eq(HomeGroup::getAccountId, accountView.getId()));

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupController.java

@@ -6,9 +6,11 @@ import com.cyksj.model.entity.GroupsTrips;
 import com.cyksj.service.mange.CmsGroupService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,8 +32,10 @@ public class CmsGroupController {
     private final CmsGroupService groupService;
 
     @GetMapping("/get")
-    public Result<SearchResult<GroupsTrips>> get(){
-        SearchResult<GroupsTrips> search = beanSearcher.search(GroupsTrips.class, MapUtils.flat(request.getParameterMap()));
+    public Result<SearchResult<GroupsTrips>> get(String account){
+        SearchResult<GroupsTrips> search = beanSearcher.search(GroupsTrips.class, MapUtils.flatBuilder(request.getParameterMap())
+                .field(GroupsTrips::getAccount, StringUtils.isBlank(account) ? null : account).op(Operator.EndWith).build()
+        );
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -2,9 +2,11 @@ package com.cyksj.web.controller.manage.group;
 
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.model.entity.GroupsRelation;
 import com.cyksj.model.manage.views.GroupsRelationView;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +32,9 @@ public class CmsGroupRelationController {
 
     @GetMapping("/get")
     public Result<SearchResult<GroupsRelationView>> get(){
-        SearchResult<GroupsRelationView> search = beanSearcher.search(GroupsRelationView.class, MapUtils.flat(request.getParameterMap()));
+        SearchResult<GroupsRelationView> search = beanSearcher.search(GroupsRelationView.class, MapUtils.flatBuilder(request.getParameterMap())
+                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none).op(Operator.NotEqual).build()
+        );
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsHomeGroupController.java

@@ -19,6 +19,7 @@ import java.util.List;
  */
 @RequestMapping("/manage/home")
 @RequiredArgsConstructor
+@RestController
 public class CmsHomeGroupController {
 
     private final BeanSearcher beanSearcher;
@@ -46,5 +47,11 @@ public class CmsHomeGroupController {
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 
+    @DeleteMapping("/delete/{id}")
+    private Result<String> delete(@PathVariable Long id){
+        homeGroupService.removeById(id);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
 
 }