Merge branch 'release-201821-wangcz' into dev

src/main/java/com/uas/platform/b2c/core/constant/Type.java

@@ -252,15 +252,21 @@ public enum Type {
 	ENTERPRISING(1602, "ENTERPRISING"),
 
 	/**
-	 * 付款给平台
+	 * 买家付款给平台
 	 */
 	PAIDTOPLATFORM(1603, "PAIDTOPLATFORM"),
 
 	/**
-	 * 付款给卖家
+	 * 买家付款给卖家
 	 */
 	PAIDTOVENDOR(1604, "PAIDTOVENDOR"),
 
+
+	/**
+	 * 平台付款给卖家
+	 */
+	PLATFORMPAIDTOVENDOR(1605, "PLATFORMPAIDTOVENDOR"),
+
 	/**
 	 * {@code 1666 企业入库 <b>企业入库</b>}
 	 */

src/main/java/com/uas/platform/b2c/fa/payment/controller/BankTransferController.java

@@ -245,6 +245,15 @@ public class BankTransferController {
 		return bankTransferService.getVendorBankTransferByMall(params, Type.SUP.value(), keyword, fromDate, toDate, remitteeType);
 	}
 
+	/**
+	 * 获取供应商的的收款转账
+	 * @return ResultMap
+	 */
+	@RequestMapping(value = "/vendor/bankTransfer/ledger", method = RequestMethod.GET, params = "type=sup")
+	public ResultMap getVendorBankTransferLedger() {
+		return bankTransferService.getVendorBankTransferLedger();
+	}
+
 	/**
 	 * 导出收款记录到excel表中
 	 * @param isAjax

src/main/java/com/uas/platform/b2c/fa/payment/dao/BankTransferDao.java

@@ -1,15 +1,13 @@
 package com.uas.platform.b2c.fa.payment.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2c.fa.payment.model.BankTransfer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2c.fa.payment.model.BankTransfer;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import java.util.List;
 
 /** 
   * @author yujia 
@@ -28,6 +26,15 @@ public interface BankTransferDao extends JpaSpecificationExecutor<BankTransfer>,
 	 */
 	public List<BankTransfer> findByCollectenuu(Long collectenuu);
 
+	/**
+	 * 统计卖家的应收对账总金额
+	 * @param operateType
+	 * @param collectenuu
+	 * @return
+	 */
+	@Query(value = "select b.total from BankTransfer b where b.operateType = :operateType and b.collectenuu = :collectenuu")
+	List<Double> getLedgerByTypeAndEnuu(@Param("operateType") Integer operateType, @Param("collectenuu") Long collectenuu);
+
 	/**
 	 * 根据转账流水单id查找转账信息（客户）
 	 *

src/main/java/com/uas/platform/b2c/fa/payment/service/BankTransferService.java

@@ -151,6 +151,12 @@ public interface BankTransferService {
 	 */
 	ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate, String remitteeType);
 
+	/**
+	 * 获取卖家的总账
+	 * @return
+	 */
+	ResultMap getVendorBankTransferLedger();
+
 	/**
 	 * 导出excel数据
 	 * @param type

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -178,6 +178,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		bankTransfer.setBanktranssn(EncodingRulesConstant.BANKTRANSFER.replace("_TIMESTAP_NUMBER", createNumberService.getTimeNumber("trade$bank_transfer", 8)));
 		bankTransfer.setTranferCreateTime(date);
 		bankTransfer.setOperateType(Type.MALL.value());
+		bankTransfer.setType(com.uas.platform.b2c.core.constant.Type.PLATFORMPAIDTOVENDOR.getPhrase());
 		BankTransfer saveBankTransfer = bankTransferDao.save(bankTransfer);
 		// 保存银行转账关联信息
 		if (saveBankTransfer != null) {
@@ -577,6 +578,23 @@ public class BankTransferServiceImpl implements BankTransferService {
 		return ResultMap.success(resultMap);
 	}
 
+	/**
+	 * 获取卖家的总账
+	 *
+	 * @return
+	 */
+	@Override
+	public ResultMap getVendorBankTransferLedger() {
+		List<Double> totals = bankTransferDao.getLedgerByTypeAndEnuu(Type.SUP.value(), SystemSession.getUser().getEnterprise().getUu());
+		Double total = 0d;
+		if (org.apache.commons.collections.CollectionUtils.isNotEmpty(totals)) {
+			for (Double money : totals) {
+				total = NumberUtil.add(money, total);
+			}
+		}
+		return ResultMap.success(total);
+	}
+
 	@Override
 	public List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate, String remitteeType) {
 		if(type == null || (type != Type.SUP.value() && type != Type.MALL.value())) {

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/SettlementServiceImpl.java

@@ -513,6 +513,7 @@ public class SettlementServiceImpl implements SettlementService {
 			doubles.toArray(prices);
 			BankTransfer transfer = new BankTransfer();
 			transfer.setOperateType(Type.SUP.value());
+			transfer.setType(com.uas.platform.b2c.core.constant.Type.PLATFORMPAIDTOVENDOR.getPhrase());
 			Double aDouble = NumberUtil.fractionNumCeil(NumberUtil.add(0.0, prices), 2);
 			transfer.setTotal(aDouble);
 			transfer.setCurrencyName(bankTransfer.getCurrencyName());

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -1841,7 +1841,7 @@ public class GoodsServiceImpl implements GoodsService {
         // 修改上下架状态并产生上下架历史
         GoodsHistory goodsHistory = null;
         if (!nowGoods.getStatus().equals(oldGoods.getStatus())) {
-            nowGoods.setStatus(oldGoods.getStatus());
+            //nowGoods.setStatus(oldGoods.getStatus());
             // 如果是下架
             if (oldGoods.getStatus().equals(Status.REMOVED.value())) {
                 goodsHistory = goodsHistoryService.converTGoodsHist(nowGoods, OperateType.Down.getPhrase(), false);
@@ -4243,6 +4243,7 @@ public class GoodsServiceImpl implements GoodsService {
                 goods.setKindUuid(product.getKindid());
                 goods.setKindNameCn(product.getKind());
                 goods.setImg(product.getCmpImg());
+                goods.setUuid(product.getCmpUuId());
                 goods.setCode(product.getPcmpcode());
                 GoodsHistory history = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Update.getPhrase(), false);
                 list.add(history);

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -1248,7 +1248,6 @@ public class ProductServiceImpl implements ProductService {
             product.setEncapsulation(result.getEncapsulation());
         }
         product.setCmpImg(result.getImg());
-
         return product;
     }
 

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -193,6 +193,9 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		ModelMap modelMap = new ModelMap();
 		// 获取第一个工作表
 		Sheet sheet = workbook.getSheetAt(0);
+		if (sheet.getRow(0) == null) {
+			throw new IllegalOperatorException("表格模板不正确！请重新下载最新模板");
+		}
 		int colNum = sheet.getRow(0).getPhysicalNumberOfCells();
 		if (isAPerson) {
 			if (colNum != UploadConstant.TOTAL_COLUMN_PERSON && colNum != UploadConstant.MAX_TOTAL_COLUMN_PERSON) {
@@ -329,12 +332,15 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
                 success = releaseProductByBatchDao.getCountPublisherUuAndBatchAndReleaseCode(userUU, batch, ReleaseStatus.success.value());
             }
 		}
-		String publish = publishByBatch(batch, isPcb);
+		if (!isAPerson && !isPcb) {
+			String publish = publishByBatch(batch, isPcb);
+			modelMap.put("publish", publish);
+		}
 		modelMap.put("total", total);
 		modelMap.put("success", success);
 		modelMap.put("failure", failure);
 		modelMap.put("filter", filter);
-		modelMap.put("publish", publish);
+		modelMap.put("batch", batch);
 		return modelMap;
 	}
 

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -86,7 +86,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 						productCondition = "pr_pbranden = '" + keyword + "'";
 						break;
                     default :
-                        enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
+                        enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '%"
                                 + keyword + "%')";
                         break;
 				}
@@ -240,8 +240,11 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		enCountSql.append("select count(1) from (select distinct(en_uu) from (select en_uu from sec$enterprises where en_name not like '%测试%' " +
 				" and en_name not like '%test%' and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%' " +
 				" or en_area like '%香港%')and (en_name not REGEXP '^[0-9]*$' and (en_name like '%ltd%' or en_name like '%limited%' or " +
-				" en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') ) and en_uu <> ")
-				.append(enUU).append(") e ");
+				" en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') ) and ");
+		if (StringUtils.isEmpty(productCondition)) {
+			enCountSql.append(enterpriseCondition).append(" and ");
+		}
+		enCountSql.append(" en_uu <> ").append(enUU).append(") e ");
 		if (!StringUtils.isEmpty(productCondition)) {
 			enCountSql.append("right join ( select pr_enuu from products where ").append(productCondition).append(") p on pr_enuu = en_uu");
 			enCountSql.append(" union select en_uu from sec$enterprises where en_name not like '%测试%'  and en_name not like '%test%' and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%'  or en_area like '%香港%')and (en_name not REGEXP '^[0-9]*$' and (en_name like '%ltd%' or en_name like '%limited%' or  en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]') and ")

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

@@ -33,7 +33,9 @@
 <!-- 消息提示框 End -->
 <!-- Loading Start -->
 <div id="loading" class="loading">
-    <i></i>
+    <div class="wrap">
+        <div class="outer"></div>
+    </div>
 </div>
 <!-- Loading End -->
 <!-- 最顶部站点导航 -->

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

@@ -64,7 +64,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 </body>

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

@@ -287,7 +287,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

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

@@ -22,7 +22,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/WEB-INF/views/normal/erp/vendor_center.html

@@ -28,7 +28,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

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

@@ -57,7 +57,9 @@
 	
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	

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

@@ -23,7 +23,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

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

@@ -32,7 +32,9 @@
 <!-- 消息提示框 End -->
 <!-- Loading Start -->
 <div id="loading" class="loading">
-	<i></i>
+	<div class="wrap">
+		<div class="outer"></div>
+	</div>
 </div>
 <!-- Loading End -->
 <!-- 最顶部站点导航 -->

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

@@ -33,7 +33,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	<!-- 最顶部站点导航 -->

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

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	

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

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

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

@@ -35,7 +35,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 	<header>

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

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

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

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

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

@@ -24,7 +24,9 @@
 	<!-- 消息提示框 End -->
 	<!-- Loading Start -->
 	<div id="loading" class="loading">
-		<i></i>
+		<div class="wrap">
+			<div class="outer"></div>
+		</div>
 	</div>
 	<!-- Loading End -->
 

src/main/webapp/resources/js/common/query/bankTransfer.js

@@ -51,6 +51,13 @@ define(['ngResource'], function(ngResource) {
 				params : {
 					type : 'sup'
 				}
+			},
+			getTotalTransferMoney: {
+				url: '/trade/transfer/vendor/bankTransfer/ledger',
+				method: 'GET',
+				params: {
+					type: 'sup'
+				}
 			}
 		});
 	}]);

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -23,6 +23,15 @@ define(['app/app'], function (app) {
             keyword: ''
         };
 
+        if ($scope.isAdmin) {
+            User.isDevOrProd(null, function (data) {
+                // $scope.isProd = data.data;
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323';
+                applyToEnterpriseTableParams();
+            }, function (response) {
+                toaster.pop('error', '获取运行环境失败');
+            });
+        }
         //table设置
         var applyToEnterpriseTableParams = function () {
             $scope.applyToEnterpriseTableParams = new ngTableParams({
@@ -38,6 +47,7 @@ define(['app/app'], function (app) {
                             return;
                         }
                     }
+                    console.log('12', param)
                     //param.page = param.page;
                     param.size = param.count;
                     param.speaceUU = $scope.userInfo.enterprise.uu;
@@ -57,12 +67,13 @@ define(['app/app'], function (app) {
                             status: param.status,
                             keyword: param.keyword
                         }
-                    }).success(function (page) {
-                        params.total(page.content.totalElements);
-                        $scope.page = page.content;
-                        $scope.totalPages = page.content.totalPages;
-                        $scope.content = page.content.content;
-                        $scope.totalElements = page.content.totalElements;
+                    }).success(function (data) {
+                        params.total(data.content.totalElements);
+                        $defer.resolve(data.content.content);
+                        $scope.page = data.content
+                        $scope.totalPages = data.content.totalPages;
+                        $scope.content = data.content.content;
+                        $scope.totalElements = data.content.totalElements;
                     }).error(function (response) {
                         toaster.pop('error', '获取未处理审批数据失败');
                     });
@@ -82,16 +93,6 @@ define(['app/app'], function (app) {
                 }
             });
         };
-
-        if ($scope.isAdmin) {
-            User.isDevOrProd(null, function (data) {
-                // $scope.isProd = data.data;
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://192.168.253.6:32323';
-                applyToEnterpriseTableParams();
-            }, function (response) {
-                toaster.pop('error', '获取运行环境失败');
-            });
-        }
         // 申请
         $scope.auditApply = function (status, id, UU) {
             var param = {
@@ -218,6 +219,10 @@ define(['app/app'], function (app) {
          * 添加未注册用户
          */
         $scope.addUser = function () {
+            if (!$scope.newUser.userName) {
+                toaster.pop('error', '请输入用户名信息');
+                return;
+            }
             if (!$scope.userEmailSuccess || !$scope.userTelSuccess) {
                 toaster.pop('error', '请输入正确的信息后提交');
                 return;

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

@@ -645,7 +645,7 @@ define([ 'app/app' ], function(app) {
 							return;
 						}
 						imageArray.push($scope.imagesList[i].imageUrl);
-					} else if ($scope.type == "PAIDTOVENDOR" && $scope.imagesList[i].imageUrl == '') {
+					} else if ($scope.type == "PAIDTOVENDOR" && !$scope.imagesList[i].imageUrl) {
 						if ($scope.diliverPrice[i] != '') {
 							toaster.pop('info','提示','请输入付款金额对应的付款截图');
 							return;

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

@@ -270,7 +270,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           $scope.checkProdTitle = function () {
               $scope.validObj.prodTitle = $scope.applyObj.prodTitle && $scope.applyObj.prodTitle !== '';
               if (!$scope.validObj.prodTitle) {
-                  toaster.pop('error', '类目不能为空');
+                  toaster.pop('error', '物料名称不能为空');
               }
               return $scope.validObj.prodTitle;
           }

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

@@ -22,6 +22,19 @@ define(['app/app'], function(app) {
         $scope.paytype = 'ALL';
         $scope.$$transfer = {};
 
+        var getTransferMoney = function () {
+            bankTransferService.getTotalTransferMoney({}, function (data) {
+                if (data.code == 1) {
+                    $scope.totalPrice = data.data;
+                } else {
+                    toaster.pop('error', data.message || '获取收入总额失败');
+                }
+            }, function (error) {
+                toaster.pop('error', error.data || '获取收入总额失败');
+            })
+        }
+        getTransferMoney();
+
         var getTradeRecordInfo = function () {
             $scope.tradeRecordTableParams = new ngTableParams({
                 page : 1,
@@ -49,7 +62,7 @@ define(['app/app'], function(app) {
                                 $scope.currencySymbol = $scope.bankTransRecore[0].currencyName;
                             }
                             var pageObject = page.data.data;
-                            $scope.totalPrice = page.data.total;
+                            // $scope.totalPrice = page.data.total;
                             angular.forEach($scope.bankTransRecode, function (bankT) {
                                 bankT.jsonReceive = angular.fromJson(bankT.jsonReceive);
                             });

src/main/webapp/resources/view/sso/forstore/ssoCenter.html

@@ -181,7 +181,7 @@
         <div class="data_analyze bind-enter" ng-if="isAdmin">
             <div class="com_menu01">
                 <span>企业绑定申请</span>
-                <a class="pull-right" ng-show="totalElements > 5" ng-href="sso#/apply">查看更多</a>
+                <a class="pull-right" ng-show="totalElements > 5" ng-href="sso#/management">查看更多</a>
             </div>
             <table class="bind-enter-tab">
                 <thead>