Переглянути джерело

优化,审核角色配置,取消订单、审核不通过回退库存操作

lishiqiang 2 тижнів тому
батько
коміт
f3d298b37d

+ 3 - 0
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -41,6 +41,9 @@ public class TradeOrderRespNewVO {
     @Schema(description = "销售员ID")
     private String sellerId;
 
+    @Schema(description = "是否显示审核流程")
+    private Integer isShowAudit;
+
     @Schema(description = "订单号")
     @ExcelProperty("订单号")
     private String orderNo;

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

@@ -2477,7 +2477,7 @@
         order by num desc
     </select>
     <select id="queryOrderByLast" resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO">
-        SELECT  * FROM trade_order WHERE order_no = #{orderNo}  ORDER BY update_time DESC limit 1
+        SELECT  * FROM trade_order WHERE order_no = #{orderNo} and deleted = 1  ORDER BY update_time DESC limit 1
     </select>
 
     <select id="queryOrderById" resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO">