Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5,6 +5,7 @@ import com.uas.dfs.service.FileClient;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -43,8 +44,6 @@ public class FileController {
 	@Autowired
     private CommonDao commonDao;
 
-    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
 	/**
 	 * 文件下载
 	 * 
@@ -53,12 +52,14 @@ public class FileController {
 	 * @throws IOException
 	 */
 	@RequestMapping("/{fileId}")
-	public void download(@PathVariable("fileId") long fileId, HttpServletResponse response) throws IOException {
+	public void download(@PathVariable("fileId") long fileId, HttpServletResponse response) throws Exception {
 		Attach attach = attachService.getAttach(fileId);
-		if(attach == null) {
-            throw  new IllegalArgumentException("附件不存在");
+		if (attach == null) {
+		    attach = InquiryUtils.getAttach(fileId);
+		    if (attach == null) {
+                throw  new IllegalArgumentException("附件不存在");
+            }
         }
-        logger.log(SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu(), "附件下载", attach.getName() + "下载", "关联附件id： " + attach.getId());
         response.addHeader("Content-Disposition", "attachment;filename=" + new String(attach.getName().getBytes("utf-8"), "iso-8859-1"));
 		response.setCharacterEncoding("utf-8");
 		response.setContentType("application/octec-stream");
@@ -111,7 +112,6 @@ public class FileController {
         StringBuffer idString = null;
         String url = null;
         if (!CollectionUtils.isEmpty(attaches)) {
-            logger.log(SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu(),"附件下载", "采购单附件批量下载", "关联订单id： " + id);
            for (Attach attach : attaches) {
                if (attach.getPath().startsWith("http://dfs.ubtob.com")) {// 存储在dfs存储服务器，去dfs存储服务器下载
                 // TODO dfs服务器上打包下载

src/main/java/com/uas/platform/b2b/ps/InquiryUtils.java

@@ -25,7 +25,7 @@ public class InquiryUtils {
     /**
      * 访问地址
      */
-    private static String url = "http://192.168.253.192:8080";
+    private static String url = "http://192.168.253.12:24000";
 
     /**
      * 传递数据到公共询价接口方法
@@ -274,4 +274,23 @@ public class InquiryUtils {
         }
         return null;
     }
+
+    /**
+     * 获取存在公共域的附件
+     *
+     * @param id 获取的附件id
+     * @return
+     * @throws Exception
+     */
+    public static Attach getAttach(Long id) throws Exception {
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/public/attachUrl?id=" + id, null);
+        if (res.getStatusCode() == 200) {
+            if (null != res.getResponseText()) {
+                return JSONObject.parseObject(res.getResponseText(), Attach.class);
+            }
+        } else {
+            throw new Exception("数据查询失败： " + res.getStatusCode());
+        }
+        return null;
+    }
 }

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

@@ -548,16 +548,8 @@ public class PubInquiryServiceImpl implements PubInquiryService {
     @Override
     public ModelMap acceptInquiry(Long id) throws Exception {
         ModelMap map = new ModelMap();
-        PublicInquiryItem item = publicInquiryItemDao.findOne(id);
-        item.setAgreed(Constant.YES);
-        item.setStatus((short) Status.REPLIED.value());
-//        item = publicInquiryItemDao.save(item);
-        item = InquiryUtils.saveItem(item);
-        if (item.getAgreed().equals(Constant.YES) && item.getStatus().equals((short) Status.REPLIED.value())) {
-            map.put("success", "采纳成功");
-        } else {
-            map.put("error", "采纳失败");
-        }
+        InquiryUtils.decide(id, Constant.YES);
+        map.put("success", "操作成功");
         return map;
     }
 
@@ -570,16 +562,8 @@ public class PubInquiryServiceImpl implements PubInquiryService {
     @Override
     public ModelMap refuseInquiry(Long id) throws Exception {
         ModelMap map = new ModelMap();
-        PublicInquiryItem item = publicInquiryItemDao.findOne(id);
-        item.setAgreed(Constant.NO);
-        item.setStatus((short) Status.REPLIED.value());
-//        item = publicInquiryItemDao.save(item);
-        item = InquiryUtils.saveItem(item);
-        if (item.getAgreed().equals(Constant.NO) && item.getStatus().equals((short) Status.REPLIED.value())) {
-            map.put("success", "拒绝操作成功");
-        } else {
-            map.put("error", "操作失败");
-        }
+        InquiryUtils.decide(id, Constant.YES);
+        map.put("success", "操作成功");
         return map;
     }
 

src/main/webapp/resources/tpl/index/baseInfo/modal/quotation_modal.html

@@ -162,7 +162,7 @@
             <div class="form-group">
                 <label class="col-xs-4 control-label">币种（选择）</label>
                 <div class="col-xs-8">
-                    <select name="" id="" class="form-control" inquiryItem="inquiryItem.currency" ng-required="true">
+                    <select name="" id="" class="form-control" ng-model="inquiryItem.currency" ng-required="true">
                         <option value="RMB">RMB</option>
                         <option value="YEN">YEN</option>
                     </select>

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -266,16 +266,17 @@
                             <div class="fr">
                                 <em><b>*</b>我方付款方式：</em>
                                 <span>
-                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-disabled="!deOrder.$editing" ng-required="">
-                                    <datalist id="paymentmethod" ng-if="methods.length == 0">
+                                	<select name="" ng-model="deOrder.paymentmethod" class="select" ng-required="true" ng-if="methods.length == 0">
+                                        <option value="">请先选择支付方式</option>
                                         <option value="T/T支付;预付20%履约保定金，尾款提货前付清。">T/T支付;预付20%履约保定金，尾款提货前付清。</option>
                                         <option value="T/T支付;预付15%履约保定金，尾款提货前付清。">T/T支付;预付15%履约保定金，尾款提货前付清。</option>
                                         <option value="T/T支付;预付25%履约保定金，尾款提货前付清。">T/T支付;预付25%履约保定金，尾款提货前付清。</option>
                                         <option value="T/T支付;预付30%履约保定金，尾款提货前付清。">T/T支付;预付30%履约保定金，尾款提货前付清。</option>
-                                    </datalist>
-                                    <datalist id="paymentmethod" ng-if="methods.length != 0">
+                                    </select>
+                                    <select name="" ng-if="methods.length != 0" ng-model="deOrder.paymentmethod" class="select" ng-required="true">
+                                        <option value="">请先选择支付方式</option>
                                         <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
-                                    </datalist>
+                                    </select>
                                 </span>
                             </div>
                         </li>

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -267,16 +267,28 @@
                             <div class="fr">
                                 <em><b>*</b>我方付款方式：</em>
                                 <span>
-                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-required="true">
-                                    <datalist id="paymentmethod" ng-if="methods.length == 0">
+                                    <!--<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-required="true">-->
+                                    <!--<datalist id="paymentmethod" ng-if="methods.length == 0">-->
+                                        <!--<option value="">请先选择支付方式</option>-->
+                                        <!--<option value="T/T支付;预付20%履约保定金，尾款提货前付清。">T/T支付;预付20%履约保定金，尾款提货前付清。</option>-->
+                                        <!--<option value="T/T支付;预付15%履约保定金，尾款提货前付清。">T/T支付;预付15%履约保定金，尾款提货前付清。</option>-->
+                                        <!--<option value="T/T支付;预付25%履约保定金，尾款提货前付清。">T/T支付;预付25%履约保定金，尾款提货前付清。</option>-->
+                                        <!--<option value="T/T支付;预付30%履约保定金，尾款提货前付清。">T/T支付;预付30%履约保定金，尾款提货前付清。</option>-->
+                                    <!--</datalist>-->
+                                    <!--<datalist id="paymentmethod" ng-if="methods.length != 0">-->
+                                        <!--<option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>-->
+                                    <!--</datalist>-->
+                                    <select ng-model="deOrder.paymentmethod" class="select" ng-required="true" ng-if="methods.length == 0">
+                                        <option value="">请先选择支付方式</option>
                                         <option value="T/T支付;预付20%履约保定金，尾款提货前付清。">T/T支付;预付20%履约保定金，尾款提货前付清。</option>
                                         <option value="T/T支付;预付15%履约保定金，尾款提货前付清。">T/T支付;预付15%履约保定金，尾款提货前付清。</option>
                                         <option value="T/T支付;预付25%履约保定金，尾款提货前付清。">T/T支付;预付25%履约保定金，尾款提货前付清。</option>
                                         <option value="T/T支付;预付30%履约保定金，尾款提货前付清。">T/T支付;预付30%履约保定金，尾款提货前付清。</option>
-                                    </datalist>
-                                    <datalist id="paymentmethod" ng-if="methods.length != 0">
+                                    </select>
+                                    <select ng-if="methods.length != 0" ng-model="deOrder.paymentmethod" class="select" ng-required="true">
+                                        <option value="">请先选择支付方式</option>
                                         <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
-                                    </datalist>
+                                    </select>
                                 </span>
                             </div>
                         </li>