定制logo

src/main/java/com/szwl/controller/TAdminController.java

@@ -422,7 +422,7 @@ public class TAdminController {
                     SysRole sysRole = list2.get(0);
                     SysUserRole sysUserRole = new SysUserRole();
                     sysUserRole.setRoleId(sysRole.getRoleId());
-                    sysUserRole.setId(String.valueOf(admin.getId()));
+                    sysUserRole.setUserId(String.valueOf(admin.getId()));
                     boolean save = sysUserRoleService.save(sysUserRole);
                 }
                 tMessageCode.setModifyDate(new Date());

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -94,23 +94,23 @@ public class TJoinpayMchController {
     @PostMapping("/save")
     public ResponseModel<?> save(@RequestBody TJoinpayMch tJoinpayMch) {
 
-        TAdmin admin = adminService.getById(tJoinpayMch.getAdminId());
+//        TAdmin admin = adminService.getById(tJoinpayMch.getAdminId());
         LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
         query.eq(TJoinpayMch::getAdminId,tJoinpayMch.getAdminId());
         List<TJoinpayMch> list = tJoinpayMchService.list(query);
         tJoinpayMch.setCreateDate(new Date());
         tJoinpayMch.setModifyDate(new Date());
-        if(list.size()>0){
+        if(list.size()>0&&StringUtils.isNotEmpty(list.get(0).getAltMchNo())){
             //已有，属于第二次提交信息，需要审核
             TJoinpayMch mch = list.get(0);
-            createCheckMch(mch,tJoinpayMch);
-            return R.ok(list.get(0));
+            ResponseModel<?> checkMch = createCheckMch(mch, tJoinpayMch);
+            return checkMch;
         }else {
             //没有，直接保存
             tJoinpayMch.setStep("0");
 
             String result = tJoinpayMchService.createMch(tJoinpayMch);
-            return R.fail("尚未注册！");
+            return R.ok(tJoinpayMch);
         }
     }
     @ApiOperation(value = "签约")
@@ -176,6 +176,7 @@ public class TJoinpayMchController {
         }else {
             LambdaQueryWrapper<TJoinpayMchCheck> query = Wrappers.lambdaQuery();
             query.eq(TJoinpayMchCheck::getType,"0");
+            query.eq(TJoinpayMchCheck::getAdminId,tJoinpayMch.getAdminId());
             List<TJoinpayMchCheck> list = tJoinpayMchCheckService.list(query);
             if(list.size()>0){
                 return R.fail("重复提交！");
@@ -220,7 +221,7 @@ public class TJoinpayMchController {
             }
             joinpayMchCheck.setType("0");
             tJoinpayMchCheckService.save(joinpayMchCheck);
-            return R.ok();
+            return R.ok(joinpayMchCheck);
         }
     }
 }

src/main/java/com/szwl/controller/TLogoController.java

@@ -0,0 +1,63 @@
+package com.szwl.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TLogo;
+import com.szwl.model.utils.AdminUtils;
+import com.szwl.service.TAdminService;
+import com.szwl.service.TLogoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户定制logo 前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-09-26
+ */
+@Api(value = "/tLogo", tags = {"logo"})
+@RestController
+@RequestMapping("/tLogo")
+public class TLogoController {
+    @Autowired
+    TAdminService tAdminService;
+    @Autowired
+    TLogoService logoService;
+    @ApiOperation(value = "查询是否有定制logo")
+    @GetMapping("/getLogo")
+    public ResponseModel<?> getLogo(String relationAdminId) {
+        if(StringUtils.isEmpty(relationAdminId)){
+            return  R.fail(ResponseCodesEnum.A0001);
+        }
+        Long adminId = AdminUtils.decrypt(false, relationAdminId);
+        TAdmin admin = tAdminService.getById(adminId);
+        if(admin!=null&&admin.getId()!=null){
+            LambdaQueryWrapper<TLogo> query = Wrappers.lambdaQuery();
+            query.eq(TLogo::getAdminId,adminId);
+            List<TLogo> list = logoService.list(query);
+            if(list.size()>0){
+                return R.ok(list.get(0));
+            }else {
+                return  R.fail(ResponseCodesEnum.A0206);
+            }
+        }
+
+        return  R.fail(ResponseCodesEnum.A0206);
+    }
+}
+

src/main/java/com/szwl/mapper/TLogoMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TLogo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户定制logo Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-09-26
+ */
+public interface TLogoMapper extends BaseMapper<TLogo> {
+
+}

src/main/java/com/szwl/mapper/xml/TLogoMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.szwl.mapper.TLogoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TLogo">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="admin_id" property="adminId" />
+        <result column="img_url" property="imgUrl" />
+        <result column="adress" property="adress" />
+        <result column="phone" property="phone" />
+        <result column="title" property="title" />
+        <result column="en_title" property="enTitle" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, admin_id, img_url, adress, phone, title, en_title
+    </sql>
+
+</mapper>

src/main/java/com/szwl/model/entity/TLogo.java

@@ -0,0 +1,52 @@
+package com.szwl.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户定制logo
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TLogo对象", description="用户定制logo")
+public class TLogo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "用户id;")
+    private Long adminId;
+
+    @ApiModelProperty(value = "图片地址;")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "公司地址;")
+    private String adress;
+
+    @ApiModelProperty(value = "电话;")
+    private String phone;
+
+    @ApiModelProperty(value = "网页抬头标题;")
+    private String title;
+
+    private String enTitle;
+
+
+}

src/main/java/com/szwl/service/TLogoService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TLogo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户定制logo 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-09-26
+ */
+public interface TLogoService extends IService<TLogo> {
+
+}

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -169,6 +169,7 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
              */
             mch.setCreateDate(new Date());
             mch.setModifyDate(new Date());
+            mch.setType("1");
             save(mch);
 
             if(jsonObject.has("resp_code")){

src/main/java/com/szwl/service/impl/TLogoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TLogo;
+import com.szwl.mapper.TLogoMapper;
+import com.szwl.service.TLogoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户定制logo 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-09-26
+ */
+@Service
+public class TLogoServiceImpl extends ServiceImpl<TLogoMapper, TLogo> implements TLogoService {
+
+}

src/test/java/com/szwl/AutoGeneratorTests.java

@@ -47,7 +47,7 @@ class AutoGeneratorTests {
 		strategyConfig
 //				.setCapitalMode(true)//设置全局大写命名
 				.setInclude(new String[]{
-						""
+						"t_logo"
 				})//只会生成该表
 				.setEntityLombokModel(true)//实体类生成之后自动添加lombok注解
 				.setNaming(NamingStrategy.underline_to_camel)//数据库表映射到实体的命名策略