Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderPageReqVO.java

@@ -233,6 +233,8 @@ public class TradeOrderPageReqVO extends PageParam {
 
     private String roomModelId;
     private List<String> roomModelIds;
+
+    private List<String> additiveIds;
     private String floor;
 
     private Integer isInsure;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -556,7 +556,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             tradeOrderDO.setDeposiPayTime(oldtradeOrderDO.getDeposiPayTime());
             tradeOrderDO.setDeposiStatus(oldtradeOrderDO.getDeposiStatus());
             tradeOrderDO.setFreeAmount(oldtradeOrderDO.getFreeAmount());
-            tradeOrderDO.setOrderStatus(oldtradeOrderDO.getOrderSort());
+            tradeOrderDO.setOrderStatus(oldtradeOrderDO.getOrderStatus());
             tradeOrderDO.setDiscountId(oldtradeOrderDO.getDiscountId());
             tradeOrderDO.setIsInsure(oldtradeOrderDO.getIsInsure());
             tradeOrderDO.setIsBill(oldtradeOrderDO.getIsBill());
@@ -620,6 +620,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNPAID.getStatus());
             tradeOrderDO.setConfirmDate(LocalDateTime.now());
         }
+        if(oldtradeOrderDO!=null && oldtradeOrderDO.getOrderStatus()==TradeOrderStatusEnum.UNUSED.getStatus()
+            && tradeOrderDO.getOrderStatus() != TradeOrderStatusEnum.TRANSFER.getStatus()){
+            tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.UNUSED.getStatus());
+            tradeOrderDO.setConfirmDate(LocalDateTime.now());
+        }
         OrderJzDO orderJzDO = new OrderJzDO();
         orderJzDO.setId(IdWorker.getId());
         orderJzDO.setOrderId(tradeOrderDO.getId());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1220,7 +1220,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
 //            if (tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
             // 20260529 取消审核流程修改为 销售-计调 二级审核
-            if (tradeOrderDO.getAuditStatus() + 1 == 3) {
+            if (tradeOrderDO.getAuditStatus() + 1 == 3||tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
                 BigDecimal supplementAmount = tradeOrderDO.getRealPayAmount().subtract(damaged);
                 int isSupplement = supplementAmount.compareTo(BigDecimal.ZERO) > 0 ? 0 : 1;
                 try {

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -584,7 +584,12 @@
                 #{item}
             </foreach>
         </if>
-
+        <if test="vo.additiveIds!=null and vo.additiveIds.size()>0">
+            and  tdl.product_id in
+            <foreach collection="vo.additiveIds" item="item" separator=","  open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="vo.externalOrderNo != null and vo.externalOrderNo != ''">
             AND td.external_order_no = #{vo.externalOrderNo}
         </if>