修改 下单加报名

src/main/java/org/rcisoft/app/pay/service/impl/WxPayServiceImpl.java

@@ -205,6 +205,7 @@ public class WxPayServiceImpl implements WxPayService {
                     //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 支付中
                     orderDetail.setState(0);
                     orderDetail.setStatus(8);
+                    orderDetail.setApplicationStatus("1");
                     cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY +":"+ orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(),orderDetail);
                     //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
 //                    rabbitClusterUtil.sendMsg(orderDetail, rabbitMQConfigBean.ORDER_EXCHANGE_NAME,rabbitMQConfigBean.ORDER_STATUS_QUEUE_NAME);
@@ -247,6 +248,7 @@ public class WxPayServiceImpl implements WxPayService {
                     //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 待支付
                     orderDetail.setState(0);
                     orderDetail.setStatus(0);
+                    orderDetail.setApplicationStatus("1");
                     cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY +":"+ orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(),orderDetail);
                     //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
 //                    rabbitClusterUtil.sendMsg(orderDetail, rabbitMQConfigBean.ORDER_EXCHANGE_NAME,rabbitMQConfigBean.ORDER_STATUS_QUEUE_NAME);
@@ -376,13 +378,16 @@ public class WxPayServiceImpl implements WxPayService {
                                     log.error("实际付款金额与订单金额不符");
                                     orderDetail.setState(0);
                                     orderDetail.setStatus(0);
+                                    orderDetail.setApplicationStatus("1");
                                 } else {
                                     orderDetail.setState(0);
                                     orderDetail.setStatus(9);
+                                    orderDetail.setApplicationStatus("1");
                                 }
                             } else {
                                 orderDetail.setState(0);
                                 orderDetail.setStatus(0);
+                                orderDetail.setApplicationStatus("1");
                             }
                             //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 支付中
                             cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(), orderDetail);
@@ -528,6 +533,7 @@ public class WxPayServiceImpl implements WxPayService {
                                     orderDetail.setStatus(6);
                                 else
                                     orderDetail.setStatus(7);
+                                orderDetail.setApplicationStatus("3");
                                 orderDetail.setState(0);
     //                           //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 支付中
                                 cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(), orderDetail);

src/main/java/org/rcisoft/business/cmsApplication/dao/CmsApplicationRepository.java

@@ -27,5 +27,7 @@ public interface CmsApplicationRepository extends CyBaseMapper<CmsApplication> {
     List<CmsApplication> queryCmsApplication(@Param("entity") CmsApplication cmsApplication);
 
     IPage<CmsApplication> queryCmsApplicationPaged(CyPageInfo cyPageInfo, @Param("entity") CmsApplication cmsApplication);
+
+    CmsApplication selectByOrderId(Long orderId);
 }
 

src/main/java/org/rcisoft/business/cmsApplication/entity/CmsApplication.java

@@ -78,6 +78,13 @@ public class CmsApplication extends CyIdIncreEntity<CmsApplication> {
     private BigDecimal applicationFee;
 
 
+    /**
+     * @desc 订单id
+     * @column application_fee
+     * @default
+     */
+    @TableField("order_id")
+    private Long orderId;
 
 }
 

src/main/java/org/rcisoft/business/cmsOrder/entity/CmsOrder.java

@@ -221,5 +221,9 @@ public class CmsOrder  extends CyIdSnowflakeEntity<CmsOrder> {
      @Transient
      @TableField(exist = false)
      private List<OrderActivityDto> dtos;
+
+     @Transient
+     @TableField(exist = false)
+     private String applicationStatus;
 }
 

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

@@ -159,6 +159,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                 orderInfo.setPrice(BigDecimal.ZERO);
                 orderInfo.setPayPrice(BigDecimal.ZERO);
                 orderInfo.setStatus(9);
+                orderInfo.setApplicationStatus("1");
             }
             orderInfo.setType(1);
             orderInfo.setOrderTime(new Date());
@@ -216,7 +217,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
     private void calculatePrice(CmsOrder orderInfo, CmsActivity info) {
         BigDecimal price = info.getApplicationFee().multiply(BigDecimal.valueOf(orderInfo.getNum())).setScale(2, BigDecimal.ROUND_DOWN);
         orderInfo.setStatus(0);
-
+        orderInfo.setApplicationStatus("1");
         //查询会员折扣
         BigDecimal discount = new BigDecimal("100.00");
 //        discount = memberDiscount(discount);
@@ -258,6 +259,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
 //        }
         if (orderInfo.getPayPrice().compareTo(BigDecimal.ZERO) <= 0){
             orderInfo.setStatus(9);
+            orderInfo.setApplicationStatus("1");
         }
     }
 
@@ -381,6 +383,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                         if (status.equals(0) || status.equals(9) || status.equals(11)) { //如果订单是待支付、支付完成才能取消订单
                             orderDetail.setState(0);
                             orderDetail.setStatus(1);
+                            orderDetail.setApplicationStatus("2");
                             cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderInfo.getGoodsId() + ":" + orderInfo.getBusinessId(), orderDetail);
                             //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
 //                            rabbitClusterUtil.sendMsg(orderDetail, rabbitMQConfigBean.ORDER_EXCHANGE_NAME, rabbitMQConfigBean.ORDER_STATUS_QUEUE_NAME);
@@ -527,6 +530,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                                     orderDetail.setStatus(6);
                                 else if (orderDetail.getStatus().equals(4))
                                     orderDetail.setStatus(7);
+                                orderDetail.setApplicationStatus("3");
                                 //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 退款完成
                                 cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(), orderDetail);
                                 //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
@@ -591,6 +595,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                             if (orderDetail.getStatus().equals(8)) {
                                 orderDetail.setState(0);
                                 orderDetail.setStatus(9);
+                                orderDetail.setApplicationStatus("1");
                                 //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 支付完成
                                 cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(), orderDetail);
                                 //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
@@ -625,6 +630,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                             if (orderDetail.getStatus().equals(8)) {
                                 orderDetail.setState(0);
                                 orderDetail.setStatus(0);
+                                orderDetail.setApplicationStatus("1");
                                 //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 支付完成
                                 cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(), orderDetail);
                                 //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
@@ -667,6 +673,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                             //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 待支付
                             orderDetail.setState(0);
                             orderDetail.setStatus(0);
+                            orderDetail.setApplicationStatus("1");
                             cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY +":"+ orderDetail.getGoodsId() + ":" + orderDetail.getBusinessId(),orderDetail);
                             //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
 //                            rabbitClusterUtil.sendMsg(orderDetail, rabbitMQConfigBean.ORDER_EXCHANGE_NAME,rabbitMQConfigBean.ORDER_STATUS_QUEUE_NAME);
@@ -800,6 +807,7 @@ public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderRepository,CmsOrder
                             Integer refundCount = orderRedis.getRefundCount();
                             orderRedis.setRefundCount(refundCount + 1);
                         }
+                        orderRedis.setApplicationStatus("1");
                         //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 退款中 (2 3)
                         cyRedisServiceImpl.set(RedisCons.ORDER_ACTIVITY + ":" + orderRedis.getGoodsId() + ":" + orderRedis.getBusinessId(), orderRedis);
                         //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】

src/main/java/org/rcisoft/core/async/AsyncFactory.java

@@ -162,6 +162,7 @@ public class AsyncFactory
                                 orderInfo.setStatus(3);
                             orderInfo.setRefundCount(1);
                         }
+                        orderInfo.setApplicationStatus("1");
                         //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 退款中 (2 3)
                         CySpringBeanComp.getBean(CyRedisServiceImpl.class).set(RedisCons.ORDER_ACTIVITY +":"+ orderInfo.getGoodsId() + ":" + orderInfo.getBusinessId(),orderInfo);
                         //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】

src/main/java/org/rcisoft/core/rabbitmq/OrderActivityCloseRabbitListener.java

@@ -86,6 +86,7 @@ public class OrderActivityCloseRabbitListener {
                         if (orderDetail.getState().equals(0) && orderDetail.getStatus().equals(0)) {
                             //如果订单待支付，则关闭订单
                             orderDetail.setStatus(10);
+                            orderDetail.setApplicationStatus("2");
                             orderDetail.setUpdateDate(new Date());
                             //查询DB -> 是否已落库
                             CmsOrder info = orderRepository.selectById(orderInfo.getBusinessId());

src/main/resources/mapper/business/cmsApplication.mapper/CmsApplicationMapper.xml

@@ -128,6 +128,9 @@
         </if>
         ORDER BY business_id DESC
     </select>
+    <select id="selectByOrderId" resultType="org.rcisoft.business.cmsApplication.entity.CmsApplication">
+        select * from cms_application where order_id = #{orderId}
+    </select>
 
     <update id="deleteCmsApplication" parameterType="java.lang.Integer">
         update cms_application