Merge remote-tracking branch 'origin/dev' into dev

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/GoodsTransitAppController.java

@@ -1,9 +1,12 @@
 package com.pj.tb_goods_transit;
 
 
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.tb_goods_transit.param.PurchaseLevelOneGoodsTransitParam;
 import com.pj.tb_goods_transit.param.TransactionGoodsParam;
 import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * app端用户添加/上架/下架商品
  * @Author Mechrevo
@@ -23,6 +28,19 @@ public class GoodsTransitAppController {
     @Autowired
     private TbGoodsTransitService tbGoodsTransitService;
 
+    /** 查集合 - 根据APP用户ID查发布的商品（参数为空时代表忽略指定条件） */
+    @RequestMapping("getTransitList")
+//		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
+    public AjaxJson getTransitList() {
+        //获取app登录用户
+        APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+        if(appLoginInfo == null)throw new RuntimeException("当前登陆用户信息已失效!");
+
+        SoMap so = SoMap.getRequestSoMap();
+        so.put("merchantId",appLoginInfo.getLoginId());
+        List<TbGoodsTransit> list = tbGoodsTransitService.getList(so.startPage());
+        return AjaxJson.getPageData(so.getDataCount(), list);
+    }
 
     /** app端用户添加商品 */
     @RequestMapping("transactionGoods")