完成ShopDealerApply经销商入驻模块

src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java

@@ -1,6 +1,8 @@
 package com.gxwebsoft.shop.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.shop.entity.ShopDealerUser;
 import com.gxwebsoft.shop.service.ShopDealerApplyService;
 import com.gxwebsoft.shop.entity.ShopDealerApply;
 import com.gxwebsoft.shop.param.ShopDealerApplyParam;
@@ -10,12 +12,14 @@ import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.service.ShopDealerUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -30,6 +34,8 @@ import java.util.List;
 public class ShopDealerApplyController extends BaseController {
     @Resource
     private ShopDealerApplyService shopDealerApplyService;
+    @Resource
+    private ShopDealerUserService shopDealerUserService;
 
     @PreAuthorize("hasAuthority('shop:shopDealerApply:list')")
     @Operation(summary = "分页查询分销商申请记录表")
@@ -63,6 +69,7 @@ public class ShopDealerApplyController extends BaseController {
         // 记录当前登录用户id
         User loginUser = getLoginUser();
         if (loginUser != null) {
+          shopDealerApply.setApplyTime(LocalDateTime.now());
           shopDealerApply.setUserId(loginUser.getUserId());
         }
         if (shopDealerApplyService.save(shopDealerApply)) {
@@ -76,7 +83,22 @@ public class ShopDealerApplyController extends BaseController {
     @Operation(summary = "修改分销商申请记录表")
     @PutMapping()
     public ApiResult<?> update(@RequestBody ShopDealerApply shopDealerApply) {
+        shopDealerApply.setAuditTime(null);
         if (shopDealerApplyService.updateById(shopDealerApply)) {
+            if (shopDealerApply.getApplyStatus().equals(20)) {
+              LocalDateTime now = LocalDateTime.now();
+              shopDealerApply.setAuditTime(now);
+              shopDealerApplyService.updateById(shopDealerApply);
+              // 同步添加经销商
+              if (shopDealerUserService.count(new LambdaQueryWrapper<ShopDealerUser>().eq(ShopDealerUser::getUserId, shopDealerApply.getUserId())) == 0) {
+                final ShopDealerUser dealerUser = new ShopDealerUser();
+                dealerUser.setUserId(shopDealerApply.getUserId());
+                dealerUser.setRealName(shopDealerApply.getRealName());
+                dealerUser.setMobile(shopDealerApply.getMobile());
+                dealerUser.setRefereeId(shopDealerApply.getRefereeId());
+                shopDealerUserService.save(dealerUser);
+              }
+            }
             return success("修改成功");
         }
         return fail("修改失败");

src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java

@@ -31,7 +31,6 @@ public class ShopDealerUserController extends BaseController {
     @Resource
     private ShopDealerUserService shopDealerUserService;
 
-    @PreAuthorize("hasAuthority('shop:shopDealerUser:list')")
     @Operation(summary = "分页查询分销商用户记录表")
     @GetMapping("/page")
     public ApiResult<PageResult<ShopDealerUser>> page(ShopDealerUserParam param) {

src/main/java/com/gxwebsoft/shop/controller/ShopGiftController.java

@@ -149,6 +149,8 @@ public class ShopGiftController extends BaseController {
             shopGift.setName(shopGiftData.getName());
             shopGift.setCode(RandomUtil.randomString(8));
             shopGift.setGoodsId(shopGiftData.getGoodsId());
+            shopGift.setUseLocation(shopGiftData.getUseLocation());
+            shopGift.setComments(shopGiftData.getComments());
             giftList.add(shopGift);
         }
         if (shopGiftService.saveBatch(giftList)) {

src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java

@@ -41,13 +41,15 @@ public class ShopDealerApply implements Serializable {
     private Integer applyType;
 
     @Schema(description = "申请时间")
-    private Integer applyTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime applyTime;
 
     @Schema(description = "审核状态 (10待审核 20审核通过 30驳回)")
     private Integer applyStatus;
 
     @Schema(description = "审核时间")
-    private Integer auditTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime auditTime;
 
     @Schema(description = "驳回原因")
     private String rejectReason;

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml

@@ -57,6 +57,8 @@
             </if>
             <if test="param.keywords != null">
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+                    OR a.code = #{param.keywords}
+                    OR a.name LIKE CONCAT('%', #{param.keywords}, '%')
                 )
               </if>
         </where>

src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java

@@ -46,7 +46,7 @@ public class ShopDealerApplyParam extends BaseParam {
 
     @Schema(description = "申请时间")
     @QueryField(type = QueryType.EQ)
-    private Integer applyTime;
+    private String applyTime;
 
     @Schema(description = "审核状态 (10待审核 20审核通过 30驳回)")
     @QueryField(type = QueryType.EQ)
@@ -54,7 +54,7 @@ public class ShopDealerApplyParam extends BaseParam {
 
     @Schema(description = "审核时间")
     @QueryField(type = QueryType.EQ)
-    private Integer auditTime;
+    private String auditTime;
 
     @Schema(description = "驳回原因")
     private String rejectReason;

src/main/java/com/gxwebsoft/shop/param/ShopGiftParam.java

@@ -34,6 +34,9 @@ public class ShopGiftParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer goodsId;
 
+    @Schema(description = "使用地点")
+    private String useLocation;
+
     @Schema(description = "领取时间")
     private String takeTime;
 
@@ -55,6 +58,9 @@ public class ShopGiftParam extends BaseParam {
     @Schema(description = "备注")
     private String comments;
 
+    @Schema(description = "操作员备注")
+    private String operatorRemarks;
+
     @Schema(description = "排序号")
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;