企业列表增加是否展示 重置密码按钮

增加财务管理- 缴费项目管理 增删改查

yt-common/src/main/java/com/ytpm/middle/model/YtFinancePayment.java

@@ -0,0 +1,21 @@
+package com.ytpm.middle.model;
+
+import com.ytpm.general.BaseParam;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Marx
+ * @date 2025/8/6 11:36
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("缴费单信息")
+public class YtFinancePayment extends BaseParam {
+
+}

yt-common/src/main/java/com/ytpm/middle/model/YtFinancePaymentItem.java

@@ -0,0 +1,33 @@
+package com.ytpm.middle.model;
+
+import com.ytpm.general.BaseParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Marx
+ * @date 2025/8/6 11:37
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("缴费项目信息")
+public class YtFinancePaymentItem extends BaseParam {
+    @ApiModelProperty("缴费项目ID")
+    private String itemId;
+    @ApiModelProperty("缴费项目名称")
+    private String itemName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("数量")
+    private int count;
+    @ApiModelProperty("缴费项目金额")
+    private BigDecimal itemAmount;
+}

yt-common/src/main/java/com/ytpm/middle/model/YtMiddleEnterprise.java

@@ -23,6 +23,9 @@ public class YtMiddleEnterprise extends BaseParam {
     /** 企业名称 */
     @ApiModelProperty("企业名称")
     private String enterpriseName;
+    /** 企业类型 1-直营 2-分销 */
+    @ApiModelProperty("企业类型 1-直营 2-分销")
+    private Integer enterpriseType;
     /** 企业信用代码 */
     @ApiModelProperty("企业信用代码")
     private String creditCode;

yt-common/src/main/java/com/ytpm/middle/param/AgentForm.java

@@ -46,4 +46,7 @@ public class AgentForm extends AgentBaseInfoParam {
     /** taku公钥 */
     @ApiModelProperty("taku公钥")
     private String takuPublicKey;
+    /** 企业类型 1-直营 2-分销 */
+    @ApiModelProperty("企业类型 1-直营 2-分销")
+    private Integer enterpriseType;
 }

yt-common/src/main/java/com/ytpm/middle/param/PaymentItemParam.java

@@ -0,0 +1,33 @@
+package com.ytpm.middle.param;
+
+import com.ytpm.general.BaseParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Marx
+ * @date 2025/8/6 11:53
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("缴费项目信息")
+public class PaymentItemParam extends BaseParam {
+    @ApiModelProperty("缴费项目ID")
+    private String itemId;
+    @ApiModelProperty("缴费项目名称")
+    private String itemName;
+    @ApiModelProperty("缴费项目金额")
+    private BigDecimal itemAmount;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("数量")
+    private int count;
+}

yt-common/src/main/java/com/ytpm/middle/view/AgentBaseInfoListVO.java

@@ -23,6 +23,9 @@ public class AgentBaseInfoListVO extends BaseParam {
     /** 企业名称 */
     @ApiModelProperty("企业名称")
     private String enterpriseName;
+    /** 企业类型 1-直营 2-分销 */
+    @ApiModelProperty("企业类型 1-直营 2-分销")
+    private Integer enterpriseType;
     /** 企业信用代码 */
     @ApiModelProperty("企业信用代码")
     private String creditCode;
@@ -53,4 +56,6 @@ public class AgentBaseInfoListVO extends BaseParam {
 
     @ApiModelProperty("taku公钥")
     private String takuPublicKey;
+    @ApiModelProperty("是否显示重置密码")
+    private boolean showResetPwd;
 }

yt-common/src/main/java/com/ytpm/middle/view/PaymentItemVO.java

@@ -0,0 +1,33 @@
+package com.ytpm.middle.view;
+
+import com.ytpm.general.BaseParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Marx
+ * @date 2025/8/6 13:30
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("缴费项目信息")
+public class PaymentItemVO extends BaseParam {
+    @ApiModelProperty("缴费项目ID")
+    private String itemId;
+    @ApiModelProperty("缴费项目名称")
+    private String itemName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("数量")
+    private int count;
+    @ApiModelProperty("缴费项目金额")
+    private BigDecimal itemAmount;
+}

yt-middle/middle-platform/src/main/java/com/ytpm/middle/controller/AgentController.java

@@ -51,7 +51,7 @@ public class AgentController {
     /**
      * 修改代理商
      */
-    @ApiOperation("新增代理商")
+    @ApiOperation("修改代理商")
     @PostMapping("/updateOne")
     public Result<String> updateOne(@RequestBody AgentForm form,  @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo){
         form.setUpdateParam(userInfo.getUserId());

yt-middle/middle-platform/src/main/java/com/ytpm/middle/controller/FinanceController.java

@@ -0,0 +1,59 @@
+package com.ytpm.middle.controller;
+
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.param.PaymentItemParam;
+import com.ytpm.middle.service.FinanceService;
+import com.ytpm.middle.view.MiddleUserInfo;
+import com.ytpm.middle.view.PaymentItemVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Marx
+ * @date 2025/8/6 11:58
+ */
+@Api(tags = "财务管理")
+@RestController
+@RequestMapping("/finance")
+public class FinanceController {
+
+    @Resource
+    private FinanceService financeService;
+
+    @ApiOperation("查询缴费项目列表")
+    @PostMapping("/queryList")
+    public ResultTable<PaymentItemVO> queryList(@RequestBody PaymentItemParam param) {
+        return financeService.queryList(param);
+    }
+
+    @ApiOperation("新增缴费项目")
+    @PostMapping("/addItem")
+    public Result<String> addItem(@RequestBody PaymentItemParam param, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
+        param.setDefaultParam(userInfo.getUserId());
+        return financeService.addItem(param);
+    }
+
+    @ApiOperation("修改缴费项目")
+    @PostMapping("/updateItem")
+    public Result<String> updateItem(@RequestBody PaymentItemParam param, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
+        param.setUpdateParam(userInfo.getUserId());
+        return financeService.updateItem(param);
+    }
+
+    @ApiOperation("删除缴费项目")
+    @GetMapping("/deleteItem")
+    public Result<String> deleteItem(@RequestParam(name = "itemId")String itemId, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
+        return financeService.delItem(itemId,userInfo.getUserId());
+    }
+}

yt-middle/middle-platform/src/main/java/com/ytpm/middle/dao/AppMapper.java

@@ -54,4 +54,9 @@ public interface AppMapper {
      * 授权应用记录
      */
     void addGrantRecord(YtAppGrantRecord grantRecord);
+
+    /**
+     * 查询企业用户的应用
+     */
+    List<YtPlatformUserApp> getAppListByUserIds(@Param("userIds")String userIds);
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/dao/FinanceMapper.java

@@ -0,0 +1,32 @@
+package com.ytpm.middle.dao;
+
+import com.ytpm.middle.model.YtFinancePaymentItem;
+import com.ytpm.middle.param.PaymentItemParam;
+import com.ytpm.middle.view.PaymentItemVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FinanceMapper {
+    /**
+     * 查询缴费项目列表
+     */
+    List<PaymentItemVO> queryList(PaymentItemParam param);
+
+    /**
+     * 新增缴费项目
+     */
+    void addItem(YtFinancePaymentItem item);
+
+    /**
+     * 修改缴费项目
+     */
+    void updateItem(YtFinancePaymentItem item);
+
+    /**
+     * 查询缴费项目
+     */
+    YtFinancePaymentItem selectItemOne(@Param("itemId") String itemId);
+}

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/FinanceService.java

@@ -0,0 +1,26 @@
+package com.ytpm.middle.service;
+
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.param.PaymentItemParam;
+import com.ytpm.middle.view.PaymentItemVO;
+
+public interface FinanceService {
+    /**
+     * 查询缴费项目列表
+     */
+    ResultTable<PaymentItemVO> queryList(PaymentItemParam param);
+
+    /**
+     * 新增缴费项目
+     */
+    Result<String> addItem(PaymentItemParam param);
+    /**
+     * 修改缴费项目
+     */
+    Result<String> updateItem(PaymentItemParam param);
+    /**
+     * 删除缴费项目
+     */
+    Result<String> delItem(String itemId, String userId);
+}

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/AgentServiceImpl.java

@@ -1,14 +1,17 @@
 package com.ytpm.middle.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.ytpm.agent.model.YtPlatformUserApp;
 import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.handle.CustomerException;
 import com.ytpm.middle.dao.AgentMapper;
+import com.ytpm.middle.dao.AppMapper;
 import com.ytpm.middle.dao.EnterpriseMapper;
 import com.ytpm.middle.model.YtMiddleEnterprise;
 import com.ytpm.middle.param.AgentBaseInfoParam;
@@ -29,7 +32,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 @RefreshScope
@@ -44,6 +50,8 @@ public class AgentServiceImpl implements AgentService {
     private TencentSmsUtil smsUtil;
     @Resource
     private RedisUtil redisUtil;
+    @Resource
+    private AppMapper appMapper;
 
     @Value("${tencent.sms.registryTemplateId}")
     private String registryTemplateId;
@@ -56,7 +64,18 @@ public class AgentServiceImpl implements AgentService {
     @Override
     public ResultTable<AgentBaseInfoListVO> getBaseInfoList(AgentBaseInfoParam param) {
         PageHelper.startPage(param.getPage(), param.getLimit());
-        return ResultTable.resultTableOk(new PageInfo<AgentBaseInfoListVO>(agentMapper.getBaseInfoList(param)));
+        List<AgentBaseInfoListVO> vos = agentMapper.getBaseInfoList(param);
+        if(CollUtil.isEmpty(vos)){
+            return ResultTable.resultTableOk(new PageInfo<AgentBaseInfoListVO>(vos));
+        }
+        String userIds = vos.stream().map(AgentBaseInfoListVO::getUserId).collect(Collectors.joining(","));
+        //查询企业用户是否存在授权的包，存在则显示重置密码
+        List<YtPlatformUserApp> apps =  appMapper.getAppListByUserIds(userIds);
+        Map<String, List<YtPlatformUserApp>> userAppMap = apps.stream().collect(Collectors.groupingBy(YtPlatformUserApp::getUserId));
+        for (AgentBaseInfoListVO vo : vos) {
+            vo.setShowResetPwd(CollUtil.isNotEmpty(userAppMap.get(vo.getUserId())));
+        }
+        return ResultTable.resultTableOk(new PageInfo<AgentBaseInfoListVO>(vos));
     }
 
     /**
@@ -73,6 +92,8 @@ public class AgentServiceImpl implements AgentService {
         String accountId = IDUtil.generateFlowID("yt_agent_");
         generateLoginAccount(form,accountId);
         addEnterprise(form,accountId);
+        //根据企业类型创建缴费单
+
         return Result.resultOk(RepMessage.ADD_SUCCESS);
     }
 
@@ -161,10 +182,10 @@ public class AgentServiceImpl implements AgentService {
         agentMapper.addOneUser(user);
         //缓存企业负责人电话：账号密码
         redisUtil.setTimeOutMinutesStr(form.getConcatPhone(), generatedPassword, 30);
-        try {
-            smsUtil.sendLoginPwd(form.getConcatPhone(), generatedPassword,registryTemplateId);
-        } catch (TencentCloudSDKException e) {
-            throw new CustomerException(e.getMessage());
-        }
+//        try {
+//            smsUtil.sendLoginPwd(form.getConcatPhone(), generatedPassword,registryTemplateId);
+//        } catch (TencentCloudSDKException e) {
+//            throw new CustomerException(e.getMessage());
+//        }
     }
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/FinanceServiceImpl.java

@@ -0,0 +1,82 @@
+package com.ytpm.middle.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ytpm.general.RepMessage;
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.dao.FinanceMapper;
+import com.ytpm.middle.model.YtFinancePaymentItem;
+import com.ytpm.middle.param.PaymentItemParam;
+import com.ytpm.middle.service.FinanceService;
+import com.ytpm.middle.view.PaymentItemVO;
+import com.ytpm.util.IDUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * @author Marx
+ * @date 2025/8/6 13:31
+ */
+@Service
+public class FinanceServiceImpl implements FinanceService {
+
+    @Resource
+    private FinanceMapper financeMapper;
+
+    /**
+     * 查询缴费项目列表
+     */
+    @Override
+    public ResultTable<PaymentItemVO> queryList(PaymentItemParam param) {
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return ResultTable.resultTableOk(new PageInfo<>(financeMapper.queryList(param)));
+    }
+
+    /**
+     * 新增缴费项目
+     */
+    @Override
+    public Result<String> addItem(PaymentItemParam param) {
+        YtFinancePaymentItem item = new YtFinancePaymentItem();
+        BeanUtils.copyProperties(param, item);
+        item.setItemId(IDUtil.generateFlowID("item_"));
+        financeMapper.addItem(item);
+        return Result.resultOk(RepMessage.SAVE_SUCCESS);
+    }
+
+    /**
+     * 修改缴费项目
+     */
+    @Override
+    public Result<String> updateItem(PaymentItemParam param) {
+        YtFinancePaymentItem old = financeMapper.selectItemOne(param.getItemId());
+        if(Objects.isNull(old)){
+            return Result.resultErr(RepMessage.OBJECT_NOT_EXIST);
+        }
+        YtFinancePaymentItem item = new YtFinancePaymentItem();
+        BeanUtils.copyProperties(param, item);
+        financeMapper.updateItem(item);
+        return Result.resultOk(RepMessage.MODIFY_SUCCESS);
+    }
+
+    /**
+     * 删除缴费项目
+     */
+    @Override
+    public Result<String> delItem(String itemId, String userId) {
+        YtFinancePaymentItem old = financeMapper.selectItemOne(itemId);
+        if(Objects.isNull(old)){
+            return Result.resultErr(RepMessage.OBJECT_NOT_EXIST);
+        }
+        YtFinancePaymentItem item = new YtFinancePaymentItem();
+        item.setItemId(itemId);
+        item.setUpdateParam(userId);
+        item.setAvailable(0);
+        financeMapper.updateItem(item);
+        return Result.resultOk(RepMessage.DELETE_SUCCESS);
+    }
+}

yt-middle/middle-platform/src/main/resources/mapper/AgentMapper.xml

@@ -42,6 +42,7 @@
         me.enterprise_id,
         me.user_id,
         me.enterprise_name,
+        me.enterprise_type,
         me.credit_code,
         me.legal,
         me.legal_card,

yt-middle/middle-platform/src/main/resources/mapper/AppMapper.xml

@@ -179,4 +179,13 @@
         from yt_app
         where superior_id = #{appId}
     </select>
+    <select id="getAppListByUserIds" resultType="com.ytpm.agent.model.YtPlatformUserApp">
+        select
+            app_id, app_name, user_id, app_type, detail_url, package_name, domain, issued_time, wx_app_id, wx_secret, sale_price, grant_type, charge_status, create_time, create_user_id, update_time, update_user_id, available
+        from yt_platform_user_app
+        where user_id in
+        <foreach collection="userIds.split(',')" separator="," item="item" open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

yt-middle/middle-platform/src/main/resources/mapper/EnterpriseMapper.xml

@@ -7,6 +7,7 @@
             (
              user_id,
              enterprise_name,
+             enterprise_type,
              credit_code,
              legal,
              legal_card,
@@ -22,6 +23,7 @@
             (
              #{userId},
              #{enterpriseName},
+             #{enterpriseType},
              #{creditCode},
              #{legal},
              #{legalCard},
@@ -40,6 +42,9 @@
             <if test="enterpriseName != null">
                 enterprise_name = #{enterpriseName},
             </if>
+            <if test="enterpriseType != null">
+                enterprise_type = #{enterpriseType},
+            </if>
             <if test="creditCode != null">
                 credit_code = #{creditCode},
             </if>
@@ -76,7 +81,7 @@
 
     <select id="getByCode" resultType="com.ytpm.middle.model.YtMiddleEnterprise">
         select
-            enterprise_id,taku_public_key, user_id, enterprise_name, credit_code, legal, legal_card, concat_phone, business_licence, registry_address, create_time, create_user_id, update_time, update_user_id, available
+            enterprise_id,taku_public_key, user_id, enterprise_name,enterprise_type, credit_code, legal, legal_card, concat_phone, business_licence, registry_address, create_time, create_user_id, update_time, update_user_id, available
         from yt_middle_enterprise
         where credit_code = #{creditCode}
     </select>

yt-middle/middle-platform/src/main/resources/mapper/FinanceMapper.xml

@@ -0,0 +1,53 @@
+<?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.ytpm.middle.dao.FinanceMapper">
+    <insert id="addItem">
+        insert into yt_finance_payment_item
+            (item_id, item_name, item_amount, unit, count, create_time, create_user_id, available)
+        values
+            (#{itemId},#{itemName},#{itemAmount},#{unit},#{count},#{createTime},#{createUserId},#{available});
+    </insert>
+    <update id="updateItem">
+        update yt_finance_payment_item
+        <set>
+            <if test="itemName != null">
+                item_name = #{itemName},
+            </if>
+            <if test="itemAmount != null">
+                item_amount = #{itemAmount},
+            </if>
+            <if test="unit != null">
+                unit = #{unit},
+            </if>
+            <if test="count != null">
+                `count` = #{count},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
+            <if test="updateUserId != null">
+                update_user_id = #{updateUserId},
+            </if>
+            <if test="available != null">
+                available = #{available}
+            </if>
+        </set>
+        where item_id = #{itemId}
+    </update>
+
+    <select id="queryList" resultType="com.ytpm.middle.view.PaymentItemVO">
+        select
+            item_id, item_name, item_amount, unit, count, create_time, create_user_id, update_time, update_user_id, available
+        from yt_finance_payment_item
+        where available = 1
+        <if test="itemName != null and itemName != ''">
+            and item_name like concat('%',#{itemName},'%')
+        </if>
+    </select>
+    <select id="selectItemOne" resultType="com.ytpm.middle.model.YtFinancePaymentItem">
+        select
+            item_id, item_name, item_amount, unit, count, create_time, create_user_id, update_time, update_user_id, available
+        from yt_finance_payment_item
+        where item_id = #{itemId}
+    </select>
+</mapper>