Merge remote-tracking branch 'origin/release-201821-wangcz' into release-201821-wangcz

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

@@ -577,6 +577,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/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);

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

@@ -329,12 +329,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/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 = {

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/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>