浏览代码

直播订单更新编号

yuhongqi 2 周之前
父节点
当前提交
dceccd55c2

+ 10 - 0
fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -40,6 +40,7 @@ import com.fs.store.mapper.FsWarehousesMapper;
 import com.fs.store.param.*;
 import com.fs.store.service.IFsExpressService;
 import com.fs.store.service.IFsUserService;
+import com.fs.task.LiveTask;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -82,6 +83,8 @@ public class LiveOrderController extends BaseController
     private FsWarehousesMapper fsWarehousesMapper;
     @Autowired
     IErpOrderService erpOrderService;
+    @Autowired
+    private LiveTask liveTask;
 
 
 //    @Autowired
@@ -293,6 +296,13 @@ public class LiveOrderController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/test")
+    public R test()
+    {
+        liveTask.updateExpress();
+        return R.ok();
+    }
+
     @Log(title = "退款", businessType = BusinessType.UPDATE)
 //    @PreAuthorize("@ss.hasPermi('store:storeOrder:refundOrderMoney')")
     @PostMapping("/refundOrderMoney")

+ 1 - 0
fs-service-system/src/main/java/com/fs/live/vo/LiveGoodsVo.java

@@ -22,4 +22,5 @@ public class LiveGoodsVo {
     // 是否收藏
     private Boolean isFavorite;
     private Boolean isShow;
+    private Integer barCode;
 }

+ 1 - 1
fs-service-system/src/main/resources/mapper/live/LiveGoodsMapper.xml

@@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectProductListByOrder" parameterType="com.fs.live.domain.LiveOrder" resultType="com.fs.live.vo.LiveGoodsVo">
 
-        select sp.image as img_url,sp.product_name,sp.price,sp.stock,sp.sales,sp.product_id,sp.ot_price, sp.is_show as fs_status
+        select sp.image as img_url,sp.product_name,sp.price,sp.stock,sp.sales,sp.product_id,sp.ot_price, sp.is_show as fs_status,sp.bar_code
         from fs_store_product sp
         <where>
             sp.product_id = #{productId}