文章类型筛选后合计数失效bug修复+客户金币地区

src/main/java/com/example/demo/domain/vo/bean/BeanRechargeInfo.java

@@ -34,7 +34,7 @@ public class BeanRechargeInfo {
     private String market; // 所属地区
     @ExcelProperty("免费金豆")
     private Integer freeBean; // 免费豆
-    @ExcelProperty("永久金豆")
+    @ExcelProperty("付费金豆")
     private Integer permanentBean; // 永久豆
     @ExcelProperty("金额")
     private Double money; // 金额

src/main/java/com/example/demo/domain/vo/bean/BeanSystemRechargeInfo.java

@@ -34,7 +34,7 @@ public class BeanSystemRechargeInfo {
     private String market; // 所属地区
     @ExcelProperty("免费金豆")
     private Integer freeBean; // 免费豆
-    @ExcelProperty("永久金豆")
+    @ExcelProperty("付费金豆")
     private Integer permanentBean; // 永久豆
     @ExcelProperty("金额")
     private Double money; // 金额

src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java

@@ -112,7 +112,10 @@ public class RechargeServiceImpl implements RechargeService {
         {
             return Result.error("精网号位数小于8位或大于8位");
         }
-
+        // 验证免费金币和永久金币是否均为0
+        if (rechargeUser.getFreeGold() == 0 && rechargeUser.getPermanentGold() == 0) {
+            return Result.error("免费金币和永久金币不能同时为0");
+        }
         BeanUserCard user = beanUserMapper.userCard(String.valueOf(rechargeUser.getJwcode()));
         if(user==null){
             return Result.error("用户查找不到");

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -287,13 +287,13 @@
                 AND fm.dept = #{beanConsumeArticle.dept}
             </if>
             <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
-                AND fyr.source_name =#{beanConsumeArticle.articleName}
+                AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%')
             </if>
             <if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''">
                 AND (SELECT fm2.nickname
                 FROM fx_member fm2
                 WHERE fm2.jwcode = fyr.source_jwcode
-                LIMIT 1)=#{beanConsumeArticle.author}
+                LIMIT 1)LIKE CONCAT('%',#{beanConsumeArticle.author}, '%')
             </if>
             <if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
                 AND fyr.source_id =#{beanConsumeArticle.articleId}

src/main/resources/mapper/GoldDetailMapper.xml

@@ -73,13 +73,22 @@
 
     </select>
     <select id="getGold" resultType="com.example.demo.domain.entity.User">
-        select * from user
+        select u.id,u.jwcode,u.name,m.name as market,u.sum_permanent_gold,
+               u.sum_free_june,u.sum_free_december,u.sum_task_gold,
+               u.current_permanent_gold,u.current_free_june,
+               u.current_free_december,u.current_task_gold,
+               u.recharge_num,u.consume_num,
+               u.sum_consume_permanent,u.sum_consume_task,
+               u.sum_consume_free,u.first_recharge,u.create_time,
+               u.update_time
+        from user u
+        left join market m on u.market = m.id
         <where>
             <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
             <if test="markets != null and markets.size > 0">
-                AND user.market IN
+                AND m.name IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>