feat: "自定义货币符号"

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

@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
  * </p>
  *
  * @author wuhs
- * @since 2022-04-14
+ * @since 2023-09-26
  */
 @Slf4j
 @Api(value = "/tAdmin", tags = {"账户"})
@@ -786,6 +786,11 @@ public class TAdminController {
         if (StringUtils.isNotEmpty(admin.getEmail())) {
             oldAdmin.setEmail(admin.getEmail());
         }
+        if (StringUtils.isNotEmpty(admin.getCurrencySymbol())) {
+            oldAdmin.setCurrencySymbol(admin.getCurrencySymbol());
+        } else {
+            oldAdmin.setCurrencySymbol("￥");
+        }
         if (admin.getApplyStartTime() != null) {
             oldAdmin.setApplyStartTime(admin.getApplyStartTime());
         }

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

@@ -14,7 +14,7 @@ import java.util.List;
  * </p>
  *
  * @author wuhs
- * @since 2022-03-28
+ * @since 2023-09-26
  */
 public interface TAdminMapper extends BaseMapper<TAdmin> {
 

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

@@ -7,7 +7,10 @@
         <id column="id" property="id" />
         <result column="create_date" property="createDate" />
         <result column="modify_date" property="modifyDate" />
+        <result column="agency_id" property="agencyId" />
         <result column="area_id" property="areaId" />
+        <result column="qr_code_img_url" property="qrCodeImgUrl" />
+        <result column="department" property="department" />
         <result column="email" property="email" />
         <result column="is_admined" property="isAdmined" />
         <result column="is_enabled" property="isEnabled" />
@@ -16,10 +19,12 @@
         <result column="login_date" property="loginDate" />
         <result column="login_failure_count" property="loginFailureCount" />
         <result column="login_ip" property="loginIp" />
+        <result column="merchant_id" property="merchantId" />
         <result column="trade_merchant_no" property="tradeMerchantNo" />
         <result column="name" property="name" />
         <result column="parent_id" property="parentId" />
         <result column="password" property="password" />
+        <result column="personage_id" property="personageId" />
         <result column="notice_id" property="noticeId" />
         <result column="type" property="type" />
         <result column="username" property="username" />
@@ -32,16 +37,16 @@
         <result column="apply_end_time" property="applyEndTime" />
         <result column="code" property="code" />
         <result column="pay_platform" property="payPlatform" />
+        <result column="logo_rule" property="logoRule" />
         <result column="relation_admin_id" property="relationAdminId" />
-        <result column="agency_id" property="agencyId" />
-        <result column="merchant_id" property="merchantId" />
-        <result column="personage_id" property="personageId" />
+        <result column="manager_id" property="managerId" />
         <result column="company_type" property="companyType" />
+        <result column="currency_symbol" property="currencySymbol" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, area_id, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, trade_merchant_no, name, parent_id, password, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, relation_admin_id,agency_id,merchant_id,personage_id,company_type
+        id, create_date, modify_date, agency_id, area_id, qr_code_img_url, department, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, merchant_id, trade_merchant_no, name, parent_id, password, personage_id, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, logo_rule, relation_admin_id, manager_id, company_type, currency_symbol
     </sql>
     <select id="queryByXml" resultType="com.szwl.model.entity.TAdmin">
         select * from t_admin a

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

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2022-03-28
+ * @since 2023-09-26
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -39,40 +39,48 @@ public class TAdmin implements Serializable {
 
     private Long areaId;
 
-    @ApiModelProperty(value = "邮箱;")
+    @ApiModelProperty(value = "二维码地址")
+    private String qrCodeImgUrl;
+
+    private String department;
+
+    @ApiModelProperty(value = "邮箱")
     private String email;
 
     @ApiModelProperty(value = "设置是否普通管理员（1：管理员，0：子账户）;1代表TRUE,0代表FALSE")
     private Boolean isAdmined;
 
-    @ApiModelProperty(value = "是否启用;")
+    @ApiModelProperty(value = "是否启用")
     private Boolean isEnabled;
 
-    @ApiModelProperty(value = "是否锁定;")
+    @ApiModelProperty(value = "是否锁定")
     private Boolean isLocked;
 
-    @ApiModelProperty(value = "锁定时间;")
+    @ApiModelProperty(value = "锁定时间")
     private Date lockedDate;
 
-    @ApiModelProperty(value = "登录时间;")
+    @ApiModelProperty(value = "登录时间")
     private Date loginDate;
 
-    @ApiModelProperty(value = "连续登录失败次数;")
+    @ApiModelProperty(value = "连续登录失败次数")
     private Integer loginFailureCount;
 
+    @ApiModelProperty(value = "登录ip")
     private String loginIp;
 
-    @ApiModelProperty(value = "商户报备号;")
+    @ApiModelProperty(value = "商户报备号")
     private String tradeMerchantNo;
 
+    @ApiModelProperty(value = "用户名称")
     private String name;
 
-    @ApiModelProperty(value = "如果is_admined=0,说明这个账户是子账户，它的拥有者的adminId就是parent_id;")
+    @ApiModelProperty(value = "如果is_admined=0,说明这个账户是子账户，它的拥有者的adminId就是parent_id")
     private Long parentId;
 
+    @ApiModelProperty(value = "登录密码")
     private String password;
 
-    @ApiModelProperty(value = "当前查看过公告的id;")
+    @ApiModelProperty(value = "当前查看过公告的id")
     private Long noticeId;
 
     @ApiModelProperty(value = "类型,0:超管，1：公司人员;2：商家，3：商家子账户")
@@ -105,13 +113,15 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "短信验证码")
     private String code;
 
-    @ApiModelProperty(value = "支付平台; 0或null为汇聚，1为杉德支付")
+    @ApiModelProperty(value = "支付平台  0或null为汇聚，1为杉德支付")
     private String payPlatform;
 
+    private String logoRule;
+
     @ApiModelProperty(value = "关联商家，相当于以前的parent_id")
     private String relationAdminId;
 
-    @ApiModelProperty(value = "系统id（设备申请连接系统时用）;")
+    @ApiModelProperty(value = "系统id（设备申请连接系统时用）")
     private String managerId;
     @Transient
     public String getManager() {
@@ -133,4 +143,9 @@ public class TAdmin implements Serializable {
 
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
+
+    @ApiModelProperty(value = "自定义货币符号")
+    private String currencySymbol;
+
+
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
  * </p>
  *
  * @author wuhs
- * @since 2022-03-28
+ * @since 2023-09-26
  */
 public interface TAdminService extends MyIService<TAdmin> {
     List<TAdmin> listByXml(TAdminParam param);

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

@@ -26,7 +26,7 @@ import java.util.Set;
  * </p>
  *
  * @author wuhs
- * @since 2022-03-28
+ * @since 2023-09-26
  */
 @Service
 public class TAdminServiceImpl extends ServiceImpl<TAdminMapper, TAdmin> implements TAdminService {