Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SporadicChargeInfoImpl.java

@@ -68,7 +68,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
 		if(studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS){
 			//活动，增加课程余额
 			if(info.getChargeType().equals("6")){
-				sysUserCashAccountService.appendCourseBalance(userId,info.getAmount());
+				sysUserCashAccountService.appendCourseBalance(userId,studentPaymentOrder.getActualAmount());
 			}
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_SPORADIC_PAYMENT_SUCCESS, map, null, 0, "1",
 					studentPaymentOrder.getActualAmount(),info.getTitle());

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -497,6 +497,6 @@
     </resultMap>
     <select id="getLuckStatis" resultMap="luckStatis">
         SELECT o.name_ organName, SUM(spo.actual_amount_) money ,COUNT(spo.id_) nums FROM student_payment_order spo LEFT JOIN organization o ON o.id_=spo.organ_id_
-        WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_
+        WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY spo.organ_id_
     </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -307,6 +307,6 @@ public class StudentOrderController extends BaseController {
         luckStatisDto.setOrderStatisDtoList(orders);
         luckStatisDto.setTotalNum(totalNum);
         luckStatisDto.setTotalMoney(totalMoney);
-        return  succeed(luckStatisDto);
+        return succeed(luckStatisDto);
     }
 }