Merge remote-tracking branch 'origin/feature-enremind0604-liusw' into feature-enremind0604-liusw

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

@@ -20,11 +20,44 @@ import java.util.List;
 @Repository
 public interface InquiryEnRemindDao extends JpaRepository<InquiryEnRemind, Long>, JpaSpecificationExecutor<InquiryEnRemind> {
 
+    /**
+     * 通过vendUU和公共询价明细id更新该单据的状态
+     *
+     * @param sourceId 公共询价明细id
+     * @param value 单据状态
+     *              <note>
+     *                  {@code 100 在录入}
+     *                  {@code 101 已提交}
+     *                  {@code 102 已审核}
+     *                  {@code 103 未通过}
+     *                  {@code 104 已通过}
+     *              </note>
+     * @param vendUU 被推荐的企业
+     */
     @Transactional
     @Modifying
     @Query("update InquiryEnRemind set status = :value where itemId = :sourceId and vendUU = :vendUU")
     void updateStatus(@Param("sourceId") Long sourceId, @Param("value") int value, @Param("vendUU") Long vendUU);
 
+    /**
+     * 通过vendUU和公共询价明细id更新该单据的状态
+     * @param id 报价明细id
+     * @param sourceId 公共询价明细id
+     * @param value 单据状态
+     *              <note>
+     *                  {@code 100 在录入}
+     *                  {@code 101 已提交}
+     *                  {@code 102 已审核}
+     *                  {@code 103 未通过}
+     *                  {@code 104 已通过}
+     *              </note>
+     * @param vendUU 被推荐的企业
+     */
+    @Transactional
+    @Modifying
+    @Query("update InquiryEnRemind set status = :value, newId = :id where itemId = :sourceId and vendUU = :vendUU")
+    void updateStatus(@Param("id") Long id, @Param("sourceId") Long sourceId, @Param("value") int value, @Param("vendUU") Long vendUU);
+
     /**
      * 通过明细id和企业uu查询企业推荐信息
      * @param itemId

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

@@ -39,6 +39,25 @@ public interface InquiryRemindDao extends JpaRepository<InquiryRemind, Long>, Jp
     @Query("update InquiryRemind set status = :value where itemId = :sourceId and vendUU = :vendUU")
     void updateStatus(@Param("sourceId") Long sourceId, @Param("value") int value, @Param("vendUU") Long vendUU);
 
+    /**
+     * 通过vendUU和公共询价明细id更新该单据的状态
+     *
+     * @param sourceId 公共询价明细id
+     * @param value 单据状态
+     *              <note>
+     *                  {@code 100 在录入}
+     *                  {@code 101 已提交}
+     *                  {@code 102 已审核}
+     *                  {@code 103 未通过}
+     *                  {@code 104 已通过}
+     *              </note>
+     * @param vendUU 被推荐的企业
+     */
+    @Transactional
+    @Modifying
+    @Query("update InquiryRemind set status = :value,newId = :id where itemId = :sourceId and vendUU = :vendUU")
+    void updateStatus(@Param("id") Long id, @Param("sourceId") Long sourceId, @Param("value") int value, @Param("vendUU") Long vendUU);
+
     /**
      * 通过被推荐的企业UU，个人UU，来源id判断单据是否存在
      *

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

@@ -85,4 +85,12 @@ public interface PublicInquiryItemDao extends JpaRepository<PublicInquiryItem, L
      * @return
      */
     List<PublicInquiryItem> findBySourceId(Long sourceId);
+
+    /**
+     * 通过来源id查询报价信息 报价时间倒序
+     *
+     * @param sourceId
+     * @return
+     */
+    List<PublicInquiryItem> findBySourceIdOrderByOfferTimeDesc(Long sourceId);
 }

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

@@ -365,9 +365,9 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         // 更新原表的报价条数
         purcInquiryItemDao.updateAmount(publicInquiryItems.get(0).getSourceId(), publicInquiryItems.size());
         // 更新推荐表中的相关信息
-        remindDao.updateStatus(inquiryItem.getSourceId(), Status.SUBMITTED.value(), inquiryItem.getVendUU());
+        remindDao.updateStatus(publicInquiryItems.get(0).getId(), inquiryItem.getSourceId(), Status.SUBMITTED.value(), inquiryItem.getVendUU());
         // 更新企业推荐中的相关信息
-        inquiryEnRemindDao.updateStatus(inquiryItem.getSourceId(), Status.SUBMITTED.value(), inquiryItem.getVendUU());
+        inquiryEnRemindDao.updateStatus(publicInquiryItems.get(0).getId(), inquiryItem.getSourceId(), Status.SUBMITTED.value(), inquiryItem.getVendUU());
         if (publicInquiryItems.get(0).getId() != null) {
             return publicInquiryItems.get(0);
         } else {

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

@@ -8,6 +8,7 @@ import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
 import com.uas.ps.inquiry.AccessConfiguration;
 import com.uas.ps.inquiry.dao.EnterpriseDao;
+import com.uas.ps.inquiry.dao.InquiryEnRemindDao;
 import com.uas.ps.inquiry.dao.InquiryRemindDao;
 import com.uas.ps.inquiry.dao.ProductDao;
 import com.uas.ps.inquiry.dao.PublicInquiryDao;
@@ -170,6 +171,9 @@ public class InquiryServiceImpl implements InquiryService {
     @Autowired
     private PublicInquiryServiceImpl service;
 
+    @Autowired
+    private InquiryEnRemindDao inquiryEnRemindDao;
+
 
     /**
      * 公共物料访问地址
@@ -496,8 +500,10 @@ public class InquiryServiceImpl implements InquiryService {
         // 更新询价推荐表相关信息
         if (status.equals(Constant.YES)) {
             inquiryRemindDao.updateStatus(item.getSourceId(), Status.ALLOW.value(), item.getVendUU());
+            inquiryEnRemindDao.updateStatus(item.getSourceId(), Status.ALLOW.value(), item.getVendUU());
         } else if (status.equals(Constant.NO)) {
             inquiryRemindDao.updateStatus(item.getSourceId(), Status.NOTALLOW.value(), item.getVendUU());
+            inquiryEnRemindDao.updateStatus(item.getSourceId(), Status.NOTALLOW.value(), item.getVendUU());
         }
         // 更新原公共询价单该条明细，设置为不可报价
         String sql = "update purc$puinquiryitems set id_overdue = 1 where id_id = " + item.getSourceId();
@@ -520,8 +526,10 @@ public class InquiryServiceImpl implements InquiryService {
         // 更新询价推荐表相关信息
         if (status.equals(Constant.YES)) {
             inquiryRemindDao.updateStatus(item.getSourceId(), Status.ALLOW.value(), item.getVendUU());
+            inquiryEnRemindDao.updateStatus(item.getSourceId(), Status.ALLOW.value(), item.getVendUU());
         } else if (status.equals(Constant.NO)) {
             inquiryRemindDao.updateStatus(item.getSourceId(), Status.NOTALLOW.value(), item.getVendUU());
+            inquiryEnRemindDao.updateStatus(item.getSourceId(), Status.NOTALLOW.value(), item.getVendUU());
         }
         // 更新原公共询价单该条明细，设置为不可报价
         String sql = "update purc$puinquiryitems set id_overdue = 1 where id_id = " + item.getSourceId();
@@ -543,8 +551,10 @@ public class InquiryServiceImpl implements InquiryService {
         itemDao.save(item);
         if (status.equals(Constant.YES)) {
             inquiryRemindDao.updateStatus(item.getSourceId(), Status.ALLOW.value(), item.getVendUU());
+            inquiryEnRemindDao.updateStatus(item.getSourceId(), Status.ALLOW.value(), item.getVendUU());
         } else if (status.equals(Constant.NO)) {
             inquiryRemindDao.updateStatus(item.getSourceId(), Status.NOTALLOW.value(), item.getVendUU());
+            inquiryEnRemindDao.updateStatus(item.getSourceId(), Status.NOTALLOW.value(), item.getVendUU());
         }
         inquiryService.refuseMessage(item,InquirySource.MALL.name());
     }
@@ -782,7 +792,7 @@ public class InquiryServiceImpl implements InquiryService {
         }, pageInfo);
         if (!CollectionUtils.isEmpty(items.getContent())) {
             for (PurcInquiryItemInfo itemInfo : items.getContent()) {
-                List<PublicInquiryItem> itemList = itemDao.findBySourceId(itemInfo.getId());
+                List<PublicInquiryItem> itemList = itemDao.findBySourceIdOrderByOfferTimeDesc(itemInfo.getId());
                 itemInfo.setQutations(itemList);
                 itemInfo.setQuotation(itemList.get(0));
                 itemInfo.setAgreed(Constant.NO);

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

@@ -306,9 +306,9 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             @Override
             public void run() {
                 try {
-                    log.info("发送消息实体" + JSON.toJSONString(models));
+                    log.info("发送微信消息实体" + JSON.toJSONString(models));
                     String res = HttpUtil.doPost(USOFTMALL_URL + "/wx/sendTemplateMessage", FlexJsonUtils.toJsonDeep(models));
-                    log.info("消息请求发送日志" + res);
+                    log.info("微信消息请求发送日志" + res);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }