询价后台管理接口

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -13,6 +13,7 @@ import com.uas.ps.inquiry.model.PurcInquiry;
 import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
+import com.uas.ps.inquiry.page.criteria.PredicateUtils;
 import com.uas.ps.inquiry.service.AttachService;
 import com.uas.ps.inquiry.service.InquiryForSaleService;
 import com.uas.ps.inquiry.service.PublicInquiryService;
@@ -70,6 +71,12 @@ public class PublicInquiryController {
             List<Long> distribute = JSONObject.parseArray(distributes, Long.class);
             searchFilter.setDistribute(distribute);
         }
+        // 询价单主列表接口，默认限制询价单为有效状态
+        if (null != searchFilter.getValid()) {
+            pageInfo.expression(PredicateUtils.eq("valid", searchFilter.getValid(), false));
+        } else {
+            pageInfo.expression(PredicateUtils.eq("valid", Constant.YES, false));
+        }
         IPage<PurcInquiryItemInfo> page = publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
         log.info("公共询价, 查询公共询价信息, UserUU: {}, EnUU: {}, 报价的应用来源: {}",  searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
         log.info("/inquiry/public 耗时:{}", (System.currentTimeMillis() - start));
@@ -311,6 +318,24 @@ public class PublicInquiryController {
         return map;
     }
 
+    /**
+     * 公共询价单明细设置禁用或反禁用
+     *                  B2C-admin
+     * @param id 询价明细id
+     * @param valid 是否生效状态 1为是，0为否
+     * @return
+     */
+    @RequestMapping(value = "/deleteItem", method = RequestMethod.POST)
+    public ModelMap deleteItems(Long id, Integer valid) {
+        long start = System.currentTimeMillis();
+        if (null == valid) {
+            valid = 0;
+        }
+        ModelMap map = publicInquiryService.deleteItems(id, valid);
+        log.info("/inquiry/public/deleteItems 耗时:{}", (System.currentTimeMillis() - start));
+        return map;
+    }
+
     /* ===========================================app接口start============================================================ */
 
     /**

src/main/java/com/uas/ps/inquiry/dao/InquiryRemindDao.java

@@ -68,6 +68,15 @@ public interface InquiryRemindDao extends JpaRepository<InquiryRemind, Long>, Jp
      */
     List<InquiryRemind> findByVendUserUUAndVendUUAndItemId(Long vendUserUU, Long vendUU, Long itemId);
 
+    /**
+     * 通过发布企业UU，询价明细id查询商机list
+     *
+     * @param enUU     发布询价企业UU
+     * @param itemId     来源id
+     * return 商机list
+     */
+    List<InquiryRemind> findByItemIdAndEnUU(Long itemId, Long enUU);
+
     /**
      * 查出昨晚17点到今早九点的询价信息
      *

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItem.java

@@ -251,6 +251,12 @@ public class PurcInquiryItem {
 	@Column(name = "id_cust_currency")
 	private String custCurrency;
 
+	/**
+	 * 是否有效  1有效  0 无效
+	 */
+	@Column(name = "id_valid", columnDefinition = "TINYINT DEFAULT 1")
+	private Integer valid;
+
 	public Long getId() {
 		return id;
 	}
@@ -589,7 +595,16 @@ public class PurcInquiryItem {
 				", endDate=" + endDate +
 				", remainingTime=" + remainingTime +
 				", custCurrency='" + custCurrency + '\'' +
+				", valid=" + valid +
 				'}';
 	}
 
+	public Integer getValid() {
+		return valid;
+	}
+
+	public void setValid(Integer valid) {
+		this.valid = valid;
+	}
+
 }

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItemInfo.java

@@ -275,6 +275,12 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_cust_currency")
 	private String custCurrency;
 
+	/**
+	 * 是否有效  1有效  0 无效
+	 */
+	@Column(name = "id_valid", columnDefinition = "TINYINT DEFAULT 1")
+	private Integer valid;
+
 	/**
 	 * 分配状态  1为已分配 0 为未分配
 	 */
@@ -629,6 +635,8 @@ public class PurcInquiryItemInfo {
 		this.quotation = quotation;
 	}
 
+
+
 	@Override
 	public String toString() {
 		return "PurcInquiryItemInfo{" +
@@ -673,7 +681,17 @@ public class PurcInquiryItemInfo {
 				", qutations=" + qutations +
 				", quotation=" + quotation +
 				", custCurrency='" + custCurrency + '\'' +
+				", valid=" + valid +
 				", allotStatus=" + allotStatus +
 				'}';
 	}
+
+	public Integer getValid() {
+		return valid;
+	}
+
+	public void setValid(Integer valid) {
+		this.valid = valid;
+	}
+
 }

src/main/java/com/uas/ps/inquiry/page/SearchFilter.java

@@ -1,7 +1,6 @@
 package com.uas.ps.inquiry.page;
 
 import java.util.Collection;
-import java.util.List;
 
 /**
  * 单据查询搜索条件
@@ -80,6 +79,11 @@ public class SearchFilter {
 	 */
 	private Integer enableOffer;
 
+	/**
+	 * 是否有效 1为是 0为否
+	 */
+	private Integer valid;
+
 	public Integer getEnableOffer() {
 		return enableOffer;
 	}
@@ -177,4 +181,12 @@ public class SearchFilter {
 	public void setIsLogin(Short isLogin) {
 		this.isLogin = isLogin;
 	}
+
+	public Integer getValid() {
+		return valid;
+	}
+
+	public void setValid(Integer valid) {
+		this.valid = valid;
+	}
 }

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -343,5 +343,13 @@ public interface PublicInquiryService {
      * @return 询价单
      */
     PurcInquiry getQuotedDetail(PurcInquiry inquiry);
+
+    /**
+     * 根据id设置询价单明细有效状态
+     * @param id  询价单明细id purcInquiryItem
+     * @param valid 1有效  0 无效
+     * @return
+     */
+    ModelMap deleteItems(Long id, Integer valid);
 }
 

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -753,6 +753,49 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         return inquiry;
     }
 
+    /**
+     * 根据id设置询价单明细有效状态
+     *
+     * @param id    询价单明细id purcInquiryItem
+     * @param valid 1有效  0 无效
+     * @return
+     */
+    @Override
+    public ModelMap deleteItems(Long id, Integer valid) {
+        ModelMap map = new ModelMap();
+        if (null == id || null == valid) {
+            map.put("success", false);
+            map.put("message", "传入参数为空");
+            return map;
+        }
+        PurcInquiryItem item = purcInquiryItemDao.findOne(id);
+        if (null != item) {
+            item.setValid(valid);
+            try {
+                purcInquiryItemDao.save(item);
+                if (valid == 0) {
+                    InquiryEnRemind enRemind = inquiryEnRemindDao.findByItemIdAndEnUU(id, item.getEnuu());
+                    List<InquiryRemind> reminds = remindDao.findByItemIdAndEnUU(id, item.getEnuu());
+                    if (null != enRemind) {
+                        inquiryEnRemindDao.delete(enRemind);
+                    }
+                    if (!CollectionUtils.isEmpty(reminds)) {
+                        remindDao.delete(reminds);
+                    }
+                }
+                map.put("success", true);
+            } catch (Exception e) {
+                map.put("success", false);
+                map.put("message", e.getMessage());
+            }
+        } else {
+            map.put("success", false);
+            map.put("message", "未找到对应询价单明细记录");
+        }
+
+        return map;
+    }
+
     /**
      * 将公共询价服务中心的公共询价转成ERP的对应的字段
      *