商家续期

ruoyi-business/src/main/java/com/ruoyi/agent/domain/AgentBalanceRecord.java

@@ -70,4 +70,9 @@ public class AgentBalanceRecord {
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    private String businessName;
 }

ruoyi-business/src/main/java/com/ruoyi/agent/domain/bo/AgentBalanceRecordBo.java

@@ -93,5 +93,9 @@ public class AgentBalanceRecordBo extends BaseEntity {
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
-
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    private String businessName;
 }

ruoyi-business/src/main/java/com/ruoyi/agent/domain/bo/AgentChangeBalanceBo.java

@@ -40,4 +40,9 @@ public class AgentChangeBalanceBo implements Serializable {
      * 备注
      */
     private String remark;
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    private String businessName;
 }

ruoyi-business/src/main/java/com/ruoyi/agent/domain/vo/AgentBalanceRecordVo.java

@@ -96,5 +96,9 @@ public class AgentBalanceRecordVo {
     @ApiModelProperty("备注")
     private String remark;
 
-
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    private String businessName;
 }

ruoyi-business/src/main/java/com/ruoyi/agent/service/IAgentBalanceRecordService.java

@@ -77,5 +77,5 @@ public interface IAgentBalanceRecordService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType sourceType, Long sourceId);
+    BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType sourceType, Long businessId);
 }

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentBalanceRecordServiceImpl.java

@@ -159,12 +159,12 @@ public class AgentBalanceRecordServiceImpl implements IAgentBalanceRecordService
     }
 
     @Override
-    public BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType sourceType, Long sourceId) {
+    public BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType sourceType, Long businessId) {
         AgentBalanceRecordBo bo = new AgentBalanceRecordBo();
         bo.setAgentId(agentId);
         bo.setBillType(billType);
         bo.setSourceType(sourceType);
-        bo.setSourceId(sourceId);
+        bo.setBusinessId(businessId);
         return baseMapper.sumStatistics(bo);
     }
 

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -419,6 +419,8 @@ public class AgentServiceImpl implements IAgentService {
         recordBo.setSourceId(bo.getSourceId());
         recordBo.setSourceCode(bo.getSourceCode());
         recordBo.setRemark(bo.getRemark());
+        recordBo.setBusinessId(bo.getBusinessId());
+        recordBo.setBusinessName(bo.getBusinessName());
         agentBalanceRecordService.insertByBo(recordBo);
     }
 

ruoyi-business/src/main/resources/mapper/agent/AgentBalanceRecordMapper.xml

@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sourceCode" column="source_code"/>
         <result property="remark" column="remark"/>
         <result property="createTime" column="create_time"/>
+        <result property="businessId" column="business_id"/>
+        <result property="businessName" column="business_name"/>
     </resultMap>
 
     <select id="sumStatistics" resultType="java.math.BigDecimal">
@@ -23,8 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE agent_id = #{bo.agentId}
         AND bill_type = #{bo.billType}
         AND source_type = #{bo.sourceType}
-        <if test="bo.sourceId != null">
-          AND source_id = #{bo.sourceId}
+        <if test="bo.businessId != null">
+          AND business_id = #{bo.businessId}
         </if>
 
     </select>

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -585,6 +585,8 @@ public class UserServiceImpl implements IUserService {
         recordBo.setSourceId(bo.getSourceId());
         recordBo.setSourceCode(bo.getSourceCode());
         recordBo.setRemark(bo.getRemark());
+        recordBo.setBusinessId(bo.getBusinessId());
+        recordBo.setBusinessName(bo.getBusinessName());
         userBalanceRecordService.insertByBo(recordBo);
     }