修改 下单加报名

src/main/java/org/rcisoft/business/cmsOrder/service/impl/CmsOrderServiceImpl.java

@@ -10,6 +10,8 @@ import org.rcisoft.app.pay.service.WxPayService;
 import org.rcisoft.business.cmsActivity.dao.CmsActivityRepository;
 import org.rcisoft.business.cmsActivity.entity.CmsActivity;
 import org.rcisoft.business.cmsActivity.service.impl.StockService;
+import org.rcisoft.business.cmsApplication.dao.CmsApplicationRepository;
+import org.rcisoft.business.cmsApplication.entity.CmsApplication;
 import org.rcisoft.business.cmsOrder.dto.OrderActivityDto;
 import org.rcisoft.core.async.AsyncFactory;
 import org.rcisoft.core.exception.CyServiceException;
@@ -77,6 +79,9 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
     @Autowired
     WxPayService wxPayService;
 
+    @Autowired
+    private CmsApplicationRepository applicationRepository;
+
     /**
     * 保存 订单信息表
     * @param cmsOrder
@@ -845,6 +850,24 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                 if (orderDetail.getState().equals(0)) {
                     if (info == null) {
                         baseMapper.insert(orderDetail);
+                        //添加报名信息
+                        CmsApplication application = new CmsApplication();
+                        application.setUserId(orderDetail.getUserId());
+                        application.setActivityId(orderDetail.getGoodsId());
+                        application.setName(orderDetail.getAccount());
+//                        application.setPhone(orderDetail.get);
+                        //0 待支付   1已取消   2退款中   3退款中   4后台退款中   5后台退款中   6退款完成   7后台退款完成   8支付中   9 支付完成   10订单关闭
+//                        if (orderDetail.getStatus().equals(0)||orderDetail.getStatus().equals(2)||orderDetail.getStatus().equals(3)||orderDetail.getStatus().equals(4)||
+//                                orderDetail.getStatus().equals(5)||orderDetail.getStatus().equals(8)||orderDetail.getStatus().equals(9))
+//                            application.setStatus("1");
+//                        else if (orderDetail.getStatus().equals(1)||orderDetail.getStatus().equals(10))
+//                            application.setStatus("2");
+//                        else if (orderDetail.getStatus().equals(6)||orderDetail.getStatus().equals(7))
+//                            application.setStatus("3");
+                        application.setStatus(orderDetail.getApplicationStatus());
+                        application.setApplicationFee(orderDetail.getPayPrice());
+                        application.setOrderId(orderDetail.getBusinessId());
+                        applicationRepository.insert(application);
                         //如果有优惠券，进行核销
 //                        if (orderDetail.getCouponId() != null) {
 //                            UserCouponRelative userCouponRelative = new UserCouponRelative();
@@ -895,6 +918,9 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
         boolean isGetLock = false;
         orderDetail.setUpdateDate(new Date());
         baseMapper.updateById(orderDetail);
+        CmsApplication application = applicationRepository.selectByOrderId(orderDetail.getBusinessId());
+        application.setStatus(orderDetail.getApplicationStatus());
+        applicationRepository.updateById(application);
         //加订单redis锁
         RLock redisLock = redissonClient.getLock(RedisCons.ORDER_REDIS + orderDetail.getBusinessId());
         try {
@@ -918,6 +944,9 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
         boolean isGetLock = false;
         orderDetail.setUpdateDate(new Date());
         baseMapper.updateById(orderDetail);
+        CmsApplication application = applicationRepository.selectByOrderId(orderDetail.getBusinessId());
+        application.setStatus(orderDetail.getApplicationStatus());
+        applicationRepository.updateById(application);
         //订单优惠券退还
 //        if (orderDetail.getCouponId() != null) {
 //            UserCouponRelative userCouponRelative = new UserCouponRelative();
@@ -947,6 +976,9 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
         boolean isGetLock = false;
         orderDetail.setUpdateDate(new Date());
         baseMapper.updateById(orderDetail);
+        CmsApplication application = applicationRepository.selectByOrderId(orderDetail.getBusinessId());
+        application.setStatus(orderDetail.getApplicationStatus());
+        applicationRepository.updateById(application);
         //积分计算
 //        BigDecimal price = orderDetail.getPayPrice();
 //        IntegralAmountRelative relative = integralAmountRelativeRepository.queryIntegralByPrice(price);