Ver código fonte

红包充值的 凭证照片

三七 1 semana atrás
pai
commit
ef55400f26

+ 1 - 0
fs-company/src/main/java/com/fs/company/controller/company/CompanyRedPacketBalanceLogsController.java

@@ -108,6 +108,7 @@ public class CompanyRedPacketBalanceLogsController extends BaseController {
         redRecharge.setRemark(param.getRemark());
         redRecharge.setPayType(3);
         redRecharge.setBusinessType(1);// 红包充值
+        redRecharge.setImgs(param.getImgs());// 红包充值
         rechargeService.insertCompanyRecharge(redRecharge);
         return R.ok("提交成功,等待审核");
 

+ 2 - 0
fs-service/src/main/java/com/fs/company/mapper/CompanyRechargeMapper.java

@@ -98,8 +98,10 @@ public interface CompanyRechargeMapper
             "order by r.recharge_id desc " +
             "</script>"})
     List<CompanyRechargeVO> selectCompanyRechargeVOList(@Param("maps")CompanyRecharge companyRecharge);
+
     @Select("select * from company_recharge where recharge_no=#{no}")
     CompanyRecharge selectCompanyRechargeByNo(String no);
+
     @Select("select sum(money) from company_recharge where status=1")
     BigDecimal selectCompanyRechargeMoney();
 

+ 3 - 0
fs-service/src/main/java/com/fs/company/vo/CompanyRechargeVO.java

@@ -85,6 +85,9 @@ public class CompanyRechargeVO implements Serializable {
     @Excel(name = "备注")
     private String remark;
 
+    @Excel(name = "凭证")
+    private String imgs;
+
     /** 业务类型 0-普通 1-红包充值 */
     private Integer businessType;
 

+ 3 - 0
fs-service/src/main/java/com/fs/qw/mapper/QwWatchLogMapper.java

@@ -108,6 +108,9 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "<if test ='companyUserId !=null and companyUserId!=\"\"'>\n" +
             "   and qu.company_user_id =#{companyUserId} \n" +
             "</if>" +
+            "<if test ='corpId !=null and corpId!=\"\"'>\n" +
+            "   and qu.corp_id =#{corpId} \n" +
+            "</if>" +
             "<if test ='ids !=null and ids!=\"\"'>\n" +
             "   and qec.qw_user_id in (${ids})\n" +
             "</if>" +

+ 6 - 1
fs-service/src/main/resources/mapper/company/CompanyRechargeMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="auditTime"    column="audit_time"    />
         <result property="remark"    column="remark"    />
         <result property="businessType"    column="business_type"    />
+        <result property="imgs"    column="imgs"    />
     </resultMap>
 
     <sql id="selectCompanyRechargeVo">
-        select recharge_id, company_id, recharge_no, money, create_time, pay_time, status, pay_type, trade_no, balance, create_user_id, is_audit, audit_user_id, audit_time,remark, business_type from company_recharge
+        select recharge_id, company_id, recharge_no, money, create_time, pay_time, status, pay_type, trade_no, balance, create_user_id, is_audit, audit_user_id, audit_time,remark, business_type,imgs from company_recharge
     </sql>
 
     <select id="selectCompanyRechargeList" parameterType="CompanyRecharge" resultMap="CompanyRechargeResult">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isAudit != null "> and is_audit = #{isAudit}</if>
             <if test="auditUserId != null "> and audit_user_id = #{auditUserId}</if>
             <if test="auditTime != null "> and audit_time = #{auditTime}</if>
+            <if test="imgs != null "> and imgs = #{imgs}</if>
         </where>
     </select>
 
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditTime != null">audit_time,</if>
             <if test="remark != null">remark,</if>
             <if test="businessType != null">business_type,</if>
+            <if test="imgs != null">imgs,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null">#{companyId},</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditTime != null">#{auditTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="businessType != null">#{businessType},</if>
+            <if test="imgs != null">#{imgs},</if>
          </trim>
     </insert>
 
@@ -105,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditUserId != null">audit_user_id = #{auditUserId},</if>
             <if test="auditTime != null">audit_time = #{auditTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="imgs != null">imgs = #{imgs},</if>
         </trim>
         where recharge_id = #{rechargeId}
     </update>