修复当期天数和当期摊销，金额精度问题

src/main/resources/mapper/master/UserCourseBuyDao.xml

@@ -5,64 +5,68 @@
 
     <select id="getUserCourseBuyInfo" resultType="map">
         select w.name,w.tel,w.ctitle,w.cctitle,if(w.startTime is null,'',w.startTime) startTime,if(w.endTime is null,'',w.endTime) endTime,w.totalDays
-        ,w.type,w.payType,w.payTime,w.orderSn,w.days,w.fee,w.remark,w.dayAmount,w.alreadyDay,w.currentDay
-        ,ROUND(alreadyDay*dayAmount,2) alreadyTanxiao,ROUND(currentDay*dayAmount,2) currentTanxiao,ROUND(fee-(alreadyDay*dayAmount)-(currentDay*dayAmount),2) surplusTanxiao
+             ,w.type,w.payType,w.payTime,w.orderSn,w.days,w.fee,w.remark,w.dayAmount,w.alreadyDay,w.currentDay
+             ,ROUND(alreadyDay*dayAmount,2) alreadyTanxiao
+             ,ROUND(if(alreadyDay+currentDay=totalDays,fee-ROUND(alreadyDay*dayAmount,2),currentDay*dayAmount),2) currentTanxiao
+             ,ROUND(fee-(alreadyDay*dayAmount)-ROUND(if(alreadyDay+currentDay=totalDays,fee-ROUND(alreadyDay*dayAmount,2),currentDay*dayAmount),2),2) surplusTanxiao
         from (
-        select q.*
-        ,IF(days-alreadyDay=0,0,IF(beginDay=0,IF(startTime is NULL,0,IF(days-alreadyDay>=monthDays,if(DATE_FORMAT(startTime, '%Y-%m') = SUBSTR(#{date},1,7),DATEDIFF(#{date},startTime)+1,monthDays),days-alreadyDay)),IF(beginDay-alreadyTotalDay>monthDays,0,monthDays-(beginDay-alreadyTotalDay-1)))) currentDay
-        from (
-        select s.*
-        ,IF(alreadyTotalDay>beginDay,IF(beginDay=0,IF(alreadyTotalDay &lt; days,alreadyTotalDay,days),alreadyTotalDay-beginDay+1),0) alreadyDay
-        ,SUBSTR(#{date},9) monthDays
-        from (
-        select t.*
-        ,IF(startTime is NULL,0,ROUND(fee/days,2)) dayAmount
-        ,IF(startTime is NULL,0,IF(DATE_FORMAT(startTime,'%Y-%m')>=SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(endTime,'%Y-%m') &lt; SUBSTR(#{date},1,7),days,DATEDIFF(CONCAT(SUBSTR(#{date},1,7),'-01'),startTime)))) alreadyTotalDay
-        from (
-        select u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,c.title ctitle,cc.title cctitle,
-        ucb.days totalDays,ucb.start_time startTime,ucb.end_time endTime,
-        ucbl.type,ucbl.pay_type payType,ucbl.pay_time payTime,ucbl.order_sn orderSn,
-        ucbl.begin_day beginDay,ucbl.days days,ucbl.fee,ucbl.remark
-        from user_course_buy_log ucbl
-        left join user_course_buy ucb on ucb.id = ucbl.user_course_buy_id
-        left join user u on u.id = ucb.user_id
-        left join course c on c.id = ucb.course_id
-        left join course_catalogue cc on cc.id = ucb.catalogue_id
-        where ucbl.del_flag = 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') &lt;= #{date}
-        order by ucb.id
-        ) t) s) q) w
+                 select q.*
+                      ,IF(days-alreadyDay=0,0,IF(beginDay=0,IF(startTime is NULL,0,IF(days-alreadyDay>=monthDays,if(DATE_FORMAT(startTime,'%Y-%m')=SUBSTR(#{date},1,7),DATEDIFF(#{date},startTime)+1,monthDays),if(DATE_FORMAT(startTime, '%Y-%m')=SUBSTR(#{date},1,7),DATEDIFF(#{date},startTime)+1,days-alreadyDay))),IF(beginDay-alreadyTotalDay>monthDays,0,monthDays-(beginDay-alreadyTotalDay-1)))) currentDay
+                 from (
+                          select s.*
+                               ,IF(alreadyTotalDay>beginDay,IF(beginDay=0,IF(alreadyTotalDay &lt; days,alreadyTotalDay,days),alreadyTotalDay-beginDay+1),0) alreadyDay
+                               ,SUBSTR(#{date},9) monthDays
+                          from (
+                                   select t.*
+                                        ,IF(startTime is NULL,0,ROUND(fee/days,2)) dayAmount
+                                        ,IF(startTime is NULL,0,IF(DATE_FORMAT(startTime,'%Y-%m')>=SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(endTime,'%Y-%m') &lt; SUBSTR(#{date},1,7),days,DATEDIFF(CONCAT(SUBSTR(#{date},1,7),'-01'),startTime)))) alreadyTotalDay
+                                   from (
+                                            select u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,c.title ctitle,cc.title cctitle,
+                                                   ucb.days totalDays,ucb.start_time startTime,ucb.end_time endTime,
+                                                   ucbl.type,ucbl.pay_type payType,ucbl.pay_time payTime,ucbl.order_sn orderSn,
+                                                   ucbl.begin_day beginDay,ucbl.days days,ucbl.fee,ucbl.remark
+                                            from user_course_buy_log ucbl
+                                                     left join user_course_buy ucb on ucb.id = ucbl.user_course_buy_id
+                                                     left join user u on u.id = ucb.user_id
+                                                     left join course c on c.id = ucb.course_id
+                                                     left join course_catalogue cc on cc.id = ucb.catalogue_id
+                                            where ucbl.del_flag = 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') &lt;= #{date}
+                                            order by ucb.id
+                                        ) t) s) q) w
     </select>
 
     <select id="getUserCourseBuyInfoTotal" resultType="map">
         select ROUND(SUM(fee),2) fee,ROUND(SUM(alreadyTanxiao),2) alreadyTanxiao,ROUND(SUM(currentTanxiao),2) currentTanxiao,ROUND(SUM(surplusTanxiao),2) surplusTanxiao
         from (
-        select w.name,w.tel,w.ctitle,w.cctitle,w.startTime,w.endTime,w.totalDays
-        ,w.type,w.payType,w.payTime,w.orderSn,w.days,w.fee,w.remark,w.dayAmount,w.alreadyDay,w.currentDay
-        ,ROUND(alreadyDay*dayAmount,2) alreadyTanxiao,ROUND(currentDay*dayAmount,2) currentTanxiao,ROUND(fee-(alreadyDay*dayAmount)-(currentDay*dayAmount),2) surplusTanxiao
-        from (
-        select q.*
-        ,IF(days-alreadyDay=0,0,IF(beginDay=0,IF(startTime is NULL,0,IF(days-alreadyDay>=monthDays,monthDays,days-alreadyDay)),IF(beginDay-alreadyTotalDay>monthDays,0,monthDays-(beginDay-alreadyTotalDay-1)))) currentDay
-        from (
-        select s.*
-        ,IF(alreadyTotalDay>beginDay,IF(beginDay=0,IF(alreadyTotalDay &lt; days,alreadyTotalDay,days),alreadyTotalDay-beginDay+1),0) alreadyDay
-        ,SUBSTR(#{date},9) monthDays
-        from (
-        select t.*
-        ,IF(startTime is NULL,0,ROUND(fee/days,2)) dayAmount
-        ,IF(startTime is NULL,0,IF(DATE_FORMAT(startTime,'%Y-%m')>=SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(endTime,'%Y-%m') &lt; SUBSTR(#{date},1,7),days,DATEDIFF(CONCAT(SUBSTR(#{date},1,7),'-01'),startTime)))) alreadyTotalDay
-        from (
-        select u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,c.title ctitle,cc.title cctitle,
-        ucb.days totalDays,ucb.start_time startTime,ucb.end_time endTime,
-        ucbl.type,ucbl.pay_type payType,ucbl.pay_time payTime,ucbl.order_sn orderSn,
-        ucbl.begin_day beginDay,ucbl.days days,ucbl.fee,ucbl.remark
-        from user_course_buy_log ucbl
-        left join user_course_buy ucb on ucb.id = ucbl.user_course_buy_id
-        left join user u on u.id = ucb.user_id
-        left join course c on c.id = ucb.course_id
-        left join course_catalogue cc on cc.id = ucb.catalogue_id
-        where ucbl.del_flag = 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') &lt;= #{date}
-        order by ucbl.pay_time
-        ) t) s) q) w
+                 select w.name,w.tel,w.ctitle,w.cctitle,if(w.startTime is null,'',w.startTime) startTime,if(w.endTime is null,'',w.endTime) endTime,w.totalDays
+                      ,w.type,w.payType,w.payTime,w.orderSn,w.days,w.fee,w.remark,w.dayAmount,w.alreadyDay,w.currentDay
+                      ,ROUND(alreadyDay*dayAmount,2) alreadyTanxiao
+                      ,ROUND(if(alreadyDay+currentDay=totalDays,fee-ROUND(alreadyDay*dayAmount,2),currentDay*dayAmount),2) currentTanxiao
+                      ,ROUND(fee-(alreadyDay*dayAmount)-ROUND(if(alreadyDay+currentDay=totalDays,fee-ROUND(alreadyDay*dayAmount,2),currentDay*dayAmount),2),2) surplusTanxiao
+                 from (
+                          select q.*
+                               ,IF(days-alreadyDay=0,0,IF(beginDay=0,IF(startTime is NULL,0,IF(days-alreadyDay>=monthDays,if(DATE_FORMAT(startTime,'%Y-%m')=SUBSTR(#{date},1,7),DATEDIFF(#{date},startTime)+1,monthDays),if(DATE_FORMAT(startTime, '%Y-%m')=SUBSTR(#{date},1,7),DATEDIFF(#{date},startTime)+1,days-alreadyDay))),IF(beginDay-alreadyTotalDay>monthDays,0,monthDays-(beginDay-alreadyTotalDay-1)))) currentDay
+                          from (
+                                   select s.*
+                                        ,IF(alreadyTotalDay>beginDay,IF(beginDay=0,IF(alreadyTotalDay &lt; days,alreadyTotalDay,days),alreadyTotalDay-beginDay+1),0) alreadyDay
+                                        ,SUBSTR(#{date},9) monthDays
+                                   from (
+                                            select t.*
+                                                 ,IF(startTime is NULL,0,ROUND(fee/days,2)) dayAmount
+                                                 ,IF(startTime is NULL,0,IF(DATE_FORMAT(startTime,'%Y-%m')>=SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(endTime,'%Y-%m') &lt; SUBSTR(#{date},1,7),days,DATEDIFF(CONCAT(SUBSTR(#{date},1,7),'-01'),startTime)))) alreadyTotalDay
+                                            from (
+                                                     select u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,c.title ctitle,cc.title cctitle,
+                                                            ucb.days totalDays,ucb.start_time startTime,ucb.end_time endTime,
+                                                            ucbl.type,ucbl.pay_type payType,ucbl.pay_time payTime,ucbl.order_sn orderSn,
+                                                            ucbl.begin_day beginDay,ucbl.days days,ucbl.fee,ucbl.remark
+                                                     from user_course_buy_log ucbl
+                                                              left join user_course_buy ucb on ucb.id = ucbl.user_course_buy_id
+                                                              left join user u on u.id = ucb.user_id
+                                                              left join course c on c.id = ucb.course_id
+                                                              left join course_catalogue cc on cc.id = ucb.catalogue_id
+                                                     where ucbl.del_flag = 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') &lt;= #{date}
+                                                     order by ucb.id
+                                                 ) t) s) q) w
         ) e
     </select>