一级市场

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

@@ -19,6 +19,7 @@ import java.util.List;
 
 /**
  * app端用户添加/上架/下架商品
+ *
  * @Author Mechrevo
  * @Date 2023 07 27 09 31
  **/
@@ -29,63 +30,86 @@ public class GoodsTransitAppController {
     @Autowired
     private TbGoodsTransitService tbGoodsTransitService;
 
-    /** 查 - 根据id */
+    /**
+     * 查 - 根据id
+     */
     @RequestMapping("getById")
 //		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
-    public AjaxJson getById(Long id){
+    public AjaxJson getById(Long id) {
         TbGoodsTransit t = tbGoodsTransitService.getById(id);
         return AjaxJson.getSuccessData(t);
     }
 
-    /** 查集合 - 根据APP用户ID查发布的商品（参数为空时代表忽略指定条件） */
+    /**
+     * 查集合 - 根据APP用户ID查发布的商品（参数为空时代表忽略指定条件）
+     */
     @RequestMapping("getTransitList")
 //		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
     public AjaxJson getTransitList() {
         //获取app登录用户
         APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
-        if(appLoginInfo == null)throw new RuntimeException("当前登陆用户信息已失效!");
+        if (appLoginInfo == null) throw new RuntimeException("当前登陆用户信息已失效!");
 
         SoMap so = SoMap.getRequestSoMap();
-        so.put("merchantId",appLoginInfo.getFk());
-        so.put("deleteStatus" , DeleteStatus.DELETE_STATUS_ON.getCode());
+        so.put("merchantId", appLoginInfo.getFk());
+        so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode());
+        List<TbGoodsTransit> list = tbGoodsTransitService.getList(so.startPage());
+        return AjaxJson.getPageData(so.getDataCount(), list);
+    }
+
+    /**
+     * 一级市场
+     */
+    @RequestMapping("getList")
+    public AjaxJson getList() {
+        SoMap so = SoMap.getRequestSoMap();
+        so.put("goodsStatus", 1);
+        so.put("isOrders", 0);
         List<TbGoodsTransit> list = tbGoodsTransitService.getList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);
     }
 
-    /** 删 */
+    /**
+     * 删
+     */
     @RequestMapping("deleteById")
 //	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_DEL)
-    public AjaxJson deleteById(Long id){
+    public AjaxJson deleteById(Long id) {
         tbGoodsTransitService.delete(id);
         return AjaxJson.getSuccess();
     }
 
-    /** 改 */
+    /**
+     * 改
+     */
     @RequestMapping("update")
 //	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
-    public AjaxJson update(TbGoodsTransit t){
+    public AjaxJson update(TbGoodsTransit t) {
         tbGoodsTransitService.update(t);
         return AjaxJson.getSuccess();
     }
 
-    /** app端用户添加商品 */
+    /**
+     * app端用户添加商品
+     */
     @RequestMapping("transactionGoods")
 //    @SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_ADD)
-    public AjaxJson transactionGoods(TransactionGoodsParam t){
+    public AjaxJson transactionGoods(TransactionGoodsParam t) {
         boolean goods = tbGoodsTransitService.transactionGoods(t);
-        if(goods) return AjaxJson.getSuccess("商品添加成功!");
+        if (goods) return AjaxJson.getSuccess("商品添加成功!");
         return AjaxJson.getError("商品添加失败!");
     }
 
-    /** app端用户上架/下架商品 */
+    /**
+     * app端用户上架/下架商品
+     */
     @RequestMapping("UpOrDownGoods")
 //    @SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_ADD)
-    public AjaxJson UpOrDownGoods(@RequestParam("goodsTransitId")Long goodsTransitId,
-                                  @RequestParam("goodsStatus")Integer goodsStatus){
-        boolean goods = tbGoodsTransitService.UpOrDownGoods(goodsTransitId,goodsStatus);
-        if(goods){
-            if(!goodsStatus.toString().trim().equals("")){
-                if(goodsStatus == 1){
+    public AjaxJson UpOrDownGoods(@RequestParam("goodsTransitId") Long goodsTransitId, @RequestParam("goodsStatus") Integer goodsStatus) {
+        boolean goods = tbGoodsTransitService.UpOrDownGoods(goodsTransitId, goodsStatus);
+        if (goods) {
+            if (!goodsStatus.toString().trim().equals("")) {
+                if (goodsStatus == 1) {
                     return AjaxJson.getSuccess("商品上架成功!");
                 }
                 return AjaxJson.getSuccess("商品下架成功!");
@@ -95,7 +119,6 @@ public class GoodsTransitAppController {
     }
 
 
-
     /**
      * 采购一级市场的商品，
      * 包括加入购物车、购买、支付（暂时不做），
@@ -106,12 +129,11 @@ public class GoodsTransitAppController {
 //    @SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_ADD)
     public AjaxJson purchaseLevelOntGoodsTransit(@Validated @RequestBody PurchaseLevelOneGoodsTransitParam purchaseLevelOneGoodsTransitParam) throws Exception {
         boolean goods = tbGoodsTransitService.purchaseLevelOntGoodsTransit(purchaseLevelOneGoodsTransitParam);
-        if(goods){
+        if (goods) {
             return AjaxJson.getSuccess("提交成功,待商家确认订单!");
         }
         return AjaxJson.getError("提交失败!");
     }
 
 
-
 }