Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitVO.java

@@ -0,0 +1,77 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class AdminWebsitVO   {
+
+    @ApiModelProperty(value = "商家编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "商家名称")
+    private String name;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitNumber;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户id")
+    private String companyWechatId;
+
+    @ApiModelProperty(value = "上级公司")
+    private String companyName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "负责人")
+    private String person;
+
+    @ApiModelProperty(value = "负责人电话")
+    private String personMobile;
+
+    @ApiModelProperty(value = "OFF 禁用  ON 启用")
+    private String status;
+
+    @ApiModelProperty(value = "SHIP 旗舰店 CHISE 加盟店")
+    private String type;
+
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "收款商户号")
+    private String payWorkerName;
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "师傅收款电子支付商户")
+    private String payWorkerCodeId;
+
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}

src/main/java/com/gree/mall/manager/commonmapper/AdminMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
+import com.gree.mall.manager.bean.admin.AdminWebsitVO;
 import com.gree.mall.manager.bean.admin.respDto.AdminCompanyWechatRespPageBean;
 import com.gree.mall.manager.bean.common.SysDictCompanyVO;
 import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
@@ -69,4 +70,6 @@ public interface AdminMapper {
     IPage<SysDictCompanyVO> sysDictCompanyList(Page page,
                                                @Param("ex") ZfireParamBean zfireParam,
                                                @Param("companyWechatIds") List<String> companyWechatIds);
+
+    IPage<AdminWebsitVO> listWebsit(Page page, @Param("ex") ZfireParamBean zfireParam);
 }

src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -1,12 +1,20 @@
 package com.gree.mall.manager.controller.admin;
 
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
+import com.gree.mall.manager.bean.admin.AdminWebsitVO;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.admin.AdminWebsitLogic;
 import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.entity.AdminZone;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +28,7 @@ import java.util.List;
 
 @Slf4j
 @RestController
-@Api(value = "企业微信部门管理API", tags ={"企业微信部门管理API"} )
+@Api(value = "商户管理", tags ={"商户管理"} )
 @RequestMapping(value = "/admin/websit", produces = "application/json; charset=utf-8")
 public class AdminWebsitController {
 
@@ -34,6 +42,17 @@ public class AdminWebsitController {
         return ResponseHelper.success(tree);
     }
 
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "商户管理")
+    public ResponseHelper<IPage<AdminWebsitVO>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<AdminWebsitVO> adminDeptVOIPage = adminWebsitLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(adminDeptVOIPage, new TypeReference<AdminWebsitVO>() {});
+    }
+
 
     @GetMapping("/zone/list")
     @ApiOperation("区域列表")
@@ -43,28 +62,28 @@ public class AdminWebsitController {
     }
 
     @PostMapping("/add")
-    @ApiOperation("新增部门")
+    @ApiOperation("新增商户")
     public ResponseHelper add(@RequestBody AdminWebsit adminWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
         adminWebsitLogic.add(adminWebsit,request);
         return ResponseHelper.success();
     }
 
     @PostMapping("/update")
-    @ApiOperation("修改部门")
+    @ApiOperation("修改商户")
     public ResponseHelper update(@RequestBody AdminWebsit adminWebsit,HttpServletRequest request) throws RemoteServiceException, WxErrorException {
         adminWebsitLogic.update(adminWebsit,request);
         return ResponseHelper.success();
     }
 
     @PostMapping("/delete")
-    @ApiOperation("删除部门")
+    @ApiOperation("删除商户")
     public ResponseHelper delete(@RequestParam String id, HttpServletRequest request) throws WxErrorException {
         adminWebsitLogic.delete(id,request);
         return ResponseHelper.success();
     }
 
     @GetMapping("/detail")
-    @ApiOperation("部门详情")
+    @ApiOperation("部门商户")
     public ResponseHelper<AdminWebsit> detail(@RequestParam String id){
         AdminWebsit detail = adminWebsitLogic.detail(id);
         return ResponseHelper.success(detail);

src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -1,8 +1,13 @@
 package com.gree.mall.manager.logic.admin;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
+import com.gree.mall.manager.bean.admin.AdminWebsitVO;
+import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.exception.RemoteServiceException;
 
 import com.gree.mall.manager.logic.admin.ew.EnterpriseWechatWorkerLogic;
@@ -12,6 +17,8 @@ import com.gree.mall.manager.plus.entity.AdminWebsit;
 import com.gree.mall.manager.plus.entity.AdminZone;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
 import com.gree.mall.manager.plus.service.AdminZoneService;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.BeanUtils;
@@ -39,6 +46,9 @@ public class AdminWebsitLogic {
     @Autowired
     EnterpriseWechatWorkerLogic enterpriseWechatWorkerLogic;
 
+    @Autowired
+    AdminMapper adminMapper;
+
     /**
      * 区域列表
      */
@@ -161,7 +171,6 @@ public class AdminWebsitLogic {
     public AdminWebsit detail(Long websitId,String corpId){
         AdminWebsit adminWebsit = adminWebsitService.lambdaQuery()
                 .eq(AdminWebsit::getWebsitId,websitId)
-                .eq(AdminWebsit::getCorpId,corpId)
                 .one();
         return adminWebsit;
     }
@@ -207,7 +216,15 @@ public class AdminWebsitLogic {
     }
 
 
+    public IPage<AdminWebsitVO> list(Page page, ZfireParamBean zfireParam) {
 
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        //1.组装查询条件
+        FieldUtils.supplyParam(zfireParam, AdminWebsitVO.class,adminUser);
 
+        IPage<AdminWebsitVO> adminDeptWebsitVOIPage = adminMapper.listWebsit(page, zfireParam);
+        return adminDeptWebsitVOIPage;
+    }
 }

src/main/resources/mapper/AdminMapper.xml

@@ -125,6 +125,17 @@
         </if>
         ${ex.orderBy}
     </select>
+    <select id="listWebsit" resultType="com.gree.mall.manager.bean.admin.AdminWebsitVO">
+        SELECT
+        ${ex.selected}
+        FROM admin_websit a
+        ${ex.query}
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+
+    </select>
 
     <resultMap id="pageCompanyWechatResultMap" autoMapping="true" type="com.gree.mall.manager.bean.admin.respDto.AdminCompanyWechatRespPageBean">