订单搜索

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -199,6 +199,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .ge(startTime != null, "a.create_time", startTime)
                 .le(endTime != null, "a.create_time", endTime)
                 .eq(null != transCompanyId, "a.trans_company_id", transCompanyId)
+                .eq("a.deleted", 0)
                 .eq(null != goodsId, "c.origin_goods_id", goodsId);
         OrderViewType type = orderPagingSearchParam.getType();
         Assert.notNull(type, () -> Exceptions.clierr("订单类型不能为空"));
@@ -898,7 +899,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
         // 退款
         // 验证订单状态
-        if (PaymentStatus.YiZhiFu.getVal().equals(orderInfo.getPaymentStatus().getVal())) {
+        if (PaymentStatus.YiZhiFu.equals(orderInfo.getPaymentStatus())) {
             RefundRequestDto dto = new RefundRequestDto();
             dto.setOrderId(orderId);
             dto.setRefundAmount(orderInfo.getSettleMoney());

njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml

@@ -399,7 +399,6 @@
                 AND a.create_time <![CDATA[ < ]]> DATE_ADD(CURDATE(), INTERVAL 1 DAY)) t
     </select>
     <select id="transStatistics" resultType="java.util.Map">
-
         SELECT MAX(IF(t_ = 1, c_, 0)) totalCount,
                MAX(IF(t_ = 2, c_, 0)) incCount
         FROM (SELECT COUNT(*) c_, 1 t_

z-doc/服务器.md

@@ -0,0 +1,31 @@
+journalctl -u your-springboot-service -f
+journalctl -u your-springboot-service -n 100
+
+# 查看今天的日志
+
+journalctl -u your-springboot-service --since today
+
+# 查看昨天18点到今天8点的日志
+
+journalctl -u your-springboot-service --since "yesterday 18:00" --until "08:00"
+
+# 只保留最近 7 天的日志
+
+journalctl --vacuum-time=7d
+
+# 限制日志总容量不超过 5GB
+
+journalctl --vacuum-size=5G
+
+# 只保留最近 1000 个日志文件（内部文件，非用户可见）
+
+journalctl --vacuum-files=1000
+
+/home/njzscloud/greenfrog
+/home/njzscloud/greenfrog/html
+/home/njzscloud/localizer
+systemctl start localizer
+systemctl stop localizer
+systemctl start greenfrog
+systemctl stop greenfrog
+systemctl daemon-reload