采购单回复产生消息

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8001 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PurchaseTenderController.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
@@ -85,8 +84,6 @@ public class PurchaseTenderController {
                 vendorUUs = "[".concat(vendorUUs);
                 vendorUUs = vendorUUs.concat("]");
                 List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
-                System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
-                System.out.println("tender" + JSON.toJSONString(purchaseTender));
                 purchaseTenderService.publish(purchaseTender, vendUUs);
             }
         }
@@ -115,8 +112,6 @@ public class PurchaseTenderController {
                 vendorUUs = "[".concat(vendorUUs);
                 vendorUUs = vendorUUs.concat("]");
                 List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
-                System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
-                System.out.println("tender" + JSON.toJSONString(purchaseTender));
                 purchaseTenderService.save(purchaseTender, vendUUs);
             }
         }
@@ -228,7 +223,6 @@ public class PurchaseTenderController {
     @ResponseBody
     public ResponseEntity<String> decideTender(@RequestBody String json) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(json, PurchaseTender.class);
-        System.out.println("decide " + JSON.toJSONString(purchaseTender));
         purchaseTenderService.decide(purchaseTender);
         if (logger != null) {
             logger.log("供应商投标", "供应商对招标单进行投标",  "标题" + purchaseTender.getTitle() + purchaseTender.getCode());
@@ -340,8 +334,6 @@ public class PurchaseTenderController {
         if (logger != null) {
             logger.log("客户招标单", "查看客户发出的招标单（待投标）");
         }
-        System.out.println("params" + JSON.toJSONString(params));
-        System.out.println("searchFilter" + JSON.toJSONString(searchFilter));
         JSONObject jsonObject = JSONObject.parseObject(searchFilter);
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -814,7 +806,6 @@ public class PurchaseTenderController {
                 throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
             }
             map = purchaseTenderService.releaseByWorkbook(workbook);
-            System.out.println("map" + JSON.toJSONString(map));
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/com/uas/platform/b2b/event/PurchaseOrderReplyReleaseEvent.java

@@ -26,19 +26,20 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
      */
     @Override
     public PagingReleaseDetail release(PurchaseOrder orderAll) {
+        // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是venduser
         Long emUU = orderAll.getVendUserUU();
         String emName = orderAll.getVenduser();
-        Long enUU = orderAll.getVendUU();
+        Long vendUU = orderAll.getVendUU();
         Date date = new Date();
         String codeValue = orderAll.getCode();
         String from = "B2B";
         String type = "回复采购订单";
         String title = "B2B商务提醒";
         String context = orderAll.getReceiveName() + "的" + emName + "回复了采购单（" + codeValue + "）的交期，请及时确认！";
-        PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
-        Long vendUU = orderAll.getVendUU();
-        Long vendUserUU = orderAll.getVendUserUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU);
+        PagingRelease release = new PagingRelease(emUU, emName, vendUU, date, codeValue, from, title, context, type);
+        Long enUU = orderAll.getEnUU();
+        Long userUU = orderAll.getUserUU();
+        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;
     }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -620,8 +620,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
 //        }
 //        tenderItem.setEnterpriseBaseInfo(enBaseInfo);
 //        tenderItem.setStatus(enUU + "待投标");
-//        System.out.println("getItem impl tender" + JSON.toJSONString(tender));
-//        System.out.println("getItem impl tenderItem" + JSON.toJSONString(tenderItem));
 //        Set<SaleTender> items = new HashSet<>();
 //        if (!CollectionUtils.isEmpty(tender.getPurchaseTenderItems())) {
 //            items = tender.getPurchaseTenderItems();
@@ -704,13 +702,11 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
 
 //    @Override
 //    public List<SaleTender> getItemsByTenderId(Long id) {
-//        System.out.println("enter impl getItemsByTenderId");
 //        PurchaseTender tender = purchaseTenderDao.findOne(id);
 //        List<SaleTender> tenderItems = new ArrayList<>();
 //        for (SaleTender tenderItem : tender.getPurchaseTenderItems()) {
 //            tenderItems.add(tenderItem);
 //        }
-//        System.out.println("getItemsByTenderId" + JSON.toJSONString(tenderItems));
 //        return tenderItems;
 //    }