求购模块

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseOfferController.java

@@ -55,14 +55,13 @@ public class SeekPurchaseOfferController {
 
     /**
      * 获取求购成交率
-     * @param session 获取session
      * @return
      */
     @RequestMapping(value = "/getSeekPurchaseRate", method = RequestMethod.GET)
-    public Map<String, Object> getSeekPurchaseRate(HttpSession session) {
-        User user = (User) session.getAttribute("user");
-        logger.log("求购", "获取卖家求购成交率:" + user.getUserUU());
-        return seekPurchaseOfferService.getSeekPurchaseRate(user.getUserUU());
+    public Map<String, Object> getSeekPurchaseRate() {
+        User user = SystemSession.getUser();
+        logger.log("求购", "获取卖家求购成交率,企业uu号:" + user.getEnterprise().getUu());
+        return seekPurchaseOfferService.getSeekPurchaseRate(user.getEnterprise().getUu());
     }
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseOfferServiceImpl.java

@@ -40,33 +40,15 @@ import org.springframework.util.StringUtils;
 @Service
 public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
 
-    /**
-     * 卖家报价dao
-     */
     @Autowired
     private SeekPurchaseOfferDao seekPurchaseOfferDao;
 
-    /**
-     * 求购dao
-     */
     @Autowired
     private SeekPurchaseDao seekPurchaseDao;
 
-    /**
-     * 数据库操作
-     */
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
-    /**
-     * 库存dao
-     */
-    @Autowired
-    private GoodsDao goodsDao;
-
-    @Autowired
-    private SeekPurchasePushGoodsDao seekPurchaseGoodsDao;
-
     @Autowired
     private SeekPurchasePushGoodsDao seekPurchasePushGoodsDao;
 
@@ -123,7 +105,7 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
         String sql =
                 "select offerAmount,IFNULL(acceptedAmount,0) as acceptedAmount,ifnull(FORMAT(acceptedAmount/offerAmount,2),0) "
                         + "as rate from(select count(1) as offerAmount,sum(of_status=?) as acceptedAmount "
-                        + "from trade$seek_purchase_offer where of_uu=?) a";
+                        + "from trade$seek_purchase_offer where of_enuu=?) a";
         return jdbcTemplate.queryForMap(sql, new Object[]{Status.ACCEPTED.getValue(), uu});
     }
 
@@ -163,12 +145,6 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
         // 按发布时间降序排序
         pageInfo.sorting("releaseDate", Direction.DESC);
         pageInfo.filter("goEnUu", user.getEnterprise().getUu());
-        // 通过uu号找到当前用户已报价的sp_id
-        List<Long> spIds = seekPurchaseOfferDao.findIdsByEnUu(user.getEnterprise().getUu());
-        if (spIds != null && spIds.size() > 0) {
-            pageInfo.expression(PredicateUtils.in("spId", spIds, false));
-        }
-
         Page<SeekPurchasePushGoods> pages = seekPurchasePushGoodsDao
                 .findAll(new Specification<SeekPurchasePushGoods>() {
                     public Predicate toPredicate(Root<SeekPurchasePushGoods> root, CriteriaQuery<?> query,

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -30,10 +30,10 @@ define(['app/app'], function(app) {
         getData : function ($defer, params) {
           const param = BaseService.parseParams(params.url());
           param.deadline = $scope.deadline;
-          // param.status = $scope.status;
+          param.status = $scope.status;
           param.keyWord = $scope.keyWord;
-          // param.minReleaseDate = $scope.startDate ? $scope.startDate.getTime() : null;
-          // param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime() : null;
+          param.minReleaseDate = $scope.startDate ? $scope.startDate.getTime() : null;
+          param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime() : null;
           seekPurchase.getUserSeekPageInfo(param, function (data) {
             params.total(data.totalElements);
             $defer.resolve(data.content);
@@ -56,5 +56,80 @@ define(['app/app'], function(app) {
       // 获取商品现货 getMallGoodsList 参数 spId
 
       // 获取报价列表 getSeekPurchaseOfferPageInfo 参数：分页参数，spId
+
+
+      $scope.condition = {endDateOpen:false, startDateOpen: false};
+      // 打开日期选择框
+      $scope.openDatePicker = function ($event, item, openParam,status) {
+        if (status != null) {
+          if (status == 1) {
+            if ($scope.startDate != null) {
+              return;
+            }
+          }
+          if (status == 2) {
+            if ($scope.endDate != null) {
+              return;
+            }
+          }
+        }
+        $event.preventDefault();
+        $event.stopPropagation();
+        item[openParam] = !item[openParam];
+        if (openParam == 'startDateOpen') {
+          if (item['endDateOpen']) {
+            item['endDateOpen'] = !item['endDateOpen'];
+          }
+        } else if (openParam == 'endDateOpen') {
+          if (item['startDateOpen']){
+            item['startDateOpen'] = !item['startDateOpen'];
+          }
+        }
+      };
+      $scope.changeEndDate = function () {
+        if ($scope.condition.endDateOpen) {
+          $scope.endDate = $scope.endDate.toString().replace(/[0-9]{2}:[0-9]{2}:[0-9]{2}/g, '23:59:59');//;'23.59';//DateUtil.yyyyMmDd($scope.endDate.getTime() + 86399000);
+          $scope.endDate = new Date(formatDateTime(new Date($scope.endDate.toString())));
+        }
+        $scope.vaildDate(false);
+      };
+      $scope.vaildDate = function (isStart) {
+        if ($scope.endDate !== null && $scope.startDate>$scope.endDate){
+          if (isStart) {
+            alert("开始日期大于结束日期，请重新输入！");
+            $scope.startDate = null;
+          } else {
+            alert("开始日期大于结束日期，请重新输入！");
+            $scope.endDate = null;
+          }
+        }
+      };
+      var formatDateTime = function (date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        var sec = date.getSeconds();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
+      };
+      // 选择查找日期
+      $scope.onDateCondition = function () {
+        $scope.param.page = 1;
+        $scope.orderTableParams.page(1);
+        $scope.orderTableParams.reload();
+      };
+
+      /*获取时间戳代表的天数*/
+      $scope.getDay = function (timeStamp) {
+        return Math.floor(timeStamp / (1000 * 60 * 60 * 24));
+      }
+      /*获取时间戳代表的小时*/
+      $scope.getHours = function (timeStamp) {
+        return Math.floor((timeStamp / (1000 * 60 * 60)) % 24);
+      }
     }]);
 });

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -41,7 +41,6 @@ define(['app/app'], function(app) {
 
         // 保存报价
         $scope.saveOffer = function (){
-          $scope.offer.currency = "RMB";
           seekPurchase.saveOffer($scope.offer, function(data) {
             $scope.setSeekActive(null, false);
             toaster.pop('success', '报价成功');
@@ -52,7 +51,6 @@ define(['app/app'], function(app) {
 
         $scope.condition = {endDateOpen:false, startDateOpen: false};
 
-      // 打开日期选择框
       $scope.openDatePicker = function ($event, item, openParam,status) {
         if (status != null) {
           if (status == 1) {
@@ -69,11 +67,11 @@ define(['app/app'], function(app) {
         $event.preventDefault();
         $event.stopPropagation();
         item[openParam] = !item[openParam];
-        if (openParam == 'startDateOpen'){
-          if (item['endDateOpen']){
+        if (openParam == 'startDateOpen') {
+          if (item['endDateOpen']) {
             item['endDateOpen'] = !item['endDateOpen'];
           }
-        } else if(openParam == 'endDateOpen'){
+        } else if (openParam == 'endDateOpen') {
           if (item['startDateOpen']){
             item['startDateOpen'] = !item['startDateOpen'];
           }
@@ -88,7 +86,7 @@ define(['app/app'], function(app) {
       };
       $scope.vaildDate = function (isStart) {
         if ($scope.endDate !== null && $scope.startDate>$scope.endDate){
-          if (isStart){
+          if (isStart) {
             alert("开始日期大于结束日期，请重新输入！");
             $scope.startDate = null;
           } else {

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -427,7 +427,7 @@
                     <div class="data-input">
                         <input type="text" ng-model="startDate"
                                class="form-control select-adder" placeholder="起始时间"
-                               datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                               datepicker-popup="yyyy-MM-dd"
                                is-open="condition.startDateOpen"
                                max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
                                ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
@@ -441,7 +441,7 @@
                     <div class="data-input">
                         <input type="text" ng-model="endDate"
                                class="form-control select-adder" placeholder="结束时间"
-                               datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                               datepicker-popup="yyyy-MM-dd"
                                is-open="condition.endDateOpen"
                                min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
                                ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
@@ -469,10 +469,10 @@
                 <th width="99">生产日期</th>
                 <th width="76">截止时间</th>
                 <th width="81">
-                    <select class="select-adder">
-                        <option value="1">待报价</option>
-                        <option value="2">已报价</option>
-                        <option value="3">已采纳</option>
+                    <select class="select-adder" ng-model="status" ng-init="status=200" ng-change="onSearch()">
+                        <option value="200">待报价</option>
+                        <option value="201">已报价</option>
+                        <option value="202">已采纳</option>
                     </select>
                 </th>
                 <th width="92">操作</th>