月度奖金接口调试

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/MonthAwardMapper.java

@@ -35,5 +35,10 @@ public interface MonthAwardMapper extends BaseMapper<MonthAward> {
      */
     int delById(Integer id);
 
+    /**
+     * 获取本月 月度奖金
+     * @param yearMonth 年月
+     * @return 月度奖金
+     */
     MonthAward getByTime(@Param("yearMonth")Date yearMonth);
 }

wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml

@@ -93,9 +93,8 @@
         <include refid="table"/>
         <where>
             <if test="yearMonth != null">
-                AND(
                 YEAR(create_time) = YEAR(#{yearMonth})
-                AND MONTH(create_time) = MONTH(#{yearMonth}))
+                AND MONTH(create_time) = MONTH(#{yearMonth})
             </if>
             order by create_time desc
             limit 1

wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml

@@ -141,7 +141,7 @@
         from
         <include refid="table"/>
         <where>
-            (type=2 or status=0)
+            (trade_type=2 or status=0)
             <if test="userId">
                 and user_id=#{userId}
             </if>

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MonthAwardServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
+import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.MonthAwardMapper;
 import cn.wisenergy.mapper.TradeRecordMapper;
@@ -20,6 +21,8 @@ import java.util.Date;
 @Slf4j
 @Service
 public class MonthAwardServiceImpl extends ServiceImpl<MonthAwardMapper, MonthAward> implements MonthAwardService {
+    private static final String PATTERN = "yyyy-MM";
+
     @Autowired
     private TradeRecordMapper tradeRecordMapper;