Merge remote-tracking branch 'origin/main'

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributor/DistributorMapper.java

@@ -132,4 +132,7 @@ public interface DistributorMapper extends BaseMapperX<DistributorDO> {
     }
     @TenantIgnore
     List<DistributorDO> selectChildNo();
+
+
+    List<DistributorDO> selectListByGroupUserId(@Param("userId") Long userId);
 }

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributor/DistributorMapper.xml

@@ -245,4 +245,11 @@
     <select id="selectChildNo" resultType="com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO">
         select * from ota_distributor where deleted = 0 and is_use = 1 and cmb_short_no is not null
     </select>
+
+
+    <select id="selectListByGroupUserId" resultType="com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO">
+        select d.* from ota_distributor d
+                            inner join ota_distributor_category dc on dc.id = d.ota_category_id
+        where d.deleted = 0 and d.is_use = 1   and d.cmb_short_no is not null and dc.deleted  = 0 and dc.user_id = #{userId}
+    </select>
 </mapper>

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

@@ -546,7 +546,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
                         .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
-                        .set(TradeOrderDO::getDeposiStatus, 0)
                         .set(TradeOrderDO::getAuditUser, auditUserDO.getAuditUser())
                         .eq(TradeOrderDO::getId, orderId)
                 );
@@ -650,7 +649,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         .set(TradeOrderDO::getAuditStatus, 0)
                         .set(TradeOrderDO::getOrderStatus, orderStatus)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
-                        .set(TradeOrderDO::getDeposiStatus, 0)
                         .eq(TradeOrderDO::getId, orderId)
                 );
                 Map<String, Object> extMap = new HashMap<>();
@@ -1315,7 +1313,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
                         .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
-                        .set(TradeOrderDO::getDeposiStatus, 0)
                         .set(TradeOrderDO::getDamaged, damaged)
                         .set(TradeOrderDO::getAuditUser, auditUserDO.getAuditUser())
                         .eq(TradeOrderDO::getId, orderId)