Merge branch 'release-201821-wangcz'

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

@@ -108,7 +108,6 @@ public class AuthenticationController {
 		request.getSession().setAttribute("user", user);
 
 		SSOToken token = (SSOToken)SSOHelper.getToken(request);
-		logger.info(String.format("切换账套,用户:%s,获取用户信息成功,手机号：%s", user.getUserName(), token.getUid()));
 		UserAccount tokenUser = FlexJsonUtils.fromJson(token.getData(), UserAccount.class);
 		if (enUU == 0L) {
 			tokenUser.setSpaceUU(null);

src/main/java/com/uas/platform/b2c/common/weixin/service/impl/WeChatServiceImpl.java

@@ -58,6 +58,8 @@ public class WeChatServiceImpl implements WeChatService{
     @Override
     public ModelMap getWxUserInfo(String code, String state, String openId) {
         logger.info("得到用户信息 code: {}, state: {}, openId: {}", code, state, openId);
+
+        long start = System.currentTimeMillis();
         ModelMap result = new ModelMap();
         if (!StringUtils.isEmpty(code)) {
             AuthUserInfo userInfo = null;
@@ -87,6 +89,7 @@ public class WeChatServiceImpl implements WeChatService{
             result.put("userAccount", userAccount);
             result.put("enterprises", enterprises);
         }
+        logger.info("微信：得到用户信息总耗时: {}ms", System.currentTimeMillis() - start);
         return result;
     }
 
@@ -205,12 +208,15 @@ public class WeChatServiceImpl implements WeChatService{
      */
     private AuthUserInfo getAccessTokenByCode(String code) throws Exception {
         logger.info("通过code获取用户openId, code: {}", code);
+        long start = System.currentTimeMillis();
         AuthTokenParams authTokenParams = new AuthTokenParams(WeChatUtil.APPID, WeChatUtil.APPSECRET, code, "authorization_code");
         String json = HttpReqUtil.doGet(WeChatUtil.GET_OAUTH_TOKEN_URL, authTokenParams.getParams());
         AuthAccessToken authAccessToken = FlexJsonUtils.fromJson(json, AuthAccessToken.class);
         if (authAccessToken.getOpenid() == null) {
             throw new WeChatException(json);
         }
+
+        logger.info("请求微信接口，得到 AuthAccessToken: {}, 耗时: {}ms", json, System.currentTimeMillis() - start);
         String accessToken = authAccessToken.getAccess_token();
         String openId = authAccessToken.getOpenid();
         // 可能抛出异常，向上抛
@@ -228,11 +234,14 @@ public class WeChatServiceImpl implements WeChatService{
         logger.info("获取用户信息 accessToken: {}, openId: {}", accessToken, openId);
         // 返回国家地区语言版本，zh_CN 简体，zh_TW 繁体，en 英语
         AuthUserParams authUserParams = new AuthUserParams(accessToken, openId, "zh_CN");
+
+        long start = System.currentTimeMillis();
         String json = HttpReqUtil.doGet(WeChatUtil.SNS_USERINFO_URL, authUserParams.getParams());
         AuthUserInfo authUserInfo = FlexJsonUtils.fromJson(json, AuthUserInfo.class);
         if (authUserInfo.getOpenid() == null) {
             throw new WeChatException(json);
         }
+        logger.info("请求微信接口，得到用户信息: {}, 耗时: {}ms", json, System.currentTimeMillis() - start);
         return authUserInfo;
     }
 
@@ -246,11 +255,12 @@ public class WeChatServiceImpl implements WeChatService{
             logger.info("从缓存中得到 access_token: {}", access_token);
             return access_token;
         }
+        long start = System.currentTimeMillis();
         AuthTokenParams authTokenParams = new AuthTokenParams(WeChatUtil.APPID, WeChatUtil.APPSECRET,"client_credential");
         String json = HttpReqUtil.doGet(WeChatUtil.GET_ACCESS_TOKEN, authTokenParams.getParams());
         AccessToken accessToken = FlexJsonUtils.fromJson(json, AccessToken.class);
         access_token = accessToken.getAccess_token();
-        logger.info("请求微信接口，得到 access_token: {}", access_token);
+        logger.info("请求微信接口，得到 access_token: {}, 耗时: {}ms", access_token, System.currentTimeMillis() - start);
         redisTemplate.opsForValue().set("WX_ACCESS_TOKEN", access_token, ACCESS_TOKEN_EXPIRES_IN, TimeUnit.SECONDS);
         return access_token;
     }

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/core/filter/SSOInterceptor.java

@@ -156,7 +156,6 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
     protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
         User user = (User) request.getSession().getAttribute("user");
         SSOToken token = SSOHelper.attrToken(request);
-        logger.info(String.format("用户:%s,获取用户信息成功,手机号：%s", null == user ? "" : user.getUserName(), token.getUid()));
         // cookie变化的情况下，session可能还未变化
         if (user == null || (user.getUserTel() != null && !token.getUid().equals(user.getUserTel()))) {
             user = getUserByToken(token);

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

@@ -2,13 +2,12 @@ package com.uas.platform.b2c.fa.payment.controller;
 
 
 import com.uas.platform.b2c.core.config.SysConf;
+import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.fa.payment.model.BankInfo;
 import com.uas.platform.b2c.fa.payment.model.BankTransfer;
 import com.uas.platform.b2c.fa.payment.service.BankTransferService;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.trade.order.model.OrderSimpleInfo;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
@@ -242,8 +241,17 @@ public class BankTransferController {
 	@RequestMapping(value = "/vendor/bankTransfer/page", method = RequestMethod.GET, params = "type=sup")
 	@ApiOperation(value = "获取供应商的的收款转账单", httpMethod = "GET")
 	public ResultMap getVendorBankTransferByMall(@ApiParam(required = true, value = "分页参数") PageParams params,
-												String keyword, Long fromDate, Long toDate) {
-		return bankTransferService.getVendorBankTransferByMall(params, Type.SUP.value(), keyword, fromDate, toDate);
+												String keyword, Long fromDate, Long toDate, String remitteeType) {
+		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();
 	}
 
 	/**
@@ -257,7 +265,7 @@ public class BankTransferController {
 	 */
 	@RequestMapping(value = "/export/bankTransfer", method = RequestMethod.POST)
 	public ModelAndView exportPayRecordToExcel(@RequestParam(required = false, value = "isAjax", defaultValue = "false")Boolean isAjax, HttpServletRequest request,
-											   String keyword, Long fromDate, Long toDate){
+											   String keyword, Long fromDate, Long toDate, String remitteeType){
 		HttpSession session = request.getSession();
 		ModelAndView modelAndView = new ModelAndView();
 		Object loading = session.getAttribute("loading");
@@ -271,7 +279,7 @@ public class BankTransferController {
 			return modelAndView;
 		}
 		session.setAttribute("loading", true);
-		List<BankTransfer> data = bankTransferService.getExportData(Type.SUP.value(), keyword, fromDate, toDate);
+		List<BankTransfer> data = bankTransferService.getExportData(Type.SUP.value(), keyword, fromDate, toDate, remitteeType);
 		modelAndView.addObject("data", data);
 		modelAndView.addObject("operator", "+");
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/bankTransfer", "优软商城-卖家交易记录"));

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

@@ -8,7 +8,6 @@ import com.uas.platform.core.model.PageParams;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
-import java.util.Random;
 
 /**
  * The interface BankTransfer service.
@@ -150,7 +149,13 @@ public interface BankTransferService {
 	 * @param type   the type 指定类型
 	 * @return ResultMap
 	 */
-	ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate);
+	ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate, String remitteeType);
+
+	/**
+	 * 获取卖家的总账
+	 * @return
+	 */
+	ResultMap getVendorBankTransferLedger();
 
 	/**
 	 * 导出excel数据
@@ -160,5 +165,5 @@ public interface BankTransferService {
 	 * @param toDate
 	 * @return
 	 */
-	List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate);
+	List<BankTransfer> getExportData(Integer type, String keyword, Long fromDate, Long toDate, String remitteeType);
 }

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) {
@@ -322,6 +323,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			orderN.setBuyaccount(bankTransfer.getJsonPament());
 			orderN.setSelleraccount(bankTransfer.getJsonReceive());
 			orderN.setPaytime(new Date());
+			orderN.setRemitteeType(bankTransfer.getType());
 			orderN.setPaytype(Type.Payment_CompanyTransfer_Code.value());
 
 			//修改采购单的状态
@@ -384,6 +386,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 					}
 
 				}
+				orderN.setRemitteeType(bankTransfer.getType());
 				orderN.setBuyaccount(bankTransfer.getJsonPament());
 				orderN.setSelleraccount(bankTransfer.getJsonReceive());
 				orderN.setPaytime(new Date());
@@ -541,7 +544,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 	 * @return Page<BankTransfer>
 	 */
 	@Override
-	public ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate) {
+	public ResultMap getVendorBankTransferByMall(PageParams params, Integer type, String keyword, Long fromDate, Long toDate, String remitteeType) {
 		if(type == null || (type != Type.SUP.value() && type != Type.MALL.value()) || params == null) {
 			return new ResultMap(CodeType.NO_INFO, "参数信息丢失");
 		}
@@ -551,7 +554,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
 		info.expression(PredicateUtils.isNotNull("transferTime"));
-		filterPageInfo(info, keyword, fromDate, toDate);
+		filterPageInfo(info, keyword, fromDate, toDate, remitteeType);
 
 		Page<BankTransfer> pageBankTran = bankTransferDao.findAll(new Specification<BankTransfer>() {
 			@Override
@@ -575,8 +578,25 @@ 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) {
+	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())) {
 			throw new IllegalOperatorException("参数丢失，刷新后重试");
 		}
@@ -587,7 +607,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		}
 		info.expression(PredicateUtils.isNotNull("transferTime"));
 		info.sorting(Sort.Direction.DESC, "transferTime");
-		filterPageInfo(info, keyword, fromDate, toDate);
+		filterPageInfo(info, keyword, fromDate, toDate, remitteeType);
 		List<BankTransfer> list = bankTransferDao.findAll(new Specification<BankTransfer>() {
 			@Override
 			public Predicate toPredicate(Root<BankTransfer> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
@@ -598,7 +618,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 		return list;
 	}
 
-	private void filterPageInfo(PageInfo info, String keyword, Long fromDate, Long toDate){
+	private void filterPageInfo(PageInfo info, String keyword, Long fromDate, Long toDate, String remitteeType){
 		if (StringUtils.hasText(keyword)){
 			SimpleExpression[] simpArrs = new SimpleExpression[2];
 			simpArrs[0] = new SimpleExpression("orderid", keyword, CriterionExpression.Operator.LIKE, true);
@@ -612,5 +632,8 @@ public class BankTransferServiceImpl implements BankTransferService {
 		if (toDate != null) {
 			info.expression(PredicateUtils.lte("transferTime", new Date(toDate), false));
 		}
+		if (!StringUtils.isEmpty(remitteeType)) {
+			info.expression(PredicateUtils.eq("type", remitteeType, false));
+		}
 	}
 }

src/main/java/com/uas/platform/b2c/fa/payment/utils/ApipaySubmit.java

@@ -5,9 +5,13 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.log4j.Logger;
 import org.springframework.core.io.FileSystemResource;
 
 public class ApipaySubmit {
+
+	private static Logger logger = Logger.getLogger(ApipaySubmit.class);
+
 	/**
 	 * api请求的签名工具方法，把请求参数按照字符排序拼接，然后进行RAS加密
 	 * 
@@ -25,6 +29,7 @@ public class ApipaySubmit {
 			pfxCertFileInputStream = new FileSystemResource(DirectPayConfig.PATH_PARTER_PKCS12).getInputStream();
 			signResult = SignUtils.rsaSign(sPara, sParaTemp.get("charset"), pfxCertFileInputStream);
 		} catch (Exception e) {
+			logger.error(e.getMessage());
 			throw new RuntimeException("签名失败，请检查证书文件是否存在，密码是否正确");
 		}
 
@@ -50,6 +55,7 @@ public class ApipaySubmit {
 					.getInputStream();
 			isSign = SignUtils.rsaCheckContent(publicCertFileInputStream, responseBody, sign, charset);
 		} catch (Exception e) {
+			logger.error(e.getMessage());
 			throw new RuntimeException("验证签名失败，请检查银盛公钥证书文件是否存在");
 		}
 
@@ -71,6 +77,7 @@ public class ApipaySubmit {
 			String mysign = SignUtils.rsaSign(sPara, sParaTemp.get("charset"), pfxCertFileInputStream);
 			sPara.put("sign", mysign);
 		} catch (Exception e) {
+			logger.error(e.getMessage());
 			throw new RuntimeException("签名失败，请检查证书文件是否存在，密码是否正确");
 		}
 
@@ -97,6 +104,7 @@ public class ApipaySubmit {
 			}
 			isSign = SignUtils.rsaCheckContent(publicCertFileInputStream, params, sign, DirectPayConfig.DEFAULT_CHARSET);
 		} catch (Exception e) {
+			logger.error(e.getMessage());
 			throw new RuntimeException("验证签名失败，请检查银盛公钥证书文件是否存在");
 		}
 

src/main/java/com/uas/platform/b2c/fa/payment/utils/SignUtils.java

@@ -14,12 +14,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
 
 public class SignUtils {
-	// static {
-	// Security.addProvider(
-	// new org.bouncycastle.jce.provider.BouncyCastleProvider());
-	// }
+
+	private static Logger logger = Logger.getLogger(SignUtils.class);
 
 	/**
 	 * 缓存公钥和私钥
@@ -98,7 +97,7 @@ public class SignUtils {
 			return sign;
 		} catch (Exception e) {
 			System.out.println("签名失败：content[" + content + "], charset[" + charset + "]");
-			throw new Exception("RSAcontent = " + content + "; charset = " + charset, e);
+			throw new Exception("签名失败：RSAcontent = " + content + "; charset = " + charset, e);
 		}
 	}
 

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,7 +332,10 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
                 success = releaseProductByBatchDao.getCountPublisherUuAndBatchAndReleaseCode(userUU, batch, ReleaseStatus.success.value());
             }
 		}
-
+		if (!isAPerson && !isPcb) {
+			String publish = publishByBatch(batch, isPcb);
+			modelMap.put("publish", publish);
+		}
 		modelMap.put("total", total);
 		modelMap.put("success", success);
 		modelMap.put("failure", failure);

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.prod.product.common;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2c.prod.product.common.dao.CommonCountDao;
 import com.uas.platform.b2c.prod.product.common.model.CommonCount;
 import com.uas.platform.core.util.HttpUtil;
@@ -36,7 +37,11 @@ public class CommonTask {
                 try {
                     String responseText = HttpUtil.sendGetRequest(commonCount.getSql(), null).getResponseText();
                     if (!StringUtils.isEmpty(responseText)) {
-                        commonCount.setCount(Double.parseDouble(responseText));
+                        if (responseText.contains("{")) {
+                            commonCount.setCount(JSON.parseObject(responseText).getDouble("count"));
+                        } else {
+                            commonCount.setCount(Double.parseDouble(responseText));
+                        }
                     }
                 } catch (Exception e) {
                 }

src/main/java/com/uas/platform/b2c/prod/product/component/dao/ComponentInfoDao.java

@@ -77,10 +77,11 @@ public interface ComponentInfoDao extends JpaSpecificationExecutor<ComponentInfo
 
 	/**
 	 * 获取一页有图片的器件
-	 * @param pageable 分页参数
+	 * @param count 分页参数
 	 * @return 库存数量大于指定值的一页器件
 	 */
-	Page<ComponentInfo> findByImgIsNotNull(Pageable pageable);
+	@Query(value = "select * from product$component c where c.cmp_img is not null limit 0,:count", nativeQuery = true)
+	List<ComponentInfo> findByImgIsNotNull(@Param("count") Integer count);
 
 	/**
 	 * 根据批次号获取器件信息

src/main/java/com/uas/platform/b2c/trade/deprecated/controller/RecommendController.java

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 推荐
  *
@@ -32,7 +34,7 @@ public class RecommendController {
     }
 
     @RequestMapping(value = "/comps", method = RequestMethod.GET)
-    public Page<ComponentInfo> getRecommendCompsForUser(Long userUU, String usedFor, Pageable pageable) {
+    public List<ComponentInfo> getRecommendCompsForUser(Long userUU, String usedFor, Pageable pageable) {
         logger.info(String.format("推荐服务：%s 在 %s 获取推荐器件，分页信息: %s", userUU, usedFor, pageable.toString()));
         return recommendService.getRecommendCompsForUser(userUU, usedFor, pageable);
     }

src/main/java/com/uas/platform/b2c/trade/deprecated/service/RecommendService.java

@@ -1,10 +1,12 @@
 package com.uas.platform.b2c.trade.deprecated.service;
 
-import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
 /**
  * 推荐服务
  * @author yangck
@@ -27,5 +29,5 @@ public interface RecommendService {
      * @param pageable 分页信息
      * @return 一页ComponentInfo
      */
-    Page<ComponentInfo> getRecommendCompsForUser(Long userUU, String usedFor, Pageable pageable);
+    List<ComponentInfo> getRecommendCompsForUser(Long userUU, String usedFor, Pageable pageable);
 }

src/main/java/com/uas/platform/b2c/trade/deprecated/service/impl/RecommendServiceImpl.java

@@ -1,15 +1,18 @@
 package com.uas.platform.b2c.trade.deprecated.service.impl;
 
-import com.uas.platform.b2c.prod.product.component.dao.ComponentInfoDao;
-import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
+import com.uas.platform.b2c.prod.product.component.dao.ComponentInfoDao;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentInfo;
 import com.uas.platform.b2c.trade.deprecated.service.RecommendService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author yangck
  */
@@ -38,8 +41,11 @@ public class RecommendServiceImpl implements RecommendService {
     }
 
     @Override
-    public Page<ComponentInfo> getRecommendCompsForUser(Long userUU, String usedFor, Pageable pageable) {
-        Page<ComponentInfo> page = componentInfoDao.findByImgIsNotNull(pageable);
+    public List<ComponentInfo> getRecommendCompsForUser(Long userUU, String usedFor, Pageable pageable) {
+        if (pageable == null) {
+            return new ArrayList<>();
+        }
+        List<ComponentInfo> page = componentInfoDao.findByImgIsNotNull(pageable.getPageSize());
         return page;
     }
 }

src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -914,10 +914,10 @@ public class OrderController {
 	 * @param toDate
 	 * @return
 	 */
-	@RequestMapping(value = "buyer/payRecord")
+	@RequestMapping(value = "/buyer/payRecord")
 	public Page<OrderSimpleInfo> findBuyerPayRecord(PageParams params, String keyword, Long fromDate,
-													Long toDate, String currencyName, Integer method){
-		return orderService.getBuyerPayRecord(params, keyword, fromDate, toDate, currencyName, method);
+													Long toDate, String currencyName, Integer method, String remitteeType){
+		return orderService.getBuyerPayRecord(params, keyword, fromDate, toDate, currencyName, method, remitteeType);
 	}
 
 	/**
@@ -933,7 +933,7 @@ public class OrderController {
 	 */
 	@RequestMapping(value = "/export/payRecord", method = RequestMethod.POST)
 	public ModelAndView exportPayRecordToExcel(@RequestParam(required = false, value = "isAjax", defaultValue = "false")Boolean isAjax, HttpServletRequest request,
-											   String keyword, Long fromDate, Long toDate, String currencyName, Integer method){
+											   String keyword, Long fromDate, Long toDate, String currencyName, Integer method, String remitteeType){
 		HttpSession session = request.getSession();
 		ModelAndView modelAndView = new ModelAndView();
 		Object loading = session.getAttribute("loading");
@@ -947,7 +947,7 @@ public class OrderController {
 			return modelAndView;
 		}
 		session.setAttribute("loading", true);
-		List<OrderSimpleInfo> data = orderService.getExportData(keyword, fromDate, toDate, currencyName, method);
+		List<OrderSimpleInfo> data = orderService.getExportData(keyword, fromDate, toDate, currencyName, method, remitteeType);
 		modelAndView.addObject("data", data);
 		modelAndView.addObject("operator", "-");
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/payRecord", "优软商城-买家交易记录"));

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -114,6 +114,12 @@ public class Order extends Document implements Serializable {
 	@Column(name = "or_paytype")
 	private Integer paytype;
 
+	/**
+	 * 收款方
+	 */
+	@Column(name = "or_remittee_type")
+	private String remitteeType;
+
 	/**
 	 * 配送方式
 	 */
@@ -2557,6 +2563,15 @@ public class Order extends Document implements Serializable {
 		return this;
 	}
 
+	public String getRemitteeType() {
+		return remitteeType;
+	}
+
+	public Order setRemitteeType(String remitteeType) {
+		this.remitteeType = remitteeType;
+		return this;
+	}
+
 	@Override
 	public String toString() {
 		return "Order{" +
@@ -2614,6 +2629,7 @@ public class Order extends Document implements Serializable {
 				", launchOrExApplyId='" + launchOrExApplyId + '\'' +
 				", jsonPuExInfo='" +  puExInfoJson + '\'' +
 				", exception='" + exception + '\'' +
+				", remitteeType='" + remitteeType + '\'' +
 				'}';
 	}
 

src/main/java/com/uas/platform/b2c/trade/order/model/OrderSimpleInfo.java

@@ -97,6 +97,11 @@ public class OrderSimpleInfo extends Document implements Serializable {
 	 */
 	private Integer type;
 
+	/**
+	 * 收款方
+	 */
+	private String remitteeType;
+
 	/**
 	 * Gets id.
 	 *
@@ -363,6 +368,7 @@ public class OrderSimpleInfo extends Document implements Serializable {
 		this.ensurePrice = order.getEnsurePrice();
 		this.paytype = order.getPaytype();
 		this.sellername = order.getSellername();
+		this.remitteeType = order.getRemitteeType();
 	}
 
 	@Override
@@ -371,6 +377,15 @@ public class OrderSimpleInfo extends Document implements Serializable {
 				+ ", status=" + status + ", price=" + price + ", type=" + type + "]";
 	}
 
+	public String getRemitteeType() {
+		return remitteeType;
+	}
+
+	public OrderSimpleInfo setRemitteeType(String remitteeType) {
+		this.remitteeType = remitteeType;
+		return this;
+	}
+
 	/**
 	 * 格式化付款时间
 	 * @return

src/main/java/com/uas/platform/b2c/trade/order/service/OrderService.java

@@ -623,7 +623,7 @@ public interface OrderService {
 	 * @return
 	 */
 	Page<OrderSimpleInfo> getBuyerPayRecord(PageParams params, String keyword, Long fromDate, Long toDate,
-											String currencyName, Integer method);
+											String currencyName, Integer method, String remitteeType);
 
 	/**
 	 * 获取导出的支付记录数据
@@ -635,7 +635,7 @@ public interface OrderService {
 	 * @return
 	 */
 	List<OrderSimpleInfo> getExportData(String keyword, Long fromDate, Long toDate,
-										String currencyName, Integer method);
+										String currencyName, Integer method, String remitteeType);
 
 	/**
 	 * 根据订单单号修改订单使用状态

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -61,8 +61,8 @@ import com.uas.platform.b2c.trade.deprecated.model.OrderRelationInfo;
 import com.uas.platform.b2c.trade.deprecated.model.UserInfoForOrder;
 import com.uas.platform.b2c.trade.inquiry.dao.TradeChargeDao;
 import com.uas.platform.b2c.trade.inquiry.model.TradeCharge;
-import com.uas.platform.b2c.trade.order.StringConstant.*;
 import com.uas.platform.b2c.trade.order.StringConstant.Currency;
+import com.uas.platform.b2c.trade.order.StringConstant.StringFormat;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.dao.OrderDetailDao;
 import com.uas.platform.b2c.trade.order.dao.OrderIndexDetailDao;
@@ -1424,6 +1424,9 @@ public class OrderServiceImpl implements OrderService {
 
         if (type != null) {
             order.setPaytype(type);
+            if (type.equals(Type.Payment_Online_Code.value())) {
+                order.setRemitteeType(com.uas.platform.b2c.core.constant.Type.PAIDTOPLATFORM.name());
+            }
         }
         Set<OrderDetail> orderDetails = order.getOrderDetails();
         for (OrderDetail orderDetail : orderDetails) {
@@ -3311,9 +3314,9 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public Page<OrderSimpleInfo> getBuyerPayRecord(com.uas.platform.core.model.PageParams params, String keyword, Long fromDate, Long toDate,
-                                                   String currencyName, Integer method) {
+                                                   String currencyName, Integer method, String remitteeType) {
         final PageInfo info = new PageInfo(params);
-        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method);
+        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method, remitteeType);
 
         Page<Order> orderPage = orderDao.findAll(new Specification<Order>() {
             @Override
@@ -3332,9 +3335,9 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public List<OrderSimpleInfo> getExportData(String keyword, Long fromDate, Long toDate, String currencyName, Integer method) {
+    public List<OrderSimpleInfo> getExportData(String keyword, Long fromDate, Long toDate, String currencyName, Integer method, String remitteeType) {
         final PageInfo info = new PageInfo();
-        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method);
+        filterPageInfo(info, keyword, fromDate, toDate, currencyName, method, remitteeType);
         List<Order> orderList = orderDao.findAll(new Specification<Order>() {
             @Override
             public Predicate toPredicate(Root<Order> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
@@ -3357,7 +3360,7 @@ public class OrderServiceImpl implements OrderService {
      * 设置分页过滤条件
      */
     private void filterPageInfo(PageInfo info, String keyword, Long fromDate, Long toDate,
-                               String currencyName, Integer method){
+                               String currencyName, Integer method, String remitteeType){
 
         info.filter("buyeruu", SystemSession.getUser().getUserUU());
         if (SystemSession.getUser().getEnterprise() != null) {
@@ -3385,6 +3388,9 @@ public class OrderServiceImpl implements OrderService {
         if (method != null){
             info.expression(PredicateUtils.eq("paytype", method, false));
         }
+        if (!StringUtils.isEmpty(remitteeType)) {
+            info.filter("remitteeType", remitteeType);
+        }
     }
 
     /**

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

@@ -22,6 +22,7 @@ import java.util.List;
 
 /**
  * The type VendorIntroductionService.
+ * @author dongbw
  * @version  2018年4月26日 17:25:03
  */
 @Service
@@ -85,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;
 				}
@@ -99,12 +100,16 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
             enUU = SystemSession.getUser().getEnterprise().getUu();
         }
 		// 查询所有企业个数
-		Integer total = getTotalCount(enUU, enterpriseCondition, productCondition);
+		Integer total;
 		// 查询企业
 		List<VendorIntroduction> vendorIntroductions;
 		if (!StringUtils.isEmpty(productCondition)) {
+			enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
+					+ keyword + "%')";
+			total = getTotalCount(enUU, enterpriseCondition, productCondition);
 			vendorIntroductions = getEnterpriseWithProductCondition(enUU, enterpriseCondition, productCondition,  page, size);
 		} else {
+			total = getTotalCount(enUU, enterpriseCondition, productCondition);
 			vendorIntroductions = getEnterpriseWithoutProductCondition(enUU, enterpriseCondition,  page, size);
 		}
 		return new Page<VendorIntroduction>(page, size, vendorIntroductions, total);
@@ -181,12 +186,14 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	private List<VendorIntroduction> getEnterpriseWithProductCondition(Long enUU, String enterpriseCondition, String productCondition, int page, int size) {
 		StringBuilder enterpriseSql = new StringBuilder();
 		// 查询所有符合条件的enUU的语句，按待售物料数量排序
-		String enUUSql = getEnUUGroupByEnUUOrderByCount(enUU, enterpriseCondition, productCondition);
+		String enUUSql = getEnUUGroupByEnUUOrderByCount(enUU, " 1 = 1 ", productCondition);
+		String noProductenUUSql = getEnUUGroupByEnUUOrderByCount(enUU, enterpriseCondition, null);
 		// 获取企业sql
 		enterpriseSql.append("select en.en_uu enUU, en.en_name enName, en.en_shortname enShortname, st.st_logo_url storeLogoUrl, en.en_logurl enLogoUrl, en.en_address enAddress, en.en_tel enTel, " +
 				" en.en_email enEmail, en.en_corporation enCorporation, en.en_businesscode enBusinesscode, en.en_industry enIndustry, en.en_Businessscope enBusinessScope " +
-				",st.st_uuid,st.st_status from sec$enterprises en left join store$info st on st.st_enuu = en.en_uu right join (").append(enUUSql)
-				.append(" ) a on en.en_uu = a.en_uu order by en.en_weight desc, counts desc");
+				",st.st_uuid,st.st_status from sec$enterprises en left join store$info st on st.st_enuu = en.en_uu right join (")
+				.append(enUUSql).append(" union ").append(noProductenUUSql)
+				.append(" ) a on en.en_uu = a.en_uu order by en.en_weight desc");
 		// 查找非供应商的卖当前商品的企业UU
 		StringBuilder vendorIntroductionUusSql = new StringBuilder();
 		// 行数 控制
@@ -230,15 +237,20 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	 */
 	private Integer getTotalCount(Long enUU, String enterpriseCondition, String productCondition) {
 		StringBuilder enCountSql = new StringBuilder();
-		enCountSql.append("select count(1) from (select en_uu,count(1) from (select en_uu from sec$enterprises where en_name not like '%测试%' " +
+		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 ").append(enterpriseCondition).append(") 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 v$product$private where ").append(productCondition).append(") p on pr_enuu = en_uu");
+			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 ")
+					.append(enterpriseCondition).append(" and en_uu <> ").append(enUU).append(")");
 		}
-		enCountSql.append(" group by en_uu )a");
+		enCountSql.append(")a");
 		return commonDao.queryForObject(enCountSql.toString(), Integer.class);
 	}
 
@@ -252,15 +264,14 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	private String getEnUUGroupByEnUUOrderByCount(Long enUU, String enterpriseCondition, String productCondition) {
 		StringBuilder enUUSql = new StringBuilder();
 		// 含名称、企业执照号、地址、邮箱、电话、行业、经营范围搜索
-		enUUSql.append("select en_uu, count(1) as counts from (select en_uu from sec$enterprises where en_name not like '%测试%' " +
+		enUUSql.append("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 ").append(enterpriseCondition).append(" and en_uu <> ").append(enUU)
 				.append(") e");
 		if (!StringUtils.isEmpty(productCondition)) {
-			enUUSql.append(" right join ( select pr_enuu from v$product$private where ").append(productCondition).append(") p on pr_enuu = en_uu where en_uu is not null ");
+			enUUSql.append(" right join ( select pr_enuu from products where ").append(productCondition).append(") p on pr_enuu = en_uu ");
 		}
-		enUUSql.append(" group by en_uu order by count(1) desc ");
 		return enUUSql.toString();
 	}
 }

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/user_center.html

@@ -31,7 +31,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

@@ -8,7 +8,7 @@
 <title>【优软商城】IC电子元器件现货采购交易平台商城</title>
 <meta name="description" content="优软商城（usoftmall.com）是中国领先的IC电子元器件现货采购交易网上商城，提供上千万种电子元器件现货采购交易。优软商城的主要服务有：标准器件库、器件选型、样品申请、现货交易、库存寄售，采购电子元器件就上优软商城！" />
 <meta name="keywords" content="优软商城,IC,元器件,网上商城" />
-<meta name="author" content="深圳市优软商城科技有限公司">
+<meta name="author" content="深圳优软商城科技有限公司">
 <link href="static/img/all/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" href="static/lib/fontawesome/css/font-awesome.min.css" />
@@ -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/WEB-INF/views/normal/user_center.html

@@ -34,7 +34,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/vendor_center.html

@@ -29,7 +29,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/css/common.css

@@ -425,6 +425,14 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
     opacity: .3;
 }
 
+@keyframes spin {
+	0%   { transform: rotate(360deg); }
+	100% { transform: rotate(0deg); }
+}
+@-webkit-keyframes spin {
+	0%   { transform: rotate(360deg); }
+	100% { transform: rotate(0deg); }
+}
 /*loading new by suntg*/
 .loading {
 	display: none;
@@ -434,6 +442,12 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	top: 0;
 	left: 0;
 }
+.loading .wrap {
+	width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px;
+}
+.loading .wrap .outer {
+	background-repeat: no-repeat;
+	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url('../img/all/loading.png'); animation: spin 800ms infinite linear;}
 
 .loading.in {
 	display: block;

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/common/query/recommendation.js

@@ -18,6 +18,7 @@ define(['ngResource'], function () {
          getRecommendComps: {
              url: 'recommendation/comps',
              method: 'GET',
+             isArray: true
          }
 
       })

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_home_ctrl.js

@@ -7,14 +7,14 @@ define(['app/app', 'calendar'], function(app) {
         $rootScope.active = 'home';
         document.title='买家中心-优软商城';
         $scope.userInfo = $rootScope.userInfo;
-        var getRecommendComps = function (userUU, usedFor, pageable) {
-            Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
-                $scope.recommendComps = data.content;
+        var getRecommendComps = function () {
+            Recommendation.getRecommendComps([], function (data) {
+                $scope.recommendComps = data;
             }, function (error) {
                 toaster.pop('error', '获取推荐器件失败', error);
-            })
+            });
         };
-        getRecommendComps(null, null, {page: 0, size: 12});
+        getRecommendComps();
 
         //安全设置提醒框
       // $scope.openHomeCenterModel = function() {

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;
           }
@@ -1026,8 +1026,29 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           }
           
           $scope.setCode = function (code) {
-            $scope.applyObj.code = code;
-            $scope.setShowSimilarCodeList(false);
+              $http.get('search/201819', {
+                  params : {
+                      page: 1,
+                      count: 1,
+                      type: 'component',
+                      keyword: code
+                  }
+              }).success(function(res){
+                  if (res && res.futures && res.futures.content) {
+                      var obj = res.futures.content[0]
+                      if (obj) {
+                          $scope.applyObj.brand = obj.pbrand || obj.pbranden || ''
+                          $scope.applyObj.prodTitle = obj.kind || obj.kinden || ''
+                          $scope.applyObj.spec = obj.spec || ''
+                      }
+                  }
+                  $scope.applyObj.code = code;
+                  $scope.setShowSimilarCodeList(false);
+              }).error(function(response) {
+                  toaster.pop('info', response.data || '自动填充物料信息失败');
+                  $scope.applyObj.code = code;
+                  $scope.setShowSimilarCodeList(false);
+              });
           }
 
           $scope.setShowSimilarCodeList = function (flag) {

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/activity/business.html

@@ -6,7 +6,7 @@
         <div class="content">
             <h3>优软商城</h3>
             <div class="text">
-                优软商城是由深圳市优软商城科技有限公司，为真正地解决电子信息行业的众多难题，秉持回归互联网精神的“分享与链接”，<br/>
+                优软商城是由深圳优软商城科技有限公司，为真正地解决电子信息行业的众多难题，秉持回归互联网精神的“分享与链接”，<br/>
                 基于垂直细分理念打造的一个独立的第三方电子交易商城。目前优软商城已经收录了3000家的原厂品牌，700多万现货型号.<br/>
                 针对电子信息行业的难题，优软商城将为客户提供更简单，更放心的解决方案。<br/>
                 我们严格把关供应商资质，从源头上杜绝虚假信息，做到付款交期如实，借助物流仓储的一站式服务帮您实现交易高效、库存无忧。<br/>

src/main/webapp/resources/view/admin/store/fragments/enterprise_info.html

@@ -201,7 +201,7 @@
 	}
 </style>
 <div class="enterprise-info" ng-controller="EnterpriseInfoCtrl">
-	<h2 ng-bind="store.enterprise.enName">深圳市优软商城科技有限公司</h2>
+	<h2 ng-bind="store.enterprise.enName">深圳优软商城科技有限公司</h2>
 	<div class="enterprise-lnfo-list">
 		<div class="row">
 			<div class="col-md-2">电话</div>
@@ -218,7 +218,7 @@
 		<div class="hr1"></div>
 		<div class="row">
 			<div class="col-md-2">企业全称</div>
-			<div class="col-md-4" ng-bind="store.enterprise.enName">深圳市优软商城科技有限公司</div>
+			<div class="col-md-4" ng-bind="store.enterprise.enName">深圳优软商城科技有限公司</div>
 			<div class="col-md-2">法定代表人</div>
 			<div class="col-md-4" ng-bind="store.auditInfo.representative"></div>
 		</div>
@@ -239,13 +239,13 @@
 		</div>
 		<div class="row">
 			<div class="col-md-2">名称</div>
-			<div class="col-md-4" ng-bind="store.auditInfo.name">深圳市优软商城科技有限公司</div>
+			<div class="col-md-4" ng-bind="store.auditInfo.name">深圳优软商城科技有限公司</div>
 			<div class="col-md-2">成立时间</div>
 			<div class="col-md-4" ng-bind="store.auditInfo.setUpDate">2017年8月10日</div>
 		</div>
 		<div class="row">
 			<div class="col-md-2">类型</div>
-			<div class="col-md-4" ng-bind="store.auditInfo.type">深圳市优软商城科技有限公司</div>
+			<div class="col-md-4" ng-bind="store.auditInfo.type">深圳优软商城科技有限公司</div>
 			<div class="col-md-2">经营范围</div>
 			<div class="col-md-4" ng-bind="store.auditInfo.businessScope">电子零配件</div>
 		</div>

src/main/webapp/resources/view/admin/store/store_company_list.html

@@ -164,7 +164,7 @@
                 <tr ng-repeat="enterprise in $data">
                     <td ng-bind="((recordsTableParams.page() - 1) * 10 + $index + 1) | indexId">001</td>
                     <td ng-bind="enterprise.uu">001001001001</td>
-                    <td class="text-left padding-left-30" ng-bind="enterprise.enName">深圳市优软商城科技有限公司商城科技有限公司</td>
+                    <td class="text-left padding-left-30" ng-bind="enterprise.enName">深圳优软商城科技有限公司商城科技有限公司</td>
                     <td ng-bind="enterprise.enDate | date:'yyyy-MM-dd HH:mm:ss'">2017-05-09 10:28:30</td>
                     <td><a ng-click="goDetailPage(enterprise)" class="detail-bg btn">查看详情</a></td>
                 </tr>

src/main/webapp/resources/view/admin/store_qualification_maintenance.html

@@ -360,7 +360,7 @@
 		<div class="qualification-list01">
 			<div class="row">
 				<div class="col-sm-2">企业全称</div>
-				<div class="col-sm-10" ng-bind="application.storeName">深圳市优软商城科技有限公司</div>
+				<div class="col-sm-10" ng-bind="application.storeName">深圳优软商城科技有限公司</div>
 			</div>
 			<div class="row">
 				<div class="col-sm-2">企业简称</div>

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

@@ -203,7 +203,7 @@
 							<td class="text-center"><span ng-bind="order.selfSell ? '自营' : '代售'"></span></td>
 							<td class="text-center">{{order.buyername}}</td>
 							<td class="text-center">{{order.sellername}}</td>
-							<td class="text-center text-inverse">{{order.currency}} &nbsp;{{order.price | number : 3}}</td>
+							<td class="text-center text-inverse">{{order.currency}} &nbsp;{{order.ensurePrice | number : 3}}</td>
 							<td class="text-center">{{order.qty}}</td>
 							<td class="text-center">{{order.creattime | date: "yyyy-MM-dd HH:mm"}}</td>
 							<td class="text-center">{{order.status | statusAndTypeFilter}}</td>

src/main/webapp/resources/view/help/bankTransfer.html

@@ -33,7 +33,7 @@
 				<div class="col-xs-2">付款账号1：</div>	
 				<div class="col-xs-10">
 					<div>
-					<div>企业名称：深圳市优软商城科技有限公司</div>
+					<div>企业名称：深圳优软商城科技有限公司</div>
 					<div>开户银行：中国工商银行深圳侨香支行</div>
 					<div>账号：4000051309100150003</div>
 					</div>
@@ -43,7 +43,7 @@
 				<div class="col-xs-2">付款账号2：</div>	
 				<div class="col-xs-10">
 					<div>
-						<div>企业名称：深圳市优软商城科技有限公司</div>
+						<div>企业名称：深圳优软商城科技有限公司</div>
 						<div>开户银行：平安银行深圳高新区支行</div>
 						<div>账号：11017374946005</div>
 					</div>

src/main/webapp/resources/view/help/coperation.html

@@ -34,7 +34,7 @@
 
 <div class="item1">
 	<div><img alt="" src="static/img/logo/uas_mall_hor.png"></div>
-	<h3>深圳市优软商城科技有限公司</h3>
+	<h3>深圳优软商城科技有限公司</h3>
 </div>
 <div class="item2">
 	<h4>公司地址：深圳市南山区高新技术园科技南五路英唐大厦六楼</h4>

src/main/webapp/resources/view/help/faBill.html

@@ -155,7 +155,7 @@
 					</li>
 				</ol>
 				<p class="mt10">
-					© 2016 深圳市优软商城科技有限公司 所有权利予以保留。
+					© 2016 深圳优软商城科技有限公司 所有权利予以保留。
 				</p>
 				<p class="mt10">
 					谢谢您的配合，祝您购物愉快！

src/main/webapp/resources/view/prod/order_ensure.html

@@ -886,7 +886,7 @@ table .before-blank, .table-bordered>tbody>tr>td.before-blank, .table-bordered>t
                                 <!-- <span ng-cloak>银行：{{saleUSDAccount.bankname}}</span><br>
                                 <span ng-cloak>账户名称：{{saleUSDAccount.accountname}}</span><br>
                                 <span ng-cloak>账号：{{saleUSDAccount.number}}<span> -->
-                                企业名称：深圳市优软商城科技有限公司<br>
+                                企业名称：深圳优软商城科技有限公司<br>
                                 联系方式：0755-86564892<br>
                             </div>
                         </td>

src/main/webapp/resources/view/prod/order_ensure_with_multi_currency.html

@@ -1125,7 +1125,7 @@
 						   		<!-- <span ng-cloak>银行：{{saleUSDAccount.bankname}}</span><br>
 						   		<span ng-cloak>账户名称：{{saleUSDAccount.accountname}}</span><br>
 						   		<span ng-cloak>账号：{{saleUSDAccount.number}}<span> -->
-						   		企业名称：深圳市优软商城科技有限公司<br>
+						   		企业名称：深圳优软商城科技有限公司<br>
 						   		联系方式：0755-86564892<br>
 						   	</div>
 						</div>

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>

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

@@ -936,6 +936,13 @@
         <div class="publish-purchase">
             <div class="fl">
                 <p>单个发布</p>
+                <div class="form-block">
+                    <span><i>*</i>型号</span>
+                    <input type="text" class="form-group" ng-model="applyObj.code" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" ng-change="onCodeChange()" >
+                    <ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">
+                        <li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code)"></li>
+                    </ul>
+                </div>
                 <div class="form-block">
                     <span><i>*</i>品牌</span>
                     <input type="text" class="form-group" ng-class="{'error': !validObj.brand}" maxlength="20" ng-model="applyObj.brand" ng-blur="checkBrand()" ng-change="onBrandChange()">
@@ -947,13 +954,6 @@
                     <span><i>*</i>物料名称</span>
                     <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-class="{'error': !validObj.prodTitle}" ng-change="onProdTitleInput()" ng-blur="checkProdTitle()">
                 </div>
-                <div class="form-block">
-                    <span><i>*</i>型号</span>
-                    <input type="text" class="form-group" ng-model="applyObj.code" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" ng-change="onCodeChange()" >
-                    <ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">
-                        <li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code)"></li>
-                    </ul>
-                </div>
 
                <!-- <div class="form-block single-price">
                     <span>单价预算</span>

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

@@ -906,7 +906,7 @@
 				</p>
 				<p>
 					<b>发票抬头：</b>
-					<span ng-bind="purchase.invoicetitle  || '空'">深圳市优软商城科技有限公司</span>
+					<span ng-bind="purchase.invoicetitle  || '空'">深圳优软商城科技有限公司</span>
 				</p>
 				<p ng-if="purchase.invoicetype == 1205">
 					<b>单位地址：</b>

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

@@ -626,93 +626,93 @@
                             </div>-->
                         </div>
                         <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品（其中标准产品 <span ng-bind="result.success">200</span> 个，非标产品 <span ng-bind="result.failure">400</span> 个）<b class="success-hidden" ng-if="result.filter != 0">，下载 <a ng-click="downloadExcel()">导入失败产品</a></b></div>
-                        <div ng-show="$$productOn.tab == 'bathOn'">
-                            <table ng-table="relTableParams" class="public-tab table">
-                                <thead>
-                                <tr>
-                                    <th width="60">序号</th>
-                                    <th width="150" style="padding-left: 10px;">器件属性</th>
-                                    <th width="180">产品固有属性</th>
-                                    <th width="200">产品自定义属性</th>
-                                    <th width="100">梯度/pcs</th>
-                                    <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>
-                                    <th width="70">操作</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr ng-repeat="batchCommodity in pageParams.content">
-                                    <td class="check-input">
-                                        <!--<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
-                                        <span ng-bind="$index+1"></span>
-                                    </td>
-                                    <td style="padding-left: 10px;">
-                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>
-                                        <div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
-                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
-                                        <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>
-                                    </td>
-                                    <td>
-                                        <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->
-                                        <div>生产日期：&nbsp;<span ng-bind="batchCommodity.productDate"></span></div>
-                                        <!--<div>封装：&nbsp;<span ng-bind="batchCommodity.encapsulation || '无封装信息'"></span></div>-->
-                                        <div>包装：&nbsp;<span ng-bind="batchCommodity.packaging || '无包装信息'"></span></div>
-                                        <div>
-                                            <span class="label-commodity">交期：</span>
-                                            <span>
-                                                 <span ng-if="batchCommodity.selfMinDelivery == batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMaxDelivery"></span>
-                                                 <span ng-if="batchCommodity.selfMinDelivery != batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMinDelivery + '-' + batchCommodity.selfMaxDelivery"></span>
-                                            </span>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>
-                                        <div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
-                                        <div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>
-                                        <!--<div>倍数/价格：&nbsp;-->
-                                        <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
-                                        <!--<span ng-if="batchCommodity.usdMinPackPrice">-->
-                                        <!--/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>-->
-                                        <!--</span>-->
-                                        <!--<span ng-if="batchCommodity.rmbMinPackPrice">-->
-                                        <!--/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>-->
-                                        <!--</span>-->
+                        <!--<div ng-show="$$productOn.tab == 'bathOn'">-->
+                            <!--<table ng-table="relTableParams" class="public-tab table">-->
+                                <!--<thead>-->
+                                <!--<tr>-->
+                                    <!--<th width="60">序号</th>-->
+                                    <!--<th width="150" style="padding-left: 10px;">器件属性</th>-->
+                                    <!--<th width="180">产品固有属性</th>-->
+                                    <!--<th width="200">产品自定义属性</th>-->
+                                    <!--<th width="100">梯度/pcs</th>-->
+                                    <!--<th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>-->
+                                    <!--<th width="70">操作</th>-->
+                                <!--</tr>-->
+                                <!--</thead>-->
+                                <!--<tbody>-->
+                                <!--<tr ng-repeat="batchCommodity in pageParams.content">-->
+                                    <!--<td class="check-input">-->
+                                        <!--&lt;!&ndash;<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>&ndash;&gt;-->
+                                        <!--<span ng-bind="$index+1"></span>-->
+                                    <!--</td>-->
+                                    <!--<td style="padding-left: 10px;">-->
+                                        <!--<div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>-->
+                                        <!--<div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>-->
+                                        <!--<div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>-->
+                                        <!--<div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>-->
+                                    <!--</td>-->
+                                    <!--<td>-->
+                                        <!--&lt;!&ndash;<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>&ndash;&gt;-->
+                                        <!--<div>生产日期：&nbsp;<span ng-bind="batchCommodity.productDate"></span></div>-->
+                                        <!--&lt;!&ndash;<div>封装：&nbsp;<span ng-bind="batchCommodity.encapsulation || '无封装信息'"></span></div>&ndash;&gt;-->
+                                        <!--<div>包装：&nbsp;<span ng-bind="batchCommodity.packaging || '无包装信息'"></span></div>-->
+                                        <!--<div>-->
+                                            <!--<span class="label-commodity">交期：</span>-->
+                                            <!--<span>-->
+                                                 <!--<span ng-if="batchCommodity.selfMinDelivery == batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMaxDelivery"></span>-->
+                                                 <!--<span ng-if="batchCommodity.selfMinDelivery != batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMinDelivery + '-' + batchCommodity.selfMaxDelivery"></span>-->
+                                            <!--</span>-->
                                         <!--</div>-->
-                                        <!--<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>-->
-                                        <div>
-                                            <span ng-bind="batchCommodity.breakUp ? '可拆卖' : '不可拆卖'"></span>
-                                            <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
-                                        </div>
-                                    </td>
-                                    <td style="vertical-align: top !important;">
-                                        <div ng-repeat="price in batchCommodity.prices">{{price.start + '+'}}</div>
-                                    </td>
-                                    <td style="vertical-align: top !important;">
-                                        <div ng-repeat="price in batchCommodity.prices">{{batchCommodity.currency=='RMB' ? price.rMBPrice : price.uSDPrice}}</div>
-                                    </td>
-                                    <td>
-                                        <!--<a ng-click="editBatch(batchCommodity)">编辑</a><br/>-->
-                                        <!--<a ng-click="deleteBatch(batchCommodity.id)">删除</a>-->
-                                        <a name = 'delete-material' ng-click="showDelete(batchCommodity)">删除</a>
-                                    </td>
-                                </tr>
-                                <tr class="record-number" ng-if="pageParams.content.length > 0">
-                                    <td colspan="7">
-                                        <div>显示 <i ng-bind="pageParams.start"></i>- <i ng-bind="pageParams.end">10</i> 个，共：<i style="color: #5078cb;" ng-bind="pageParams.totalElements"></i> 个</div>
-                                    </td>
-                                </tr>
-                                </tbody>
-                                <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
-                                <tr class="height200">
-                                    <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>
-                        <div>
-                            <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>
-                            <b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>
-                        </div>
+                                    <!--</td>-->
+                                    <!--<td>-->
+                                        <!--<div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>-->
+                                        <!--<div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>-->
+                                        <!--<div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>-->
+                                        <!--&lt;!&ndash;<div>倍数/价格：&nbsp;&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<span ng-bind="batchCommodity.minBuyQty | number"></span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<span ng-if="batchCommodity.usdMinPackPrice">&ndash;&gt;-->
+                                        <!--&lt;!&ndash;/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<span ng-if="batchCommodity.rmbMinPackPrice">&ndash;&gt;-->
+                                        <!--&lt;!&ndash;/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>&ndash;&gt;-->
+                                        <!--<div>-->
+                                            <!--<span ng-bind="batchCommodity.breakUp ? '可拆卖' : '不可拆卖'"></span>-->
+                                            <!--&lt;!&ndash;<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>&ndash;&gt;-->
+                                        <!--</div>-->
+                                    <!--</td>-->
+                                    <!--<td style="vertical-align: top !important;">-->
+                                        <!--<div ng-repeat="price in batchCommodity.prices">{{price.start + '+'}}</div>-->
+                                    <!--</td>-->
+                                    <!--<td style="vertical-align: top !important;">-->
+                                        <!--<div ng-repeat="price in batchCommodity.prices">{{batchCommodity.currency=='RMB' ? price.rMBPrice : price.uSDPrice}}</div>-->
+                                    <!--</td>-->
+                                    <!--<td>-->
+                                        <!--&lt;!&ndash;<a ng-click="editBatch(batchCommodity)">编辑</a><br/>&ndash;&gt;-->
+                                        <!--&lt;!&ndash;<a ng-click="deleteBatch(batchCommodity.id)">删除</a>&ndash;&gt;-->
+                                        <!--<a name = 'delete-material' ng-click="showDelete(batchCommodity)">删除</a>-->
+                                    <!--</td>-->
+                                <!--</tr>-->
+                                <!--<tr class="record-number" ng-if="pageParams.content.length > 0">-->
+                                    <!--<td colspan="7">-->
+                                        <!--<div>显示 <i ng-bind="pageParams.start"></i>- <i ng-bind="pageParams.end">10</i> 个，共：<i style="color: #5078cb;" ng-bind="pageParams.totalElements"></i> 个</div>-->
+                                    <!--</td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                                <!--<tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">-->
+                                <!--<tr class="height200">-->
+                                    <!--<td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>-->
+                                <!--</tr>-->
+                                <!--</tbody>-->
+                            <!--</table>-->
+                        <!--</div>-->
+                        <!--<div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>-->
+                        <!--<div>-->
+                            <!--<span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>-->
+                            <!--<b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>-->
+                        <!--</div>-->
                     </div>
                 </div>
                 <!--<div class="load_next">-->

src/main/webapp/resources/view/vendor/modal/confirm_consignment_agreement.html

@@ -223,10 +223,10 @@
 		<p style="font-weight: bold">2.  转账</p>
 		<p>您购买库存寄售的产产品时，优软商城为您提供的汇款账户如下：<br/>
 			2.1. 人民币汇款:<br/>
-			2.1.1.1. 公司名称：深圳市优软商城科技有限公司<br/>
+			2.1.1.1. 公司名称：深圳优软商城科技有限公司<br/>
 			2.1.1.2. 开户银行：中国工商银行深圳侨香支行<br/>
 			2.1.1.3. 账   号：4000051309100150003<br/>
-			2.1.2.1. 公司名称：深圳市优软商城科技有限公司<br/>
+			2.1.2.1. 公司名称：深圳优软商城科技有限公司<br/>
 			2.1.2.2. 开户银行：平安银行深圳高新区支行<br/>
 			2.1.2.3. 账   号：11017374946005<br/>
 			2.2. 美金汇款:<br/>