ccjgmwz před 3 roky
rodič
revize
c1963b4774

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 54 - 2162
unimall-admin/package-lock.json


+ 11 - 11
unimall-app-api/src/main/java/com/iotechn/unimall/app/quartz/CheckQuartz.java

@@ -72,7 +72,7 @@ public class CheckQuartz {
                             OrderDO updateOrderDO = new OrderDO();
                             updateOrderDO.setStatus(OrderStatusType.CANCELED_SYS.getCode());
                             updateOrderDO.setGmtUpdate(now);
-                            orderBizService.changeOrderStatus(no, OrderStatusType.UNPAY.getCode(), updateOrderDO);
+//                            orderBizService.changeOrderStatus(no, OrderStatusType.UNPAY.getCode(), updateOrderDO);
                         } catch (Exception e) {
                             logger.error("[未付款检测] 异常", e);
                         }
@@ -87,7 +87,7 @@ public class CheckQuartz {
                             OrderDO updateOrderDO = new OrderDO();
                             updateOrderDO.setStatus(OrderStatusType.WAIT_APPRAISE.getCode());
                             updateOrderDO.setGmtUpdate(now);
-                            orderBizService.changeOrderStatus(item, OrderStatusType.WAIT_CONFIRM.getCode(), updateOrderDO);
+//                            orderBizService.changeOrderStatus(item, OrderStatusType.WAIT_CONFIRM.getCode(), updateOrderDO);
                         } catch (Exception e) {
                             logger.error("[未确认检测] 异常", e);
                         }
@@ -129,9 +129,9 @@ public class CheckQuartz {
 
                         // 1.2 检查商品是不是已经下架
                         if (spuDO.getStatus().equals(StatusType.ACTIVE.getCode())) {
-                            if (groupShopMapper.updateById(groupShopDO) <= 0) {
-                                throw new AdminServiceException(ExceptionDefinition.GROUP_SHOP_SPU_UPDATE_SQL_QUERY_ERROR);
-                            }
+//                            if (groupShopMapper.updateById(groupShopDO) <= 0) {
+//                                throw new AdminServiceException(ExceptionDefinition.GROUP_SHOP_SPU_UPDATE_SQL_QUERY_ERROR);
+//                            }
                         }
                     }
                 }
@@ -189,7 +189,7 @@ public class CheckQuartz {
                                     protected void doInTransactionWithoutResult(TransactionStatus transactionStatus) {
                                         try {
                                             //对订单退款保证原子性,仅退款成功的单子,变更状态
-                                            orderBizService.groupShopStatusRefund(orderDO.getOrderNo());
+//                                            orderBizService.groupShopStatusRefund(orderDO.getOrderNo());
                                             logger.info("[团购订单退款] 完成 orderNo:" + orderDO.getOrderNo());
                                         } catch (Exception e) {
                                             logger.error("[团购订单退款] 异常 orderNo:" + orderDO.getOrderNo() + "; errmsg:" + e.getMessage());
@@ -204,10 +204,10 @@ public class CheckQuartz {
                             List<Long> collect = lockOrderList.stream().map(s -> s.getId()).collect(Collectors.toList());
                             OrderDO orderDO = new OrderDO();
                             orderDO.setStatus(OrderStatusType.WAIT_STOCK.getCode());
-                            orderMapper.update(orderDO, (
-                                    new EntityWrapper<OrderDO>()
-                                            .in("id", collect)
-                                            .eq("status", OrderStatusType.GROUP_SHOP_WAIT.getCode())));
+//                            orderMapper.update(orderDO, (
+//                                    new EntityWrapper<OrderDO>()
+//                                            .in("id", collect)
+//                                            .eq("status", OrderStatusType.GROUP_SHOP_WAIT.getCode())));
                         }
 
                     }
@@ -250,7 +250,7 @@ public class CheckQuartz {
                         GroupShopDO groupShopDO = new GroupShopDO();
                         groupShopDO.setStatus(StatusType.LOCK.getCode());
                         groupShopDO.setGmtUpdate(now);
-                        groupShopMapper.update(groupShopDO, (new EntityWrapper<GroupShopDO>().in("spu_id", collect)));
+//                        groupShopMapper.update(groupShopDO, (new EntityWrapper<GroupShopDO>().in("spu_id", collect)));
                     }
                 }
             } catch (Exception e) {

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů