Browse Source

添加屏蔽显示商品功能

soobin 2 years ago
parent
commit
28a24bff6e

+ 15 - 21
src/main/java/com/szwl/controller/TProductController.java

@@ -4,11 +4,11 @@ package com.szwl.controller;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import com.gexin.fastjson.JSON;
 import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.model.bean.TProductBean;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,9 +16,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TProduct;
-import com.szwl.model.entity.TPromoCode;
-//import com.szwl.model.page.Pageable;
-import com.szwl.model.page.TProductPageable;
+
 import com.szwl.model.query.TEquipmentParam;
 import com.szwl.model.utils.PushUtils;
 import com.szwl.service.TAdminService;
@@ -69,10 +67,10 @@ public class TProductController {
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(true).setData(list).setMessage("SUCCESS"));
     }
-    //修改花型是否显示
+
     @ApiOperation(value = "修改花型是否显示")
     @PostMapping("/updateProductsShow")
-    public ResponseEntity<?> updateProductsShow(@RequestBody String productList) {
+    public ResponseModel<?> updateProductsShow(@RequestBody String productList) {
 
         List<TProduct> products = new ArrayList<>();
         JSONObject jsonObject = JSONObject.parseObject(productList);
@@ -80,34 +78,30 @@ public class TProductController {
         if(products.size()>0){
             TProduct tProduct = products.get(0);
             if(tProduct==null&&tProduct.getEquipmentId()==null){
-                return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(false).setData("").setMessage("请退出重试"));
+                return R.fail(ResponseCodesEnum.A0001,"找不到当前设备");
             }
         }
         TEquipment equipment = tEquipmentService.getById(products.get(0).getEquipmentId());
         if(equipment==null){
-            return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData("").setMessage("请退出重试"));
+            return R.fail(ResponseCodesEnum.A0001,"请退出重试");
         }
-        List<TProduct> list = new ArrayList<>();
+        List<TProductBean> list = new ArrayList<>();
         for(TProduct product:products){
+            TProductBean productBean = new TProductBean();
             if(product!=null&&product.getId()!=null){
-//                tProductService.updateById(product);
+                productBean.setShowType(product.getShowType());
                 if(StringUtils.isEmpty(product.getShowType())){
-                    product.setShowType("0");
+                    productBean.setShowType("0");
                 }
-                product.setModifyDate(null);
-                product.setCreateDate(null);
-                product.setCodePrice(null);
-                product.setRmbPrice(null);
-                list.add(product);
-//                tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsShow", product.toString()).toString());
+                productBean.setProductName(product.getProductName());
+                list.add(productBean);
             }
         }
         tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsShow", JSON.toJSONString(list)).toString());
-        return ResponseEntity.status(HttpStatus.OK)
-                .body(new ResultMessage().setCode(true).setData("").setMessage("修改成功"));
+        tProductService.updateBatchById(products);
+        return R.ok(null,"修改成功");
     }
+
     @ApiOperation(value = "/多个花型价格")
     @GetMapping("/updateProduct")
     public ResponseModel<?> updateProduct(String no,String price,String equipmentId,String type) {

+ 26 - 0
src/main/java/com/szwl/model/bean/TProductBean.java

@@ -0,0 +1,26 @@
+package com.szwl.model.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class TProductBean {
+
+
+    @ApiModelProperty(value="")
+    private String productName;
+
+    @ApiModelProperty(value="")
+    private String no;
+
+    @ApiModelProperty(value="是否显示")
+    private String showType;
+}