Merge branch 'dev-mysql' of ssh://10.10.101.21/source/platform-b2c into dev-mysql

pom.xml

@@ -39,7 +39,7 @@
 			<properties>
 				<profile>prod</profile>
 				<!-- static plugin -->
-				<static-path>http://static.usoftmall.com</static-path>
+				<static-path>https://static.usoftmall.com</static-path>
 			</properties>
 		</profile>
 	</profiles>

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -72,7 +72,7 @@ public class SecurityController {
 		if (cross) {
 			request.getSession().setAttribute(SSOConfig.SSOReferer, returnUrl);
 			// 跨域情况，需要再次询问账户中心
-			returnUrl = request.getContextPath() + "/logout/proxy";
+			returnUrl = "/logout/proxy";
 		}
 		return new ModelMap("content", returnUrl);
 	}

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -32,7 +32,10 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void save(User user) {
-        com.uas.platform.b2c.common.account.model.User u =  new com.uas.platform.b2c.common.account.model.User();
+        com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+        if (null == u){
+            u =  new com.uas.platform.b2c.common.account.model.User();
+        }
         u.setUserPwd(user.getPassword());
         u.setUserName(user.getName());
         u.setEnable((short) 1);

src/main/java/com/uas/platform/b2c/prod/product/brand/api/BrandController.java

@@ -65,6 +65,17 @@ public class BrandController {
 		return brandService.getInitialSimpleInfo(keyword);
 	}
 
+	/**
+	 * 分页获取按字符串获取以此字符为首字母的品牌信息
+	 * @return map（首字母，超简易品牌信息）
+	 */
+	@RequestMapping(value = "/initial/first/{key}", method = RequestMethod.GET)
+	public Page<Brand> getInitialSimpleInfoByFirst(@PathVariable String key ,PageParams page , String keyword) {
+		if (StringUtils.isEmpty(key))
+			keyword = "A";
+		return brandService.getInitialSimpleInfoByFirst(key,page,keyword);
+	}
+
 	/**
 	 * 查找所有简单有效品牌信息
 	 * @param keyword 关键词

src/main/java/com/uas/platform/b2c/prod/product/brand/dao/BrandDao.java

@@ -2,6 +2,9 @@ package com.uas.platform.b2c.prod.product.brand.dao;
 
 import java.util.List;
 
+import com.uas.platform.b2c.prod.product.brand.modal.BrandMostSimpleInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -67,4 +70,12 @@ public interface BrandDao extends JpaSpecificationExecutor<Brand>, JpaRepository
 	 */
 	@Query("select b from Brand b where upper(b.nameCn)=upper(:nameCn)")
 	public List<Brand> findByUpperNameCn(@Param("nameCn") String nameCn);
+
+	/**
+	 * 分页根据首字母获取品牌信息
+	 * @param initals
+	 * @return
+	 */
+	@Query(value = "select b from Brand b  where b.inital in :initals and (b.nameEn like %:keyword% or b.nameCn like %:keyword%)")
+	public Page<Brand> findInInitalsPage(@Param("initals") String[] initals ,@Param("keyword") String keyword, Pageable pageable);
 }

src/main/java/com/uas/platform/b2c/prod/product/brand/dao/BrandMostSimpleInfoDao.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2c.prod.product.brand.dao;
 
 import com.uas.platform.b2c.prod.product.brand.modal.BrandMostSimpleInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -25,6 +27,14 @@ public interface BrandMostSimpleInfoDao extends JpaSpecificationExecutor<BrandMo
     @Query(nativeQuery = true, value = "select * from product$brand where br_inital in :initals")
     public List<BrandMostSimpleInfo> findInInitals(@Param("initals") String[] initals);
 
+    /**
+     * 分页根据首字母获取品牌信息
+     * @param initals
+     * @return
+     */
+    @Query(value = "select b from BrandMostSimpleInfo b  where b.inital in :initals")
+    public Page<BrandMostSimpleInfo> findInInitalsPage(@Param("initals") String[] initals , Pageable pageable);
+
     /**
      * 根据批次号获取品牌信息
      * @param batchIds id批次号

src/main/java/com/uas/platform/b2c/prod/product/brand/service/BrandService.java

@@ -5,6 +5,7 @@ import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandMostSimpleInfo;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandVersion;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
@@ -54,6 +55,13 @@ public interface BrandService {
 	 */
 	public Map<String, List<BrandMostSimpleInfo>> getInitialSimpleInfo(String keyword);
 
+	/**
+	 * 获取按字符串获取以此字符串为首字母的品牌信息
+	 * @param keyword 关键词
+	 * @return 品牌简易信息
+	 */
+	public Page<Brand> getInitialSimpleInfoByFirst(String key , PageParams params, String keyword);
+
 	/**
 	 * 获取BrandInfo分页数据
 	 * @param keyword 关键词

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandServiceImpl.java

@@ -12,6 +12,7 @@ import com.uas.platform.b2c.prod.product.brand.service.BrandService;
 import com.uas.platform.b2c.prod.product.component.dao.ComponentDao;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
@@ -20,6 +21,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -117,6 +119,12 @@ public class BrandServiceImpl implements BrandService {
 		return map;
 	}
 
+	@Override
+	public Page<Brand> getInitialSimpleInfoByFirst(String key , PageParams params ,String keyword) {
+		Pageable pageable = new PageInfo(params);
+		return brandDao.findInInitalsPage(new String[]{key},keyword, pageable);
+	}
+
 	// 判断一个字符串是否含有中文
 	public static boolean isChinese(String str) {
 		if (str == null) return false;

src/main/java/com/uas/platform/b2c/prod/product/common/CommonTask.java

@@ -0,0 +1,36 @@
+package com.uas.platform.b2c.prod.product.common;
+
+import com.uas.platform.b2c.prod.product.common.dao.CommonCountDao;
+import com.uas.platform.b2c.prod.product.common.model.CommonCount;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 通用模块任务
+ *
+ * @version 2017/10/21 18:03 wangyc
+ */
+@Component("CommonTask")
+public class CommonTask {
+
+    private final CommonCountDao commonCountDao;
+
+    private final JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    public CommonTask(CommonCountDao commonCountDao, JdbcTemplate jdbcTemplate) {
+        this.commonCountDao = commonCountDao;
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public void updateCount() {
+        List<CommonCount> commonCounts = commonCountDao.findByStatus((short) 1);
+        for (CommonCount commonCount : commonCounts) {
+            commonCount.setCount(jdbcTemplate.queryForLong(commonCount.getSql()));
+        }
+        commonCountDao.save(commonCounts);
+    }
+}

src/main/java/com/uas/platform/b2c/prod/product/common/api/CommonCountController.java

@@ -27,6 +27,6 @@ public class CommonCountController {
      */
     @RequestMapping(method = RequestMethod.GET, params = "_status=actived")
     public List<CommonCount> findActived() {
-        return commonCountService.findByStatus((short) 1);
+        return commonCountService.findByStatus((short) 1, "b2c_index");
     }
 }

src/main/java/com/uas/platform/b2c/prod/product/common/dao/CommonCountDao.java

@@ -14,9 +14,16 @@ import java.util.List;
 public interface CommonCountDao extends JpaSpecificationExecutor<CommonCount>,JpaRepository<CommonCount, Long>{
 
     /**
-     * 通过状态获取计数器
+     * 通过状态和应用获取计数器
      * @param status 状态
      * @return 计数器
      */
-    public List<CommonCount> findByStatusOrderByDetno(Short status);
+    public List<CommonCount> findByStatusAndUsedForOrderByDetno(Short status, String usedFor);
+
+    /**
+     * 通过状态获取计数器
+     * @param status
+     * @return
+     */
+    public List<CommonCount> findByStatus(Short status);
 }

src/main/java/com/uas/platform/b2c/prod/product/common/model/CommonCount.java

@@ -48,6 +48,12 @@ public class CommonCount implements Serializable{
     @Column(name = "cc_count")
     private Long count;
 
+    /**
+     * 应用
+     */
+    @Column(name = "cc_usedfor")
+    private String usedFor;
+
     /**
      * 状态，是否激活（1：是；0：否）
      */
@@ -94,6 +100,14 @@ public class CommonCount implements Serializable{
         this.count = count;
     }
 
+    public String getUsedFor() {
+        return usedFor;
+    }
+
+    public void setUsedFor(String usedFor) {
+        this.usedFor = usedFor;
+    }
+
     public Short getStatus() {
         return status;
     }

src/main/java/com/uas/platform/b2c/prod/product/common/service/CommonCountService.java

@@ -10,9 +10,9 @@ import java.util.List;
 public interface CommonCountService {
 
     /**
-     * 根据状态获取计数器
+     * 根据状态和用途获取计数器
      * @param status 状态
      * @return
      */
-    List<CommonCount> findByStatus(Short status);
+    List<CommonCount> findByStatus(Short status, String usedFor);
 }

src/main/java/com/uas/platform/b2c/prod/product/common/service/impl/CommonCountServiceImpl.java

@@ -4,7 +4,6 @@ import com.uas.platform.b2c.prod.product.common.dao.CommonCountDao;
 import com.uas.platform.b2c.prod.product.common.model.CommonCount;
 import com.uas.platform.b2c.prod.product.common.service.CommonCountService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,12 +17,9 @@ public class CommonCountServiceImpl implements CommonCountService{
     @Autowired
     private CommonCountDao commonCountDao;
 
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
     @Override
-    public List<CommonCount> findByStatus(Short status) {
-        List<CommonCount> commonCounts = commonCountDao.findByStatusOrderByDetno(status);
+    public List<CommonCount> findByStatus(Short status, String usedFor) {
+        List<CommonCount> commonCounts = commonCountDao.findByStatusAndUsedForOrderByDetno(status, usedFor);
         for (CommonCount commonCount : commonCounts) {
             commonCount.setSql(null);
         }

src/main/resources/spring/task.xml

@@ -19,5 +19,8 @@
         <task:scheduled ref="RateTask" method="autoAfterRate" cron="0 0 1 * * ?"/>
        <!-- <task:scheduled ref="RateTask" method="autoAfterRate" cron="* */10 * * * ?"/>-->
     </task:scheduled-tasks>
+    <task:scheduled-tasks>
+        <task:scheduled ref="CommonTask" method="updateCount" cron="0 0 1 * * ?"/>
+    </task:scheduled-tasks>
     <context:annotation-config />
 </beans>

src/main/webapp/WEB-INF/views/normal/proxyLogout.html

@@ -11,13 +11,17 @@
 </head>
 <body>
 <script type="text/javascript">
-	function proxyLogout(askUrl, retUrl) {
+	function proxyLogout(askUrl, retUrl, logoutUrl) {
 	    $.getJSON(askUrl + "?callback=?", function(d){
-	    	window.location.href = retUrl;
+            if (d.error) {
+                window.location.href = logoutUrl
+            } else {
+                window.location.href = retUrl && retUrl !== 'null' ? retUrl : '/'
+            }
 	    });
 	}
 	$.getJSON('logout/crossBefore', function(data){
-		proxyLogout(data.askUrl, data.returnUrl);
+		proxyLogout(data.askUrl, data.returnUrl ,data.logoutUrl);
 	});
 </script>
 <div align="center" style="margin-top: 180px;">

src/main/webapp/resources/js/admin/controllers/customService/ReviewerEmailInfo.js

@@ -20,7 +20,7 @@ define(['app/app'], function(app) {
 				templateUrl : 'static/view/admin/customService/modal/addMailInfo.html',
 				controller : 'addMailInfoCtrl',
 				resolve : {
-					
+
 				}
 			});
 			

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

@@ -158,10 +158,13 @@ define(['app/app'], function (app) {
 
 		var loadData = function() {
 			Order.getIndividualOrder($scope.param, function(data) {
-				$scope.AllOrderInfo = data;
-                if($scope.childStatus ==''){
-                    $scope.AllOrderInfo[$scope.status] = data.totalElements;
-                }
+                if (!$scope.startDate && !$scope.endDate && !$scope.keyword){
+                    $scope.AllOrderInfo = data;
+                    if($scope.childStatus ==''){
+                        $scope.AllOrderInfo[$scope.status] = data.totalElements;
+                    }
+				}
+                $scope.isSearch = false;
 				$scope.currenctOrders = data.content;
 				angular.forEach($scope.currenctOrders, function(data){
                     data.ensurePrice = Number(NumberService.toCeil(data.ensurePrice, 2));
@@ -414,9 +417,9 @@ define(['app/app'], function (app) {
 			$scope.param.page = 1;
 			$scope.param.status = getState();
 			$scope.param.keyword = $scope.keyword;
-
+            $scope.setChildStatus('','订单状态')
 			loadData();
-			getCounts();
+			//getCounts();
 		};
 
 		$scope.noticeShipConfirm = function () {

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

@@ -401,10 +401,12 @@ define(['app/app'], function (app) {
 
         // 获取各种状态订单的数量信息
         var getCounts = function () {
-            Purchase.getAllStatusCounts({storeType: $scope.storeType}, function (data) {
-                $scope.counts = angular.copy(data);
-                $scope.counts[$scope.status] = $scope.pageParams.totalElements;
-            });
+            if (!$scope.startDate && !$scope.endDate && !$scope.keyword){
+                Purchase.getAllStatusCounts({storeType: $scope.storeType}, function (data) {
+                    $scope.counts = angular.copy(data);
+                    $scope.counts[$scope.status] = $scope.pageParams.totalElements;
+                });
+            }
         };
         getCounts();
 
@@ -494,6 +496,7 @@ define(['app/app'], function (app) {
             $scope.orderTableParams.reload();
         };
 
+
         $scope.orderTableParams = new ngTableParams($scope.tableParams, {
             total: 0,
             getData: function ($defer, params) {
@@ -523,22 +526,25 @@ define(['app/app'], function (app) {
 
                 Purchase.getByStatusAndInternal(param, function (page) {
                     if (page) {
-                        if ($scope.childStatus ==''){
-                            if (page.content) {
-                                angular.forEach(page, function (value, key) {
-                                    if (key == 'all' || key == 'tobeconfirmed' || key == 'comfirmed' || key == 'inbound'
-                                        || key == 'tobepaid' || key == 'completed' || key == 'unavailable' || key == 'toBeReviewed') {
-                                        if(!$scope.counts) {
-                                            $scope.counts = {};
+                        if (!$scope.startDate && !$scope.endDate && !$scope.keyword) {
+                            if ($scope.childStatus == '') {
+                                if (page.content) {
+                                    angular.forEach(page, function (value, key) {
+                                        if (key == 'all' || key == 'tobeconfirmed' || key == 'comfirmed' || key == 'inbound'
+                                            || key == 'tobepaid' || key == 'completed' || key == 'unavailable' || key == 'toBeReviewed') {
+                                            if (!$scope.counts) {
+                                                $scope.counts = {};
+                                            }
+                                            $scope.counts[key] = value;
                                         }
-                                        $scope.counts[key] = value;
-                                    }
-                                    $scope.counts[$scope.status] = page.totalElements;
-                                });
-                            } else {
-                                $scope.counts = {};
+                                        $scope.counts[$scope.status] = page.totalElements;
+                                    });
+                                } else {
+                                    $scope.counts = {};
+                                }
                             }
                         }
+
                         $scope.purchases = page.content;
                         $scope.requestOver = 0;
                         angular.forEach($scope.purchases, function (order) {
@@ -801,6 +807,7 @@ define(['app/app'], function (app) {
                 $scope.endDate = null;
                 return;
             }
+            $scope.setChildStatus('','订单状态');
             $scope.orderTableParams.page(1);
             $scope.orderTableParams.reload();
         };

src/main/webapp/resources/view/admin/trade/trade_invoicefromorder_detail.html

@@ -165,7 +165,11 @@
 		</div>
 		<div class="row-fluid">
 			<div class="span3">
-				<span>金额：</span>
+				<span>运费：</span>
+				<span class="text-inverse" ng-bind="invoiceFOrder.currencyName"></span>
+				<span class="text-inverse" ng-bind="invoiceFOrder.fare | formateNumber : 2 | currencySysmbol : invoiceFOrder.currency"></span>
+
+				<span style="margin-left: 20px;">合计：</span>
 				<span class="text-inverse" ng-bind="invoiceFOrder.currencyName"></span>
 				<span class="text-inverse" ng-bind="invoiceFOrder.ensurePrice | formateNumber : 2 | currencySysmbol : invoiceFOrder.currency"></span>
 			</div>

src/main/webapp/resources/view/admin/trade/trade_invoicefrompurc_detail.html

@@ -174,9 +174,14 @@
 		</div>
 		<div class="row">
 			<div class="col-xs-3">
-				<span>金额：</span>
+				<span>运费：</span>
 				<span class="text-inverse" ng-bind="invoiceFPur.currencyName"></span>
-				<span class="text-inverse" ng-bind="invoiceFPur.price | formateNumber : 2"></span>
+				<span class="text-inverse" ng-bind="invoiceFPur.fare || 0 | formateNumber : 2"></span>
+			</div>
+			<div class="col-xs-3">
+				<span>合计：</span>
+				<span class="text-inverse" ng-bind="invoiceFPur.currencyName"></span>
+				<span class="text-inverse" ng-bind="invoiceFPur.ensurePrice | formateNumber : 2"></span>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/view/admin/trade/trade_order_detail.html

@@ -351,7 +351,11 @@
 		</div>
 		<div class="row-fluid">
 			<div class="col-md-3">
-				<span>金额：</span> <a class="text-inverse"><span ng-bind="orderDetailInfo.currency"></span>&nbsp;<span ng-bind="orderDetailInfo.price | number:2"></span>
+				<span>运费：</span> <a class="text-inverse"><span ng-bind="orderDetailInfo.currency"></span>&nbsp;<span ng-bind="orderDetailInfo.fare || 0 | number:2"></span>
+			</a>
+			</div>
+			<div class="col-md-3">
+				<span>总计：</span> <a class="text-inverse"><span ng-bind="orderDetailInfo.currency"></span>&nbsp;<span ng-bind="orderDetailInfo.ensurePrice | number:2"></span>
 				</a>
 			</div>
 		</div>

src/main/webapp/resources/view/admin/trade/trade_purchase_detail.html

@@ -211,9 +211,14 @@
 		</div>
 		<div class="row-fluid col-md-9">
 			<div class="col-md-4">
-				<span>金额：</span>
+				<span>运费：</span>
 				<span ng-bind="purchaseDetailInfo.currency" class="text-inverse"></span>
-				<span ng-bind="purchaseDetailInfo.price | number:2" class="text-inverse"></span>
+				<span ng-bind="purchaseDetailInfo.fare || 0 | number:2" class="text-inverse"></span>
+			</div>
+			<div class="col-md-4">
+				<span>总计：</span>
+				<span ng-bind="purchaseDetailInfo.currency" class="text-inverse"></span>
+				<span ng-bind="purchaseDetailInfo.ensurePrice | number:2" class="text-inverse"></span>
 			</div>
 		</div>
 	</div>		

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

@@ -740,7 +740,6 @@
 								<a href="user#/order/detail/{{order.orderid | EncryptionFilter}}" class="oder_d action-link" style="display: block;" target="_blank">订单详情</a>
 								<a class="action-link" href="user#/buyerQueryLogistics/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 404 || order.status == 520 || order.status == 405 || order.status == 521" style="display: block;" target="_blank">查看物流</a>
 
-								<a class="action-link" href="user#/buyerQueryLogistics/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 404" style="display: block;" target="_blank">查看物流</a>
 								<a ng-if="order.isEachRate && (order.rateStatus == 523 || order.rateStatus == 522)" class="oder_d action-link" target="_blank" href="user#/rate/showRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   双方已评
                               	</a>

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1169,7 +1169,7 @@
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">点击发货</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
                                 <!--<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>-->
-                                <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
+                                <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 &&!purchase.uasPurcid" ng-click="modifyLogistic(purchase)" style="position: relative;">修改物流</a>
 								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate && requestOver==purchases.length">追加评价</a>
 								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate && requestOver==purchases.length">评价</a>
 								<!--<div ng-if="purchase.status == 520" class="clock-mind">