Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -186,5 +186,7 @@ private static final long serialVersionUID=1L;
     private Integer operationType;
     /** 培训计划ID */
     private Integer planId;
+    /** 业务系统订单标识 */
+    private Integer orgSign;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -72,6 +72,7 @@ import com.zhongzheng.modules.top.financial.vo.TopCostTpItemVo;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderAddBo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsAddBo;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheckLog;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
@@ -647,6 +648,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (ObjectUtils.isNotNull(oldOrg)){
             add.setOperationType(oldOrg.getOperationType());
         }
+        //是否总平台已存在
+        TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
+                .eq(TopOldOrder::getInputOrderSn, bo.getInputOrderSn()));
+        if (ObjectUtils.isNotNull(oldOrder)){
+            add.setOrgSign(1);
+        }
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
 

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -690,9 +690,7 @@
             WHERE
                 o.`status` = 1
                 AND o.order_status = 1
-                AND (
-                o.input_order_sn IS NULL
-                OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+                AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
                 <if test="startTime != null and startTime != ''">
                     AND o.create_time &gt;= #{startTime}
                 </if>
@@ -755,9 +753,7 @@
             WHERE
             o.`status` = 1
             AND o.order_status = 1
-            AND (
-            o.input_order_sn IS NULL
-            OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+            AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
             <if test="startTime != null and startTime != ''">
                 AND o.create_time &gt;= #{startTime}
             </if>
@@ -822,9 +818,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -887,9 +881,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -937,9 +929,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1003,9 +993,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1081,10 +1069,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0
-        )
+        AND o.org_sign != 1
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1162,9 +1147,7 @@
         WHERE
             o.`status` = 1
             AND o.order_status = 1
-            AND (
-            o.input_order_sn IS NULL
-            OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0 ) AND o.tenant_id IS NOT NULL
+            AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
             <if test="startTime != null and startTime != ''">
                 AND o.create_time &gt;= #{startTime}
             </if>
@@ -1255,9 +1238,7 @@
                             o.`status` = 1
                           AND o.order_status = 1
                           AND og.refund_status != 2
-                        AND (
-                        o.input_order_sn IS NULL
-                        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+                          AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
                         <if test="startTime != null and startTime != ''">
                             AND o.create_time &gt;= #{startTime}
                         </if>
@@ -1302,9 +1283,7 @@
         AND o.order_status = 1
         AND og.refund_status != 2
         AND og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1441,9 +1420,7 @@
         o.`status` = 1
         AND o.order_status = 1
         AND og.refund_status != 2
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1482,9 +1459,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1576,9 +1551,7 @@
         WHERE
         o.`status` = 1
         AND o.order_status = 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1665,9 +1638,7 @@
         AND o.order_status = 1
         AND og.refund_status != 2
         AND og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -1823,9 +1794,7 @@
                                 )))
                         WHERE
                             og.pay_status != 1
-                            AND (
-                            o.input_order_sn IS NULL
-                            OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+                            AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
                             <if test="startTime != null and startTime != ''">
                                 AND og.create_time &gt;= #{startTime}
                             </if>
@@ -1925,9 +1894,7 @@
                     WHERE
                         og.pay_status != 1
 		AND og.refund_status != 2
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND og.create_time &gt;= #{startTime}
         </if>
@@ -2002,9 +1969,7 @@
         AND o.order_status = 1
         AND og.refund_status != 2
         AND og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND og.create_time &gt;= #{startTime}
         </if>
@@ -2081,10 +2046,7 @@
         )))
         WHERE
         og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1
-        )
+        AND o.org_sign != 1
         AND o.tenant_id IS NOT NULL
         AND og.refund_status != 2
         ) nou
@@ -2204,9 +2166,7 @@
         o.`status` = 1
         AND o.order_status = 1
         AND og.refund_status != 2
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -2346,9 +2306,7 @@
         )))
         WHERE
         og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND og.create_time &gt;= #{startTime}
         </if>
@@ -2443,10 +2401,7 @@
         AND o.order_status = 1
         AND og.refund_status != 2
         AND og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0
-        )
+        AND o.org_sign != 1
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>
@@ -2554,9 +2509,7 @@
 
         WHERE
         og.pay_status != 1
-        AND (
-        o.input_order_sn IS NULL
-        OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) &lt; 1 ) AND o.tenant_id IS NOT NULL
+        AND o.org_sign != 1 AND o.tenant_id IS NOT NULL
         <if test="startTime != null and startTime != ''">
             AND og.create_time &gt;= #{startTime}
         </if>