Merge branch 'dev' into test

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -333,7 +333,7 @@ public class RedisTask {
                     redisUtil.delete(o);
                     throw new BaseException("订单不存在！");
                 }
-
+                //权益返利活动
                 equityFundExcessService.extracted(sOrder);
                 if (extracted(o, sOrders, sOrder)) return;
                 //更改订单状态
@@ -686,7 +686,7 @@ public class RedisTask {
         if (CollectionUtil.isNotEmpty(ids)){
             equityFundExcessService.removeByIds(ids);
         }
-        logger.debug("AutoProgressLog:权益金增加结束");
+        logger.debug("AutoEquityFundExcess:权益金增加结束");
     }
 
 

share-system/src/main/java/share/system/service/impl/CallbackServiceImpl.java

@@ -637,7 +637,7 @@ public class CallbackServiceImpl implements CallbackService {
                         logger.error("微信支付回调出错");
                         logger.error(e.toString());
                     }
-                    logger.debug("结束权益会员订单回调");
+                    logger.debug("结束次卡订单回调");
                     if (!secondaryCardBoolean) {
                         logger.error("saobei wechat pay error : 订单更新失败==》" + param.getTerminal_trace());
                         responseVo.setReturn_code(SaobeiStatusEnum.FAIL.getCode());
@@ -715,7 +715,7 @@ public class CallbackServiceImpl implements CallbackService {
                         logger.error("微信支付回调出错");
                         logger.error(e.toString());
                     }
-                    logger.debug("结束权益会员订单回调");
+                    logger.debug("结束月卡订单回调");
                     if (!monthlyCardBoolean) {
                         logger.error("saobei wechat pay error : 订单更新失败==》" + param.getTerminal_trace());
                         responseVo.setReturn_code(SaobeiStatusEnum.FAIL.getCode());

share-system/src/main/java/share/system/service/impl/MonthlyCardOrderServiceImpl.java

@@ -159,6 +159,7 @@ public class MonthlyCardOrderServiceImpl extends ServiceImpl<MonthlyCardOrderMap
 
     @Override
     public void paymentSuccessful(MonthlyCardOrder monthlyCardOrder) {
+        updateById(monthlyCardOrder);
         ConsumerMonthlyCard consumerMonthlyCard = new ConsumerMonthlyCard();
         MonthlyCardConf byId = monthlyCardConfService.getById(monthlyCardOrder.getMonthlyCardConfId());
         consumerMonthlyCard.setMonthlyCardConfId(byId.getId());

share-system/src/main/java/share/system/service/impl/SecondaryCardOrderServiceImpl.java

@@ -149,6 +149,7 @@ public class SecondaryCardOrderServiceImpl extends ServiceImpl<SecondaryCardOrde
 
     @Override
     public void paymentSuccessful(SecondaryCardOrder secondaryCardOrder) {
+        updateById(secondaryCardOrder);
         ConsumerSecondaryCard consumerSecondaryCard = new ConsumerSecondaryCard();
         SecondaryCardConf secondaryCardConf = secondaryCardConfService.getById(secondaryCardOrder.getSecondaryCardConfId());
         consumerSecondaryCard.setSecondaryCardConfId(secondaryCardOrder.getSecondaryCardConfId());