新增商户账号管理功能

src/main/java/com/gxwebsoft/common/core/utils/RequestUtil.java

@@ -74,6 +74,7 @@ public class RequestUtil {
       HashMap<String, Object> map = new HashMap<>();
       map.put("nickname",merchantAccount.getRealName());
       map.put("username", merchantAccount.getPhone());
+      map.put("realName",merchantAccount.getRealName());
       map.put("phone", merchantAccount.getPhone());
       map.put("password",merchantAccount.getPassword());
       final ArrayList<Object> roles = new ArrayList<>();

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

@@ -14,6 +14,7 @@ import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.shop.entity.Merchant;
 import com.gxwebsoft.shop.entity.MerchantAccount;
 import com.gxwebsoft.shop.param.MerchantParam;
+import com.gxwebsoft.shop.service.MerchantAccountService;
 import com.gxwebsoft.shop.service.MerchantService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +38,8 @@ import java.util.List;
 public class MerchantController extends BaseController {
     @Resource
     private MerchantService merchantService;
+    @Resource
+    private MerchantAccountService merchantAccountService;
 
     @ApiOperation("分页查询商户")
     @GetMapping("/page")
@@ -69,7 +72,7 @@ public class MerchantController extends BaseController {
       }
       if (merchantService.save(merchant)) {
           // 设置商家后台入口
-          merchant.setAdminUrl(".adm.wsdns.cn");
+          merchant.setAdminUrl(merchant.getTenantId() + ".m.wsdns.cn");
           merchantService.updateById(merchant);
           // 获取用户信息
           final RequestUtil requestUtil = new RequestUtil();
@@ -77,13 +80,20 @@ public class MerchantController extends BaseController {
           requestUtil.setAccessToken(access_token);
           requestUtil.setTenantId(getTenantId().toString());
           final MerchantAccount merchantAccount = new MerchantAccount();
-          merchantAccount.setPhone(merchantAccount.getPhone());
+          merchantAccount.setMerchantId(merchant.getMerchantId());
+          merchantAccount.setPhone(merchant.getPhone());
+          merchantAccount.setPassword(merchant.getPhone().substring(merchant.getPhone().length() - 6));
+          merchantAccount.setRealName(merchant.getRealName());
+          merchantAccount.setRoleId(merchant.getRoleId());
+          merchantAccount.setRoleName(merchant.getRoleName());
           requestUtil.saveUserByPhone(merchantAccount);
+          merchantAccountService.save(merchantAccount);
           return success("添加成功");
         }
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:merchant:update')")
     @ApiOperation("修改商户")
     @PutMapping()
     public ApiResult<?> update(@RequestBody Merchant merchant) {
@@ -93,6 +103,7 @@ public class MerchantController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:merchant:remove')")
     @ApiOperation("删除商户")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -102,6 +113,7 @@ public class MerchantController extends BaseController {
         return fail("删除失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:merchant:save')")
     @ApiOperation("批量添加商户")
     @PostMapping("/batch")
     public ApiResult<?> saveBatch(@RequestBody List<Merchant> list) {
@@ -111,6 +123,7 @@ public class MerchantController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:merchant:update')")
     @ApiOperation("批量修改商户")
     @PutMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody BatchParam<Merchant> batchParam) {
@@ -120,6 +133,7 @@ public class MerchantController extends BaseController {
         return fail("修改失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:merchant:remove')")
     @ApiOperation("批量删除商户")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {

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

@@ -1,6 +1,8 @@
 package com.gxwebsoft.shop.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -102,4 +104,12 @@ public class Merchant implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
+    @ApiModelProperty(value = "默认商户管理员角色ID")
+    @TableField(exist = false)
+    private Integer roleId;
+
+    @ApiModelProperty(value = "角色名称")
+    @TableField(exist = false)
+    private String roleName;
+
 }