Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -52,7 +52,10 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public Boolean renewForCallback(StudentPaymentOrder studentPaymentOrder) {
-		studentPaymentOrderDao.update(studentPaymentOrder);
+		int updateCount = studentPaymentOrderDao.update(studentPaymentOrder);
+		if(updateCount <= 0){
+			throw new BizException("订单更新失败");
+		}
 		Integer userId = studentPaymentOrder.getUserId();
 		SysUser sysUser = sysUserFeignService.queryUserById(userId);
 		SporadicChargeInfo info = sporadicChargeInfoDao.get(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));

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

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,10 +22,6 @@ import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.adapay.Pay;
@@ -46,6 +43,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     private VipGroupService vipGroupService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private SporadicChargeInfoService sporadicChargeInfoService;
 
     @Override
     public BaseDAO<Long, StudentPaymentOrder> getDAO() {
@@ -186,6 +185,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             vipGroupService.orderCallback(order);
         } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
             musicGroupService.renewForCallback(order);
+        }else if (order.getType().equals(OrderTypeEnum.SPORADIC)){
+            sporadicChargeInfoService.renewForCallback(order);
         }
     }
 
@@ -214,6 +215,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     vipGroupService.orderCallback(order);
                 } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
                     musicGroupService.renewForCallback(order);
+                }else if (order.getType().equals(OrderTypeEnum.SPORADIC)){
+                    sporadicChargeInfoService.renewForCallback(order);
                 }
             } catch (Exception e) {
                 e.printStackTrace();