合并dev代码

src/main/java/com/uas/platform/b2b/b2capi/UserController.java

@@ -0,0 +1,42 @@
+package com.uas.platform.b2b.b2capi;
+
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * B2C查询用户信息接口
+ *
+ * @author hejq
+ * @date 2018-09-26 17:13
+ */
+@RestController("b2capi.UserController")
+@RequestMapping(value = "/user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    private final static UsageBufferedLogger LOGGER = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    /**
+     *  通过用户UU查询用户信息
+     *
+     * @param userUUJson 用户UU
+     * @return
+     */
+    @RequestMapping(value = "/findByUserUUList", method = RequestMethod.GET)
+    public List<User> findByUserUUList(String userUUJson) {
+        LOGGER.log("查询用户信息", "通过UU号查询用户信息", userUUJson);
+        List<Long> userUUs = FlexJsonUtils.fromJsonArray(userUUJson, Long.class);
+        return userService.findByUserUUList(userUUs);
+    }
+}

src/main/java/com/uas/platform/b2b/controller/VendorController.java

@@ -1,12 +1,7 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2b.model.Distribute;
-import com.uas.platform.b2b.model.OrderType;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.model.VendorContact;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.OrderRedDotService;
 import com.uas.platform.b2b.service.UserService;
@@ -69,7 +64,6 @@ public class VendorController {
 	public SPage<Vendor> getVendors(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
-		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getEnBussinessCode());
 		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderItemDao.java

@@ -86,8 +86,8 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	 * @param id
 	 */
 	@Modifying(clearAutomatically = true)
-	@Query("update PurchaseOrderItem p set p.replyQty=(select sum(r.qty) from PurchaseOrderReply r where r.orderItem=p),p.replyDelivery= :delivery,p.replyRemark= :remark,p.status = :status where p.id= :id")
-	public void updateByReply(@Param("delivery") Date delivery, @Param("remark") String remark, @Param("id") long id, @Param("status") Short status);
+	@Query("update PurchaseOrderItem p set p.replyQty= :replyQtySum,p.replyDelivery= :delivery,p.replyRemark= :remark,p.status = :status where p.id= :id")
+	public void updateByReply(@Param("replyQtySum") Double replyQtySum, @Param("delivery") Date delivery, @Param("remark") String remark, @Param("id") long id, @Param("status") Short status);
 
 	/**
 	 * 批量回复采购订单

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderReplyDao.java

@@ -49,4 +49,12 @@ public interface PurchaseOrderReplyDao extends JpaSpecificationExecutor<Purchase
 	 */
 	@Query("from PurchaseOrderReply r where r.orderItem.order.vendUU = :vendUU and r.sendStatus = :status")
 	List<PurchaseOrderReply> findByVendUUAndSendStatus(@Param("vendUU") long vendUU, @Param("status") short status);
+
+	/**
+	 * 根据明细id查找回复数量
+	 * @param itemId 采购订单明细id
+	 * @return
+	 */
+	@Query(nativeQuery = true, value = "select sum(r.pr_qty) from purc$reply r where r.pr_pdid = :itemId")
+	Double getReplyQty(@Param("itemId") Long itemId);
 }

src/main/java/com/uas/platform/b2b/dao/UserDao.java

@@ -13,131 +13,127 @@ import org.springframework.stereotype.Repository;
 import javax.persistence.QueryHint;
 import java.util.List;
 
+/**
+ * 用户信息
+ */
 @Repository
 public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<User, Long> {
 
+    /**
+     * 通过用户uu查询用户信息
+     *
+     * @param userUU 用户UU号
+     * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserUU(Long userUU);
+    List<User> findUserByUserUU(Long userUU);
 
+    /**
+     * 通过邮箱查询用户信息
+     *
+     * @param userEmail 用户邮箱
+     * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserEmail(String userEmail);
+    List<User> findUserByUserEmail(String userEmail);
 
+    /**
+     * 通过电话查询用户信息
+     *
+     * @param userTel 电话
+     * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserTel(String userTel);
+    List<User> findUserByUserTel(String userTel);
 
 	/**
-	 * 按企业ID和个人ID查找个人
+	 * 按企业ID和个人名称查找个人
 	 * 
-	 * @param userName
-	 * @param enUU
-	 * @param userUU
-	 * @return
-	 */
+	 * @param userName 用户名称
+	 * @param enUU 企业UU
+	 * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%")
-	public List<User> findUserByUserNameAndEnUU(@Param("userName") String userName,
-			@Param("enUU") Long enUU);
+    List<User> findUserByUserNameAndEnUU(@Param("userName") String userName, @Param("enUU") Long enUU);
 
 	/**
 	 * 按邮箱查询当前企业用户信息
 	 * 
-	 * @param userEmail
-	 * @param enUU
-	 * @return
+	 * @param userEmail 邮箱
+	 * @param enUU 企业UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail like %:userEmail%")
-	public List<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU);
+    List<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU);
 
 	/**
 	 * 按电话查询当前企业用户信息
 	 * 
-	 * @param userTel
-	 * @param enUU
-	 * @return
+	 * @param userTel 用户手机号
+	 * @param enUU 企业UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userTel like %:userTel%")
-	public List<User> findUserByUserTelAndEnUU(@Param("userTel") String userTel, @Param("enUU") Long enUU);
+    List<User> findUserByUserTelAndEnUU(@Param("userTel") String userTel, @Param("enUU") Long enUU);
 
 	/**
 	 * 按企业ID和个人ID查找个人
 	 * 
-	 * @param enUU
-	 * @param userUU
-	 * @return
+	 * @param enUU 企业UU
+	 * @param userUU 用户UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU")
-	public List<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU);
+    List<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU);
 
 	/**
 	 * 按企业ID和查找个人
 	 * 
-	 * @param enUU
-	 * @return
+	 * @param enUU 企业UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU")
-	public List<User> findByEnUU(@Param("enUU") long enUU);
+    List<User> findByEnUU(@Param("enUU") long enUU);
 
 	/**
 	 * 按角色ID查找该角色下的用户
 	 * 
-	 * @param roleId
-	 * @return
+	 * @param roleId 角色id
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.roles as r where r.id = :roleId")
-	public List<User> findByRole(@Param("roleId") long roleId);
+    List<User> findByRole(@Param("roleId") long roleId);
 
 	/**
 	 *  分页查询用户信息
 	 *
-	 * @param page
-	 * @return
+     * @param enUU 企业UU
+	 * @param page 分页信息
+	 * @return Page<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU",
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU")
 	Page<User> findEnUUByAndPage(@Param("enUU")Long enUU, Pageable page);
 
-
-	/**
-	 * 分页按名字查询当前企业的用户信息
-	 *
-	 * @param userName
-	 * @param enUU
-	 * @return
-	 */
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%",
-			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%")
-	public Page<User> findUserByUserNameAndEnUU(@Param("userName") String userName, @Param("enUU") Long enUU, Pageable page);
-
-	/**
-	 * 分页按邮箱查询当前企业用户信息
-	 *
-	 * @param userEmail
-	 * @param enUU
-	 * @return
-	 */
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail = :userEmail",
-			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail = :userEmail")
-	public Page<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU, Pageable page);
-
 	/**
 	 * 按企业ID和个人ID查找个人
 	 *
-	 * @param enUU
-	 * @param userUU
-	 * @return
+	 * @param enUU 企业UU
+	 * @param userUU 用户UU
+     * @param page  分页信息
+	 * @return Page<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU",
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU")
-	public Page<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU, Pageable page);
+    Page<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU, Pageable page);
 
 	/**
 	 * 按企业ID和个人ID查找个人
@@ -146,14 +142,15 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @date 2018-01-16 17:09
 	 * @param enUU 企业UU
 	 * @param keyword 关键词
-	 * @return
+     * @param page 分页信息
+	 * @return Page<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and " +
 			"(u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)",
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and " +
 					"(u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)")
-	public Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, Pageable page);
+    Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, Pageable page);
 
     /**
      * 按企业ID和个人ID查找个人
@@ -162,6 +159,8 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
      * @date 2018-01-16 17:09
      * @param enUU 企业UU
      * @param keyword 关键词
+     * @param page 分页信息
+     * @param useruu 用户UU
      * @return
      */
     @QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
@@ -169,5 +168,5 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
             "(u.userUU like :useruu or u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)",
             countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and " +
                     "(u.userUU like :useruu or u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)")
-    public Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, @Param("useruu") Long useruu, Pageable page);
+    Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, @Param("useruu") Long useruu, Pageable page);
 }

src/main/java/com/uas/platform/b2b/model/User.java

@@ -3,18 +3,28 @@ package com.uas.platform.b2b.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
+import com.uas.sso.entity.UserView;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 import org.springframework.util.CollectionUtils;
-
-import javax.persistence.*;
-
-import com.uas.sso.entity.UserView;
 import org.springframework.util.StringUtils;
-import java.io.Serializable;
+
+import javax.persistence.Cacheable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.*;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -30,43 +40,65 @@ public class User implements Serializable {
 	 */
 	private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
 	@Id
 	@Column(name = "user_uu")
 	private Long userUU;
 
+    /**
+     * 用户姓名
+     */
 	@Column(name = "user_name", length = 50)
 	private String userName;
 
+    /**
+     * 用户密码
+     */
 	@Column(name = "user_pwd", length = 32)
 	private String userPwd;
 
+    /**
+     * 用户邮箱
+     */
 	@Column(name = "user_email", length = 50)
 	private String userEmail;
 
+    /**
+     * 用户电话
+     */
 	@Column(name = "user_tel", length = 30)
 	private String userTel;
 
+    /**
+     * 用户性别
+     */
 	@Column(name = "user_sex", length = 10)
 	private String userSex;
 
+    /**
+     * 用户证件号码
+     */
 	@Column(name = "user_idcode", length = 20)
 	private String userIdcode;
 
+    /**
+     * 是否有效
+     */
 	private Short enable;
 
+    /**
+     * 是否系统管理员
+     */
 	private Short issys;
 
+    /**
+     * UU端IMID
+     */
 	@Column(name = "user_imid")
 	private Long userIMId;
 
-	public Long getUserIMId() {
-		return userIMId;
-	}
-
-	public void setUserIMId(Long userIMId) {
-		this.userIMId = userIMId;
-	}
-
 	/**
 	 * 用户类型
 	 */
@@ -193,6 +225,14 @@ public class User implements Serializable {
 		this.userSex = userSex;
 	}
 
+    public Long getUserIMId() {
+        return userIMId;
+    }
+
+    public void setUserIMId(Long userIMId) {
+        this.userIMId = userIMId;
+    }
+
 	public Enterprise getEnterprise() {
 		return enterprise;
 	}
@@ -403,16 +443,35 @@ public class User implements Serializable {
 	 * 设置当前登录企业的角色
 	 */
 	public void setCurrentEnterpriseRoles() {
-		if(!CollectionUtils.isEmpty(this.roles) && this.enterprise != null) {
+		if (!CollectionUtils.isEmpty(this.roles) && this.enterprise != null) {
 			Iterator<Role> iterator = this.roles.iterator();
-			Long enuu = this.enterprise.getUu();
+			Long enUU = this.enterprise.getUu();
 			while (iterator.hasNext()) {
 				Role role = iterator.next();
-				if(!role.getEnUU().equals(enuu)) {
+				if (!role.getEnUU().equals(enUU)) {
 					iterator.remove();
 				}
 			}
 		}
 	}
 
+    /**
+     * 根据enUU判断用户在当前企业的UU号
+     * @param enUU 当前企业UU
+     */
+    public void setCurrentEnterpriseRoles(Long enUU) {
+        if (null != enUU) {
+            if (!CollectionUtils.isEmpty(this.roles)) {
+                Iterator<Role> iterator = this.roles.iterator();
+                while (iterator.hasNext()) {
+                    Role role = iterator.next();
+                    if (!role.getEnUU().equals(enUU)) {
+                        iterator.remove();
+                    }
+                }
+            }
+        } else {
+            this.roles = null;
+        }
+    }
 }

src/main/java/com/uas/platform/b2b/openapi/service/impl/TradingDataServiceImpl.java

@@ -45,7 +45,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         // 获取累计发票金额
         Double apBillSum = getApBillSum(enUU);
         // 获取历史退货率
-        String historyReturn = NumFormat.getPercent(realSum / getOrderSum(enUU));
+        String historyReturn = NumFormat.getPercent(returnSum / getOrderSum(enUU));
         map.put("timeSum", timeSum);
         map.put("acceptSum", acceptSum);
         map.put("returnSum", returnSum);
@@ -60,6 +60,8 @@ public class TradingDataServiceImpl implements TradingDataService {
     public ModelMap getCustTrading(Long enUU) {
         ModelMap map = new ModelMap();
         List<CustTrading> datas = getCust(enUU);
+        Double sum = getAcceptSum(enUU, null) - getReturnSum(enUU, null);
+        Integer sumNum = getAcceptNum(enUU, null) - getReturnNum(enUU, null);
         if (CollectionUtils.isNotEmpty(datas)) {
             for (CustTrading custTrading : datas) {
                 Double acceptSum = getAcceptSum(enUU, custTrading.getCustUU());
@@ -68,13 +70,13 @@ public class TradingDataServiceImpl implements TradingDataService {
                 if (StringUtils.isEmpty(acceptSum) || acceptSum == 0.0) {
                     custTrading.setAcceptPercent("0.00%");
                 } else {
-                    custTrading.setAcceptPercent(NumFormat.getPercent((acceptSum - returnSum) / acceptSum));
+                    custTrading.setAcceptPercent(NumFormat.getPercent((acceptSum - returnSum) / sum));
                 }
                 Integer acceptNum = getAcceptNum(enUU, custTrading.getCustUU());
                 Integer realNum = acceptNum - getReturnNum(enUU, custTrading.getCustUU());
                 custTrading.setRealNum(realNum);
                 if (0 != acceptNum) {
-                    custTrading.setNumPercent(NumFormat.getPercent((double) realNum / acceptNum));
+                    custTrading.setNumPercent(NumFormat.getPercent((double) realNum / sumNum));
                 }
                 custTrading.setTimeSum(NumFormat.getOne(getTimeSum(enUU, custTrading.getCustUU())));
             }
@@ -159,8 +161,8 @@ public class TradingDataServiceImpl implements TradingDataService {
         ofYear9.setOneYearNum(NumFormat.getIncrease(ofYear9.getTwoYear(), ofYear9.getOneYear()));
         ofYear9.setThisYearNum(NumFormat.getIncrease(ofYear9.getOneYear(), ofYear9.getThisYear()));
         years.add(ofYear9);
-        // 开票笔数
-        RecentOfYear ofYear10 = new RecentOfYear("开票笔数");
+        // 开票金额
+        RecentOfYear ofYear10 = new RecentOfYear("开票金额");
         ofYear10.setTwoYear(getApBillSumTime(enUU, NumFormat.getTwoYear(), NumFormat.getOneYear()));
         ofYear10.setOneYear(getApBillSumTime(enUU, NumFormat.getOneYear(), NumFormat.getThisYear()));
         ofYear10.setThisYear(getApBillSumTime(enUU, NumFormat.getThisYear(), NumFormat.getNow()));
@@ -426,8 +428,10 @@ public class TradingDataServiceImpl implements TradingDataService {
      * @return 验收笔数
      */
     private Integer getAcceptNum(Long enUU, Long custUU) {
-        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$accept WHERE pa_venduu= " + enUU
-                + " AND pa_enuu=" + custUU);
+        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$accept WHERE pa_venduu= " + enUU);
+        if (!StringUtils.isEmpty(custUU)) {
+            sql.append(" AND pa_enuu=" + custUU);
+        }
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -439,8 +443,10 @@ public class TradingDataServiceImpl implements TradingDataService {
      * @return 验退金额
      */
     private Integer getReturnNum(Long enUU, Long custUU) {
-        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$return  WHERE pr_venduu= " + enUU
-                + " and  pr_enuu= " + custUU);
+        StringBuffer sql = new StringBuffer("SELECT COUNT(1) FROM purc$return  WHERE pr_venduu= " + enUU);
+        if (!StringUtils.isEmpty(custUU)) {
+            sql.append(" and pr_enuu= " + custUU);
+        }
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
     }
@@ -453,7 +459,7 @@ public class TradingDataServiceImpl implements TradingDataService {
      * @return 有交易客户数
      */
     private Integer getAcceptCust(Long enUU, Date startTime, Date endTime) {
-        StringBuffer sql = new StringBuffer("SELECT COUNT(1) from purc$orders WHERE pu_venduu= " + enUU
+        StringBuffer sql = new StringBuffer("SELECT COUNT(DISTINCT pu_enuu) from purc$orders WHERE pu_venduu= " + enUU
                 + " AND pu_date >= '" + startTime + "' and pu_date < " + "'" + endTime + "'");
         Integer result = commonDao.queryForObject(sql.toString(), Integer.class);
         return result;
@@ -532,7 +538,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + " then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
                 + " FROM (select sum(pa_checkamount) amount,pa_currency currency from purc$apcheck where pa_enuu = " + enUU
-                + " and pa_checkstatus = '已确认' and pa_recorddate >= '" + startTime + "' and pa_recorddate < " + "'" + endTime + "'"
+                + " and pa_checkstatus = '已确认' and pa_recorddate >= '" + startTime + "' and pa_recorddate < '" + endTime + "'"
                 + " GROUP BY pa_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
@@ -547,7 +553,7 @@ public class TradingDataServiceImpl implements TradingDataService {
      */
     private Double getApCheckNumTime(Long enUU, Date startTime, Date endTime) {
         StringBuffer sql = new StringBuffer("SELECT COUNT(1) from purc$apcheck where pa_enuu = " + enUU
-                + " and pa_checkstatus = '已确认' and pa_recorddate >= " + startTime + " and pa_recorddate < " + endTime);
+                + " and pa_checkstatus = '已确认' and pa_recorddate >= '" + startTime + "' and pa_recorddate < '" + endTime + "'");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
     }
@@ -563,7 +569,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         StringBuffer sql = new StringBuffer("SELECT sum(case currency when 'RMB' then a.amount when 'USD' "
                 + "then a.amount * " + ErpRate.USD_RATE + " when 'HKD' then a.amount * " + ErpRate.HKD_RATE + " end) result "
                 + "FROM (SELECT SUM(pab_paymount) amount,pab_currency currency FROM purc$apbill WHERE pad_venduu=" + enUU
-                + " and pab_date >= " + startTime + " and pab_date < " + endTime + " GROUP BY pab_currency) a");
+                + " and pab_date >= '" + startTime + "' and pab_date < '" + endTime + "' GROUP BY pab_currency) a");
         Double result = commonDao.queryForObject(sql.toString(), Double.class);
         return NumFormat.getTwo(result);
     }

src/main/java/com/uas/platform/b2b/openapi/support/NumFormat.java

@@ -74,10 +74,15 @@ public class NumFormat {
 
     public static String getIncrease(Double last, Double now) {
         if ((last != 0.0) && (now != 0.0)) {
-            return NumFormat.getPercent(last / now - 1);
-        } else {
-            return "100%";
+            return NumFormat.getPercent(now / last - 1);
+        }
+        if (last == 0.0 && now != 0.0) {
+            return NumFormat.getPercent(now);
+        }
+        if (last != 0.0 && now == 0.0) {
+            return NumFormat.getPercent(-last);
         }
+        return "0%";
     }
 
     public static java.sql.Date getThreeM() {

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -1,6 +1,10 @@
 package com.uas.platform.b2b.service;
 
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.search.b2b.model.SPage;
 
@@ -346,4 +350,12 @@ public interface UserService {
 	 * @throws Exception
 	 */
 	void postToAccountCenter(User user) throws Exception ;
+
+    /**
+     * 通过用户UU查询用户信息
+     *
+     * @param userUUList 用户UU号
+     * @return List<User>
+     */
+    List<User> findByUserUUList(List<Long> userUUList);
 }

src/main/java/com/uas/platform/b2b/service/impl/PurcInquiryServiceImpl.java

@@ -1,27 +1,21 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.core.util.ThreadTask;
+import com.uas.platform.b2b.dao.DistributeDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.PurcInquiryDao;
 import com.uas.platform.b2b.dao.PurcInquiryItemDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryInfoDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+import com.uas.platform.b2b.dao.RoleDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.UserOrderDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.OrderRedDotAll;
-import com.uas.platform.b2b.model.OrderType;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.model.ProductInfo;
-import com.uas.platform.b2b.model.PurcInquiry;
-import com.uas.platform.b2b.model.PurcInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryInfo;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryItemInfo;
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
-import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.OrderRedDotService;
@@ -511,16 +505,18 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
             Map<String, InquiryProductInfo> productInfoMap = distinctProdCode(inquiry.getInquiryItems());
             Set<InquiryProductInfo> products = new HashSet<>();
             for (Map.Entry<String, InquiryProductInfo> map : productInfoMap.entrySet()) {
-                InquiryProductInfo productInfo = map.getValue();
-                Set<PurchaseInquiryItemInfo> items = new HashSet<>();
-                for (PurchaseInquiryItemInfo item : inquiry.getInquiryItems()) {
-                    if (item.getProductCode().equals(map.getKey())) {
-                        items.add(item);
+                if (null != map) {
+                    InquiryProductInfo productInfo = map.getValue();
+                    Set<PurchaseInquiryItemInfo> items = new HashSet<>();
+                    for (PurchaseInquiryItemInfo item : inquiry.getInquiryItems()) {
+                        if (null != map.getKey() && item.getProductCode().equals(map.getKey())) {
+                            items.add(item);
+                        }
                     }
+                    productInfo.setInquiryItems(items);
+                    products.add(productInfo);
+                    inquiryInfo.setProducts(products);
                 }
-                productInfo.setInquiryItems(items);
-                products.add(productInfo);
-                inquiryInfo.setProducts(products);
             }
         }
         return inquiryInfo;

src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -2,36 +2,11 @@ package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
-import com.uas.platform.b2b.dao.B2bCodeSetDao;
-import com.uas.platform.b2b.dao.BarLPSetingDao;
-import com.uas.platform.b2b.dao.BarPackageDao;
-import com.uas.platform.b2b.dao.BarPackageDetailDao;
-import com.uas.platform.b2b.dao.BarSendNotifyDao;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.PurchaseNoticeDao;
-import com.uas.platform.b2b.dao.PurchaseNoticeEndDao;
-import com.uas.platform.b2b.dao.SaleSendAllDao;
-import com.uas.platform.b2b.dao.SaleSendDao;
-import com.uas.platform.b2b.dao.SaleSendItemDao;
-import com.uas.platform.b2b.dao.SaleSendItemVerifyDao;
+import com.uas.platform.b2b.core.util.ThreadTask;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
-import com.uas.platform.b2b.model.B2bCodeSet;
-import com.uas.platform.b2b.model.BarLabelPrintSetting;
-import com.uas.platform.b2b.model.BarPackage;
-import com.uas.platform.b2b.model.BarPackageDetail;
-import com.uas.platform.b2b.model.BarSendNotify;
-import com.uas.platform.b2b.model.OrderRedDotAll;
-import com.uas.platform.b2b.model.OrderType;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseNoticeEnd;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.SaleSend;
-import com.uas.platform.b2b.model.SaleSendAll;
-import com.uas.platform.b2b.model.SaleSendItem;
-import com.uas.platform.b2b.model.SaleSendItemAll;
-import com.uas.platform.b2b.model.SaleSendItemVerify;
-import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.service.PersonalProductService;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.OrderRedDotService;
@@ -384,10 +359,11 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			}
 			List<SaleSendItem> sendItems = saleSendItemDao.save(send.getSendItems());
 			notice.setEndQty(endQty);
-			notice.setStatus((short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value()));
+			Short status = (short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value());
+			notice.setStatus(status);
 			purchaseNoticeDao.save(notice);
 			if (!CollectionUtils.isEmpty(sendItems)) {
-				List<SaleSend> saleSends = new ArrayList<SaleSend>();
+				List<SaleSend> saleSends = new ArrayList<>();
 				saleSends.add(sendItems.get(0).getSend());
 			}
 			// 我的产品库更新
@@ -418,36 +394,39 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			saleSend.setVerifystatus(Constant.NO);
 			short number = 0;
 			List<SaleSendItem> sendItems = new ArrayList<SaleSendItem>();
+			Set<Long> noticeIdSet = new HashSet<>();
 			for (SaleSendItem item : saleSend.getSendItems()) {
-				PurchaseNotice notice = purchaseNoticeDao.findOne(item.getNoticeId());
-				if (notice != null) {
-					if (notice.getEnd() != null && notice.getEnd() == Constant.YES) {
-						String error = "货车中订单:" + notice.getOrderItem().getOrder().getCode() + "的物料号为"
-								+ notice.getOrderItem().getProduct().getCode() + "的发货通知被取消！";
-						throw new IllegalOperatorException(error);
-					} else {
-						double thisQty = item.getQty();
-						double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + thisQty;
-						if (endQty > notice.getQty()) {
-							throw new IllegalOperatorException("累计发货数量将超出本次送货提醒的需求数！");
-						}
-						item.setNotice(notice);
-                        // 带了序号则不重设序号，不带这重设序号
-						if (item.getNumber() == null || item.getNumber() == 0) {
-							item.setNumber(++number);
-						}
-						item.setOrderItem(notice.getOrderItem());
-						item.setOrderItemId(notice.getOrderItemId());
-						saleSend.setRate(notice.getOrderItem().getOrder().getRate());
-						item.setSend(saleSend);
-						sendItems.add(item);
-					}
-				} else {
-					throw new IllegalOperatorException("参数错误，无效的客户送货提醒单！");
-				}
-
+			    if (!noticeIdSet.contains(item.getNoticeId())) {
+                    PurchaseNotice notice = purchaseNoticeDao.findOne(item.getNoticeId());
+                    noticeIdSet.add(item.getNoticeId());
+                    if (notice != null) {
+                        if (notice.getEnd() != null && notice.getEnd() == Constant.YES) {
+                            String error = "货车中订单:" + notice.getOrderItem().getOrder().getCode() + "的物料号为"
+                                + notice.getOrderItem().getProduct().getCode() + "的发货通知被取消！";
+                            throw new IllegalOperatorException(error);
+                        } else {
+                            double thisQty = item.getQty();
+                            double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + thisQty;
+                            if (endQty > notice.getQty()) {
+                                throw new IllegalOperatorException("累计发货数量将超出本次送货提醒的需求数！");
+                            }
+                            item.setNotice(notice);
+                            // 带了序号则不重设序号，不带这重设序号
+                            if (item.getNumber() == null || item.getNumber() == 0) {
+                                item.setNumber(++number);
+                            }
+                            item.setOrderItem(notice.getOrderItem());
+                            item.setOrderItemId(notice.getOrderItemId());
+                            saleSend.setRate(notice.getOrderItem().getOrder().getRate());
+                            item.setSend(saleSend);
+                            sendItems.add(item);
+                        }
+                    } else {
+                        throw new IllegalOperatorException("参数错误，无效的客户送货提醒单！");
+                    }
+                }
 			}
-			sendItems = saleSendItemDao.save(sendItems);
+			List<PurchaseNotice> noticeList = new ArrayList<>();
 			for (SaleSendItem sendItem : sendItems) {
 				PurchaseNotice notice = purchaseNoticeDao.findOne(sendItem.getNoticeId());
 				double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + sendItem.getQty();
@@ -455,14 +434,16 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 					throw new IllegalOperatorException("累计发货数量将超出本次送货提醒的需求数！");
 				}
 				notice.setEndQty(endQty);
-				notice.setStatus(
-						(short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value()));
-				purchaseNoticeDao.save(notice);
+				Short status = (short) (endQty == notice.getQty() ? Status.REPLIED.value() : Status.NOT_REPLY.value());
+				notice.setStatus(status);
+                noticeList.add(notice);
                 // 转入我的物料库
                 personalProductService.covertPersonalProduct(notice.getOrderItem().getProductId(), "批量发货");
 			}
+            purchaseNoticeDao.save(noticeList);
+            sendItems = saleSendItemDao.save(sendItems);
 			if (!CollectionUtils.isEmpty(sendItems)) {
-				List<SaleSend> saleSends = new ArrayList<SaleSend>();
+				List<SaleSend> saleSends = new ArrayList<>();
 				saleSends.add(sendItems.get(0).getSend());
 			}
 			return sendItems.get(0).getSend();
@@ -731,8 +712,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 		code.append(date);
 		barcodeSet.setMaxdate(date);
         // 如果当前日期大于上次日期
-		if (!("").equals(maxdate) && null != maxdate && (!NULL_COUNT.equals(date))
-				&& (Integer.valueOf(maxdate) > Integer.valueOf(date))) {
+		if (!StringUtils.isEmpty(maxdate) && (!NULL_COUNT.equals(date)) && (Integer.valueOf(maxdate) > Integer.valueOf(date))) {
             // 流水重新开始
 			code.append(lpad(lennum, "1"));
             // 流水号增加1
@@ -778,8 +758,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 		code.append(date);
 		barcodeSet.setMaxdate(date);
         // 如果当前日期大于上次日期
-		if (!("").equals(maxdate) && null != maxdate && (!NULL_COUNT.equals(date))
-				&& (Integer.valueOf(maxdate) > Integer.valueOf(date))) {
+		if (!StringUtils.isEmpty(maxdate) && (!NULL_COUNT.equals(date)) && (Integer.valueOf(maxdate) > Integer.valueOf(date))) {
             // 流水重新开始
 			code.append(lpad(lennum, "1"));
             // 流水号增加1
@@ -866,7 +845,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 			for (BarSendNotify barcode : bars) {
 				List<Map<String, Object>> list1 = new ArrayList<Map<String, Object>>();
-				Map<String, Object> mp1 = new HashMap<String, Object>();
+				Map<String, Object> mp1;
 				va = setting.getSql().replaceAll(regex, String.valueOf(barcode.getId()));
 				List<Map<String, Object>> listData = commonDao.queryForList(va);
 				for (Map<String, Object> mapD : listData) {
@@ -918,7 +897,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 		List<Map<String, Object>> parameter = commonDao.queryForList(
 				"select la_pagesize, lp_id,lp_valuetype,lp_encode,lp_name,lp_leftrate,lp_toprate,lp_width,lp_ifshownote,lp_font,lp_size,lp_notealignjustify,lp_height from bar$labelParameter left join bar$label on la_id=lp_laid where la_id="
 						+ setting.getLabel().getId());
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map;
 		va = setting.getSql().replaceAll(regex, String.valueOf(bsnId));
 		List<Map<String, Object>> listData = commonDao.queryForList(va);
 		for (Map<String, Object> mapD : listData) {
@@ -1045,11 +1024,13 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
     /**
      * 通过ids查询发货信息
      *
-     * @param ids
-     * @return
+     * @param ids 传入的id
+     * @return List<PurchaseNotice>
      */
     @Override
     public List<PurchaseNotice> findByIds(List<Long> ids) {
-        return purchaseNoticeDao.findAll(ids);
+        // 进行ID去重操作
+        Set<Long> idSet = new HashSet<>(ids);
+        return purchaseNoticeDao.findAll(idSet);
     }
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -1,20 +1,9 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.PrintLogDao;
-import com.uas.platform.b2b.dao.PurcOrderInfoItemDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
-import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
-import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
-import com.uas.platform.b2b.dao.PurchaseOrderReceivedDao;
-import com.uas.platform.b2b.dao.PurchaseOrderReplyDao;
-import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
-import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
-import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.core.util.SplitArray;
+import com.uas.platform.b2b.core.util.ThreadTask;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.PurchaseDetail;
 import com.uas.platform.b2b.event.PurchaseOrderEndReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderReplyReleaseEvent;
@@ -266,7 +255,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		} else {
 			item.setStatus((short) Status.NOT_REPLY.value());
 		}
-		purchaseOrderItemDao.updateByReply(reply.getDelivery(), reply.getRemark(), item.getId(), item.getStatus());
+		Double replyQtySum = purchaseOrderReplyDao.getReplyQty(item.getId());
+		purchaseOrderItemDao.updateByReply(replyQtySum, reply.getDelivery(), reply.getRemark(), item.getId(), item.getStatus());
 		PurchaseOrder order = item.getOrder();
 		// 订单主记录状态
 		order = updateOrderStatus(order.getId());

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -1,11 +1,26 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.RoleDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
-import com.uas.platform.b2b.support.*;
+import com.uas.platform.b2b.support.MessageConf;
+import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SendMailService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.TokenService;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.SystemException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
@@ -26,9 +41,17 @@ import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
+ * @author US50
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
  * @see com.uas.platform.b2b.v2.service.impl.UserServiceImpl
  * 
@@ -40,6 +63,8 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private UserDao userDao;
 	@Autowired
+	private RoleDao roleDao;
+	@Autowired
 	private VendorDao vendorDao;
 	@Autowired
 	private DistributeDao distributeDao;
@@ -52,8 +77,6 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 	@Autowired
-	private CommonDao commonDao;
-	@Autowired
 	private MailService mailService;
 	@Autowired
 	private MessageConf messageConf;
@@ -63,20 +86,6 @@ public class UserServiceImpl implements UserService {
 	static final String UU_REGEXP = "^\\d{4,}$";
 
 	static final String NUM_REGEXP= "^[0-9]*$";
-	/**
-	 * 匹配中文正则式
-	 */
-	private static final String CHINESE_REGEXP = "^[\u4e00-\u9fa5]*$";
-
-	/**
-	 * 匹配英文正则式
-	 */
-	private static final String ENGLISH_REGEXP = "^[A-Za-z]+$";
-
-    /**
-     * 不需要展示的日志记录
-     */
-	private final static CommBufferedLogger logger = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
     /**
      * 展示给用户查看的日志
@@ -135,12 +144,6 @@ public class UserServiceImpl implements UserService {
 		}
 	}
 
-	public boolean bindUser(String userUU, String enUU) {
-		// 打印SystemSession
-		// UserEnterprise实体？？？
-		return false;
-	}
-
 	@Override
 	public boolean isTelUseable(String tel) {
 		return userDao.findUserByUserTel(tel).size() == 0;
@@ -170,7 +173,6 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User updateUserInfo(User user){
 		User newUser = userDao.findOne(user.getUserUU());
-		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		if (newUser != null) {
 			newUser.setUserName(user.getUserName());
 			newUser.setUserSex(user.getUserSex());
@@ -182,7 +184,8 @@ public class UserServiceImpl implements UserService {
 			// 修改用户角色，只对用户的当前企业的角色进行修改
 			if (!CollectionUtils.isEmpty(user.getRoles())) {
 				Set<Role> existRoles = newUser.getRoles();
-				if (!CollectionUtils.isEmpty(existRoles)) {// 保留用户在其他企业的角色
+				// 保留用户在其他企业的角色
+				if (!CollectionUtils.isEmpty(existRoles)) {
 					Iterator<Role> iterator = existRoles.iterator();
 					Long currentEnuu = SystemSession.getUser().getEnterprise().getUu();
 					while (iterator.hasNext()) {
@@ -240,7 +243,8 @@ public class UserServiceImpl implements UserService {
         StringBuffer newRoles = new StringBuffer();
 		if (!CollectionUtils.isEmpty(user.getRoles())) {
 			Set<Role> existRoles = newUser.getRoles();
-			if (existRoles != null) {// 保留用户在其他企业的角色
+			// 保留用户在其他企业的角色
+			if (existRoles != null) {
 				Iterator<Role> iterator = existRoles.iterator();
 				while (iterator.hasNext()) {
 					Role role = iterator.next();
@@ -265,7 +269,8 @@ public class UserServiceImpl implements UserService {
 			}
 		} else {
             Set<Role> existRoles = newUser.getRoles();
-            if (!CollectionUtils.isEmpty(existRoles)) {// 保留用户在其他企业的角色
+            // 保留用户在其他企业的角色
+            if (!CollectionUtils.isEmpty(existRoles)) {
                 Iterator<Role> iterator = existRoles.iterator();
                 while (iterator.hasNext()) {
                     Role role = iterator.next();
@@ -300,28 +305,13 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public SPage<User> findByPageInfo(PageInfo pageInfo, String keyword) {
 		Page<User> users = getUsersByPage(pageInfo, keyword);
-		SPage<User> userInfos = new SPage<User>();
+		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		if (!CollectionUtils.isEmpty(users.getContent())) {
 			for (User user : users.getContent()) {
-				Set<Role> roles = user.getRoles();
-				Long enuu = SystemSession.getUser().getEnterprise().getUu();
-				if (!CollectionUtils.isEmpty(roles)) {
-					Iterator<Role> iterator = roles.iterator();
-					while (iterator.hasNext()) {
-						Role role = iterator.next();
-						if (!role.getEnUU().equals(enuu)) {
-							iterator.remove();
-						}
-					}
-				}
+			    user.setCurrentEnterpriseRoles(enUU);
 			}
 		}
-		userInfos.setTotalPage(users.getTotalPages());
-		userInfos.setSize(users.getSize());
-		userInfos.setPage(users.getNumber());
-		userInfos.setTotalElement(users.getTotalElements());
-		userInfos.setContent(users.getContent());
-		return userInfos;
+		return SPageUtils.covertSPage(users);
 	}
 
 	private Page<User> getUsersByPage(final PageInfo pageInfo, String keyword) {
@@ -346,7 +336,6 @@ public class UserServiceImpl implements UserService {
 			if (user1.getEnterprise() == null) {
 				user1.setCurrentEnterprise();// 随便绑定一个用户所属企业
 			}
-			Enterprise enterprise = user1.getEnterprise();
 			user1 = userDao.save(user1);
 			return user1;
 		} else {
@@ -365,7 +354,21 @@ public class UserServiceImpl implements UserService {
 		AccountUtils.saveUser(detail, null);
 	}
 
-	static final String defaultPassword = "111111";
+    /**
+     * 通过用户UU查询用户信息
+     *
+     * @param userUUList 用户UU号
+     * @return List<User>
+     */
+    @Override
+    public List<User> findByUserUUList(List<Long> userUUList) {
+        List<User> users = userDao.findAll(userUUList);
+        Long enUU = SystemSession.getUser().getEnterprise().getUu();
+        users.forEach(user -> user.setCurrentEnterpriseRoles(enUU));
+        return users;
+    }
+
+    static final String defaultPassword = "111111";
 
 	@Override
 	public User addUser(User user, HttpServletRequest request) {
@@ -381,6 +384,14 @@ public class UserServiceImpl implements UserService {
 		try {
 			Long userUU = addUserToAccountCenter(user);
 			user.setUserUU(userUU);
+			List<Role> roles = roleDao.findByEnUUAndDesc(SystemSession.getUser().getEnterprise().getUu(), "普通用户");
+			if (!CollectionUtils.isEmpty(roles)) {
+				Set<Role> set = new HashSet<>();
+				set.add(roles.get(0));
+				user.setRoles(set);
+			} else {
+				enterpriseDao.callInitProcedure(SystemSession.getUser().getEnterprise().getUu());
+			}
             user.addEnterprise(SystemSession.getUser().getEnterprise());
             user.setCurrentEnterprise();
 			userDao.save(user);
@@ -472,7 +483,6 @@ public class UserServiceImpl implements UserService {
 		user.setUserPwd(Md5Utils.encode(defaultPassword, user.getUserUU()));
 		try {
 			user.setUserPwd(defaultPassword);
-//			postToAccountCenter(user, defaultPassword);
 			user = userDao.save(user);
 		} catch (Exception e) {
 			userDao.delete(user);
@@ -495,9 +505,11 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User findShieldUuserInfo(String userName) {
 		User user = null;
-		if (userName.contains("@")) { // 邮箱登录
+		// 邮箱登录
+		if (userName.contains("@")) {
 			user = findUserByUserEmail(userName);
-		} else if (userName.matches(TEL_REGEXP)) {// 手机号登录
+			//手机号登录
+		} else if (userName.matches(TEL_REGEXP)) {
 			user = findUserByUserTel(userName);
 		} else if (userName.matches(UU_REGEXP)) {
 			user = findUserByUserUU(Long.parseLong(userName));
@@ -524,7 +536,8 @@ public class UserServiceImpl implements UserService {
 		model.put("uu", user.getUserUU());
 		model.put("checkcode", encodeString);
 		model.put("rootpath", AgentUtils.getHost(request));
-		if ("admin".equals(type)) {// 发送给管理员
+		// 发送给管理员
+		if ("admin".equals(type)) {
 			User admin = userDao.findOne(user.getEnterprise().getEnAdminuu());
 			// 发送邮件
 			model.put("email", admin.getUserEmail());
@@ -538,7 +551,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public String checkForget(Long userUU, String checkcode) {
-		String encodeString = null;
+		String encodeString;
 		if (tokenService.isCertified("user", userUU, checkcode)) {
 			encodeString = tokenService.getEncodeToken("user", userUU);
 		} else {
@@ -577,18 +590,21 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public UserInfo findUserByKeyWord(String keyWord) {
 		User user = null;
-		if (keyWord.contains("@")) { // 按邮箱查找
+		// 按邮箱查找
+		if (keyWord.contains("@")) {
 			user = findUserByUserEmail(keyWord);
-		} else if (keyWord.matches(TEL_REGEXP)) { // 按手机号查找
+			//按手机号查找
+		} else if (keyWord.matches(TEL_REGEXP)) {
 			user = findUserByUserTel(keyWord);
-		} else if (keyWord.matches(UU_REGEXP)) { // 按UU号查找
+			// 按UU号查找
+		} else if (keyWord.matches(UU_REGEXP)) {
 			user = findUserByUserUU(Long.parseLong(keyWord));
 		}
 		if (user == null) {
             throw new IllegalOperatorException("未查找到您输入账号的用户信息");
         }
-
-		UserInfo simpleUser = new UserInfo(user); // 将user重新封装为简单对象，只返回前台需要的用户信息
+        // 将user重新封装为简单对象，只返回前台需要的用户信息
+		UserInfo simpleUser = new UserInfo(user);
 		return simpleUser;
 	}
 
@@ -606,32 +622,13 @@ public class UserServiceImpl implements UserService {
 		List<User> users = new ArrayList<User>();
 		Set<User> userSet = new HashSet<User>();
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
-//		if (keyword.contains("@")) { // 按邮箱查找
-//			users = userDao.findUserByUserEmailAndEnUU(keyword, enUU);
-//		} else if (keyword.matches(TEL_REGEXP)) { // 按手机号查找
-//			users = userDao.findUserByUserTelAndEnUU(keyword, enUU);
-//		} else if (keyword.matches(UU_REGEXP)) { // 按UU号查找
-//			users = userDao.findByEnUUAndUserUU(enUU, Long.parseLong(keyword));
-//		} else if (!keyword.contains("@") && (keyword.matches(CHINESE_REGEXP) || keyword.matches(ENGLISH_REGEXP))) {// 按名字查找
-//			users = userDao.findUserByUserNameAndEnUU(keyword, enUU);
-//		}
 		userSet.addAll(userDao.findUserByUserEmailAndEnUU(keyword, enUU));
 		userSet.addAll(userDao.findUserByUserTelAndEnUU(keyword, enUU));
 		userSet.addAll(userDao.findByEnUUAndUserUU(enUU, Long.parseLong(keyword)));
 		userSet.addAll(userDao.findUserByUserNameAndEnUU(keyword, enUU));
 		if (!CollectionUtils.isEmpty(userSet)) {
 			for (User user : users) {
-				Set<Role> roles = user.getRoles();
-				Long enuu = SystemSession.getUser().getEnterprise().getUu();
-				if (!CollectionUtils.isEmpty(roles)) {
-					Iterator<Role> iterator = roles.iterator();
-					while (iterator.hasNext()) {
-						Role role = iterator.next();
-						if (!role.getEnUU().equals(enuu)) {
-							iterator.remove();
-						}
-					}
-				}
+				user.setCurrentEnterpriseRoles(enUU);
 			}
 		}
 		return userSet;
@@ -665,12 +662,19 @@ public class UserServiceImpl implements UserService {
 		if (user == null) {
 			throw new IllegalArgumentException("不存在的用户！");
 		}
-
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {
-			enterprises = new HashSet<Enterprise>();
+			enterprises = new HashSet<>();
 		}
 		enterprises.add(SystemSession.getUser().getEnterprise());
+		List<Role> roles = roleDao.findByEnUUAndDesc(SystemSession.getUser().getEnterprise().getUu(), "普通用户");
+		if (roles.size() > 0) {
+			Set<Role> set = user.getRoles();
+			set.add(roles.get(0));
+			user.setRoles(set);
+		} else {
+			enterpriseDao.callInitProcedure((SystemSession.getUser().getEnterprise().getUu()));
+		}
 		user.setEnterprises(enterprises);
 		userDao.save(user);
 		try {
@@ -689,7 +693,7 @@ public class UserServiceImpl implements UserService {
 
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {
-			enterprises = new HashSet<Enterprise>();
+			enterprises = new HashSet<>();
 		}
 		if (enter != null) {
 			enterprises.add(enter);
@@ -860,7 +864,6 @@ public class UserServiceImpl implements UserService {
 					}
 				} else {
 					if (!CollectionUtils.isEmpty(butes)) {
-//						distributeDao.delete(butes.get(0));
 						List<Distribute> deleteList = new ArrayList<>();
 						// 删除时，同时删除其绑定权限的其他用户
 						List<Distribute> distributes = distributeDao.findByVendorIdAndLeaderUU(vendors.get(0).getId(), u.getUserUU());

src/main/java/com/uas/platform/b2b/support/mq/PushUtils.java

@@ -92,7 +92,7 @@ public class PushUtils {
 				params.put("title", title);
 				params.put("content", content);
 				AccessToken token = getAccessTokenService().createNew(user, enUU, null, 259200);// 有效期：三天
-				// ex: http://www.ubtob.com/openapi/webpage?access_token=282a8ba2fa1f4fdc9e025c1eea2ad7e8&redirect_page=http%3A%2F%2Fwww.ubtob.com%2F%23sale%2Forder%2F123
+				// ex: http://www.usoftchina.com/openapi/webpage?access_token=282a8ba2fa1f4fdc9e025c1eea2ad7e8&redirect_page=http%3A%2F%2Fwww.usoftchina.com%2F%23sale%2Forder%2F123
 				try {
 					params.put("url", String.format("%s/openapi/webpage?access_token=%s&redirect_page=%s", getSysConf().getB2b(),
 							token.getId(), URLEncoder.encode(getSysConf().getB2b() + "/" + url, "utf-8")));

src/main/java/com/uas/platform/b2b/v2/service/impl/UserServiceImpl.java

@@ -1,20 +1,22 @@
 package com.uas.platform.b2b.v2.service.impl;
 
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-import com.uas.sso.entity.UserView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RoleDao;
 import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.v2.service.UserService;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.encry.Md5Utils;
+import com.uas.sso.entity.UserView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.HashSet;
-import org.springframework.util.StringUtils;
+import java.util.List;
+import java.util.Set;
 
 @Service("v2.UserService")
 public class UserServiceImpl implements UserService {
@@ -81,6 +83,14 @@ public class UserServiceImpl implements UserService {
 		if (user == null || enterprise == null) {
 			return;
 		}
+		List<Role> roles = roleDao.findByEnUUAndDesc(enterprise.getUu(), "普通用户");
+		if (roles.size() > 0) {
+			Set<Role> set = user.getRoles();
+			set.add(roles.get(0));
+			user.setRoles(set);
+		} else {
+			enterpriseDao.callInitProcedure(enterprise.getUu());
+		}
 		user.getEnterprises().add(enterprise);
 		userDao.save(user);
 	}

src/main/webapp/WEB-INF/views/mobile/signin.html

@@ -80,7 +80,7 @@ body {
 						<p class="text-center">
 							
 						</p>
-						<p><i class="fa fa-bullhorn"></i> 注册请使用电脑访问优软云主页(www.ubtob.com)</p>
+						<p><i class="fa fa-bullhorn"></i> 注册请使用电脑访问优软云主页(www.usoftchina.com)</p>
 					</div>
 				</div>
 			</form>

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

@@ -25,7 +25,7 @@
 			<nav id="site-nav">
 				<ul class="ghost-center">
 					<li class="uas-cloud">
-						<a href="http://www.ubtob.com/" target="_blank">
+						<a href="http://www.usoftchina.com/" target="_blank">
 							<img src="static/img/all/logo_uas.png"/>
 							<span>进入优软云</span>
 						</a>
@@ -233,8 +233,8 @@
 			<li>
 				<h3>更多服务</h3>
 				<ul class="list-unstyled">
-					<li><a href="http://www.usoftchina.com/usoft/"  target="_blank" target="_blank">优软科技</a></li>
-					<li><a href="http://www.ubtob.com/" target="_blank" target="_blank">优软云</a></li>
+					<li><a href="http://uas.usoftchina.com"  target="_blank" target="_blank">优软科技</a></li>
+					<li><a href="http://www.usoftchina.com/" target="_blank" target="_blank">优软云</a></li>
 				</ul>
 			</li>
 			<li>
@@ -250,7 +250,7 @@
 			<span>友情链接：</span>
 			<a href="http://www.worldshine.net" target="_blank" title="深圳华商龙">深圳华商龙</a>|
 			<a href="http://www.yitoa.com" target="_blank" title="深圳市英唐智能科技">深圳市英唐智能科技</a>|
-			<a href="http://www.usoftchina.com/usoft/" target="_blank" title="深圳市优软科技">深圳市优软科技</a>|
+			<a href="http://uas.usoftchina.com" target="_blank" title="深圳市优软科技">深圳市优软科技</a>|
 			<a href="http://www.fantem.com" target="_blank" title="丰唐物联技术（深圳）">丰唐物联技术（深圳）</a>|
 			<a href="http://www.hiways.com" target="_blank" title="深圳市海威思科技">深圳市海威思科技</a>|
 			<a href="http://www.huashangweitai.com" target="_blank" title="深圳市华商维泰显示科技">深圳市华商维泰显示科技</a>|

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

@@ -22,7 +22,7 @@
 		<div class="container" style="padding: 0; height: 50px; overflow: hidden;">
 			<div class="navbar-header">
 				<span class="navbar-brand">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"></a>
 					<a href="http://mall.usoftchina.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
@@ -77,7 +77,7 @@
 					</p>
 				</div>
 				<div class="col-sm-2" style="float: right;">
-					<a href="http://www.ubtob.com" class="back-home">返回优软云</a>
+					<a href="http://www.usoftchina.com" class="back-home">返回优软云</a>
 				</div>
 			</div>
 		</div>

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

@@ -24,7 +24,7 @@
 		<div class="container">
 			<div class="navbar-header">
 				<span class="navbar-brand">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"></a>
 					<a href="http://mall.usoftchina.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>

src/main/webapp/resources/tpl/index/approvalFlow/productmatches.html

@@ -269,7 +269,7 @@ tbody td div.text-mould {
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -206,7 +206,7 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -421,7 +421,7 @@
                            </table>
                             <div id="empty" ng-if="tableParams.total() == 0">
                                 <div class="left_img">
-                                    <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                                    <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                                     <a href="#/index" title="B2B商务首页">B2B 商务</a>
                                 </div>
                                 <div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -194,7 +194,7 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -421,7 +421,7 @@
 		<td colspan="5">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -429,7 +429,7 @@
             <td colspan="5">
                 <div id="empty">
                     <div class="left_img">
-                        <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                        <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                         <a href="#/index" title="B2B商务首页">B2B 商务</a>
                     </div>
                     <div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -318,7 +318,7 @@ width: 80px;
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -379,7 +379,7 @@
 		<td colspan="7">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/servicerInfo.html

@@ -220,7 +220,7 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -222,7 +222,7 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -205,7 +205,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -320,7 +320,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -210,7 +210,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -178,7 +178,7 @@
             <td colspan="3">
                 <div id="empty">
                     <div class="left_img">
-                        <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                        <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                         <a href="#/index" title="B2B商务首页">B2B 商务</a>
                     </div>
                     <div class="right_link">

src/main/webapp/resources/tpl/index/make/accept.html

@@ -290,7 +290,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/make/change.html

@@ -274,7 +274,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/make/order.html

@@ -423,7 +423,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -208,7 +208,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/make/returns.html

@@ -273,7 +273,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -264,7 +264,7 @@
 						<td colspan="5">
 							<div id="empty">
 								<div class="left_img">
-									<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+									<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 									<a href="#/index" title="B2B商务首页">B2B 商务</a>
 								</div>
 								<div class="right_link">

src/main/webapp/resources/tpl/index/purc/cart.html

@@ -248,7 +248,7 @@
 		<td colspan="7">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/purc/cart_detail.html

@@ -254,7 +254,7 @@
 						<td colspan="5">
 							<div id="empty">
 								<div class="left_img">
-									<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+									<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 									<a href="#/index" title="B2B商务首页">B2B 商务</a>
 								</div>
 								<div class="right_link">

src/main/webapp/resources/tpl/index/purc/changeList.html

@@ -386,7 +386,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/purc/change_new.html

@@ -199,7 +199,6 @@
 <form class="width100" name="orderChange" autocomplete="off" id="orderChange">
 <div class="warp">
     <div class=" purchase">
-
             <div class="com_head"><span>采购变更单</span></div>
             <div class="purchase_form">
                 <!--基本信息-->

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -320,7 +320,7 @@
                 <td colspan="4">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -437,7 +437,7 @@ margin-left: 55px;
 			<td colspan="8">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -1166,7 +1166,7 @@
                 <td colspan="5" style="border-bottom: 1px solid transparent">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/purc/inquiry_unapply.html

@@ -319,7 +319,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/purc/modal/enableOrderList.html

@@ -184,7 +184,7 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img
                                     src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -319,7 +319,7 @@
 		<td colspan="7">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -287,7 +287,7 @@
         </table>
         <div id="empty" ng-if="tableParams.total() == 0">
             <div class="left_img">
-                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                 <a href="#/index" title="B2B商务首页">B2B 商务</a>
             </div>
             <div class="right_link">

src/main/webapp/resources/tpl/index/purc/pubInquiry.html

@@ -435,7 +435,7 @@ margin-left: 55px;
 			<td colspan="8">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html

@@ -1132,7 +1132,7 @@ select.disabled {
                 <td colspan="7" style="border-bottom: none;">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html

@@ -1144,7 +1144,7 @@ select.disabled {
                 <td colspan="7">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -1063,7 +1063,7 @@
         </table>
         <div id="empty" ng-if="tableParams.total() == 0">
             <div class="left_img">
-                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                 <a href="#/index" title="B2B商务首页">B2B 商务</a>
             </div>
             <div class="right_link">

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -1099,7 +1099,7 @@ input[type="radio"], input[type="checkbox"] {
         </table>
         <div id="empty" ng-if="tableParams.total() == 0">
             <div class="left_img">
-                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                 <a href="#/index" title="B2B商务首页">B2B 商务</a>
             </div>
             <div class="right_link">

src/main/webapp/resources/tpl/index/purc/tender_answer_list.html

@@ -348,7 +348,7 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -295,7 +295,7 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/purc/vendor.html

@@ -125,7 +125,7 @@
 				<td colspan="7">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -127,7 +127,7 @@
                     <td colspan="5">
                         <div id="empty">
                             <div class="left_img">
-                                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                                 <a href="#/index" title="B2B商务首页">B2B 商务</a>
                             </div>
                             <div class="right_link">

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -303,7 +303,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -271,7 +271,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -272,7 +272,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/sale/accept.html

@@ -282,7 +282,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/approval.html

@@ -389,7 +389,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/change.html

@@ -422,7 +422,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/sale/customer.html

@@ -149,7 +149,7 @@
 				<td colspan="7">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/sale/customer_detail.html

@@ -149,7 +149,7 @@
                     <td colspan="5">
                         <div id="empty">
                             <div class="left_img">
-                                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                                <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                                 <a href="#/index" title="B2B商务首页">B2B 商务</a>
                             </div>
                             <div class="right_link">

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -268,7 +268,7 @@
 			<td colspan="8">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/inquiryRemind.html

@@ -279,7 +279,7 @@
             <td colspan="6">
                 <div id="empty">
                     <div class="left_img">
-                        <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                        <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                         <a href="#/index" title="B2B商务首页">B2B 商务</a>
                     </div>
                     <div class="right_link">

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -333,7 +333,7 @@ tbody td div.text-mould {
 			<td colspan="7">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -529,7 +529,7 @@
             <td colspan="6">
                 <div id="empty">
                     <div class="left_img">
-                        <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                        <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                         <a href="#/index" title="B2B商务首页">B2B 商务</a>
                     </div>
                     <div class="right_link">

src/main/webapp/resources/tpl/index/sale/opentenderlist.html

@@ -285,7 +285,7 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/sale/order.html

@@ -381,7 +381,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/sale/pubinquiry.html

@@ -339,7 +339,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -337,7 +337,7 @@
 			<td colspan="7">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -278,7 +278,7 @@
 			<td colspan="6">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -405,7 +405,7 @@
 		<td colspan="6">
 			<div id="empty">
 				<div class="left_img">
-					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 					<a href="#/index" title="B2B商务首页">B2B 商务</a>
 				</div>
 				<div class="right_link">

src/main/webapp/resources/tpl/index/sale/send.html

@@ -337,7 +337,7 @@
 			<td colspan="5">
 				<div id="empty">
 					<div class="left_img">
-						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">

src/main/webapp/resources/tpl/index/sale/tender_question_list.html

@@ -349,7 +349,7 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -356,7 +356,7 @@
                 <td colspan="6">
                     <div id="empty">
                         <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
                             <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
                         <div class="right_link">

src/main/webapp/resources/tpl/index/sale/vendorPerformanceAssess.html

@@ -134,7 +134,7 @@
 				<td colspan="5">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/index/search/search_result.html

@@ -262,7 +262,7 @@
 				<td colspan="6">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">
@@ -339,7 +339,7 @@
 				<td colspan="7">
 					<div id="empty">
 						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="http://www.usoftchina.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
 							<a href="#/index" title="B2B商务首页">B2B 商务</a>
 						</div>
 						<div class="right_link">

src/main/webapp/resources/tpl/register/licenseView.html

@@ -4,7 +4,7 @@
     </div>
 	<div class="modal-body" style="position:relative; height:400px; overflow:auto">
 		<p>优软商城依据以下条件和条款为您提供所享有的服务，请仔细阅读并遵守。</p>
-		<p>&nbsp;&nbsp;欢迎阅读优软商城服务条款（下称“本协议”）, 本协议阐述之条款和条件适用于您使用优软商城（http://www.ubtob.com）, 所提供的在全球企业间(B-TO-B)电子市场(e-market)中进行贸易和交流的各种工具和服务(下称“服务”)。</p>
+		<p>&nbsp;&nbsp;欢迎阅读优软商城服务条款（下称“本协议”）, 本协议阐述之条款和条件适用于您使用优软商城（http://www.usoftchina.com）, 所提供的在全球企业间(B-TO-B)电子市场(e-market)中进行贸易和交流的各种工具和服务(下称“服务”)。</p>
 		<b>一、接受条款 </b>
 		<p>1、本协议内容包括协议正文及所有优软商城已经发布或将来可能发布的各类规则。所有规则为协议不可分割的一部分，与协议正文具有同等法律效力。 </p>
 		<p>2、以任何方式进入优软商城并使用服务即表示您已充分阅读、理解并同意接受本协议的条款和条件(以下合称“条款”)。 </p>

src/main/webapp/resources/tpl/start/index.html

@@ -104,7 +104,7 @@
                 <p><span><i class="fa fa-envelope-o"></i> serve@usoftchina.com</span></p>
             </div>
             <div class="col-sm-2" style="float: right;">
-                <a href="http://www.ubtob.com" class="back-home">返回优软云</a>
+                <a href="http://www.usoftchina.com" class="back-home">返回优软云</a>
             </div>
         </div>
     </div>