Merge remote-tracking branch 'origin/feature-storeapply-201814' into dev

src/main/java/com/uas/platform/b2c/b2b/controller/ManageController.java

@@ -1,103 +0,0 @@
-package com.uas.platform.b2c.b2b.controller;
-
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
-import com.uas.platform.b2c.b2b.service.EnterpriseBaseInfoService;
-import com.uas.platform.b2c.common.base.model.AccessToken;
-import com.uas.platform.b2c.common.base.service.AccessTokenService;
-import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.rmi.AccessException;
-import java.util.Arrays;
-
-/**
- * b2b操作
- *
- * Created by hejq on 2018-04-20.
- */
-@RequestMapping("/b2b/manage")
-@RestController
-public class ManageController {
-
-    @Autowired
-    private AccessTokenService accessTokenService;
-
-    @Autowired
-    private SysConf sysConf;
-
-    @Autowired
-    private EnterpriseBaseInfoService baseInfoService;
-
-    /**
-     * 操作日志
-     */
-    private UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
-    /**
-     * 定义可以访问的公司
-     */
-    private static final Long[] ACCESS_ENUU = {1000001L, 10044948L, 10042291L, 10042875L, 10043923L, 10041166L};
-
-    /**
-     * 通过UU号进行跳转到平台
-     *
-     * @param response HttpServletResponse
-     * @param enUU uu号
-     * @throws IOException
-     */
-    @RequestMapping("/authed/redirect/{enUU}")
-    public void redirect(HttpServletResponse response, HttpServletRequest request, @PathVariable("enUU") long enUU)
-            throws IOException {
-        Object bindObj = enUU;
-        if (null == SystemSession.getUser() || null == SystemSession.getUser().getEnterprise()) {
-            throw new AccessException("请先登录");
-        }
-        if (!Arrays.asList(ACCESS_ENUU).contains(SystemSession.getUser().getEnterprise().getUu())) {
-            throw new AccessException("没有访问权限");
-        }
-        AccessToken token = accessTokenService.createNew(bindObj);
-        request.getSession().setAttribute("user", SystemSession.getUser());
-        StringBuffer redirectUrl = new StringBuffer();
-        String domain = sysConf.getB2bDomain();
-        if (StringUtils.hasText(domain)) {
-            // 防止使用同一个www.ubtob.com造成session冲突
-            redirectUrl.append("http://").append(enUU).append(".").append(domain);
-        } else {
-            redirectUrl.append(sysConf.getB2bUrl());
-        }
-        redirectUrl.append("?client_type=manage&access_token=").append(token.getId());
-        logger.log("管理员访问B2B", "通过商务平台后台访问B2B");
-        response.sendRedirect(redirectUrl.toString());
-    }
-
-    /**
-     * 分页查询B2B注册信息
-     *
-     * @param params 分页参数
-     * @param keyword 关键词
-     * @return
-     */
-    @RequestMapping(value = "/enterpriseList", method = RequestMethod.GET)
-    @ApiOperation(value = "分页获取平台所有注册企业信息", httpMethod = "GET")
-    public Page<EnterpriseBaseInfo> findEnterPageByStatus(@ApiParam(required = true, value = "分页参数") PageParams params, @ApiParam(required = true, value = "搜索字符串") String keyword) {
-        PageInfo info = new PageInfo(params);
-        logger.log("管理平台获取企业列表", "通过[" + keyword + "]获取企业信息");
-        return baseInfoService.findEnterPageByKeyword(info, keyword);
-    }
-}

src/main/java/com/uas/platform/b2c/b2b/dao/EnterpriseBaseInfoDao.java

@@ -1,15 +0,0 @@
-package com.uas.platform.b2c.b2b.dao;
-
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-/**
- * 企业基本信息
- *
- * Created by hejq on 2018-04-20.
- */
-@Repository
-public interface EnterpriseBaseInfoDao extends JpaRepository<EnterpriseBaseInfo, Long>, JpaSpecificationExecutor<EnterpriseBaseInfo> {
-}

src/main/java/com/uas/platform/b2c/b2b/model/EnterpriseBaseInfo.java

@@ -1,105 +0,0 @@
-package com.uas.platform.b2c.b2b.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 企业信息基本信息
- *
- * Created by hejq on 2018-04-20.
- */
-@Entity
-@Table(name = "sec$enterprises")
-public class EnterpriseBaseInfo implements Serializable {
-
-    /**
-     * 序列号
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 企业UU号
-     */
-    @Id
-    @Column(name = "en_uu")
-    private Long uu;
-
-    /**
-     * 公司名称
-     */
-    @Column(name = "en_name")
-    private String enName;
-
-    /**
-     * 注册地址
-     */
-    @Column(name = "en_address")
-    private String enAddress;
-
-    /**
-     * 商业登记证号
-     */
-    @Column(name = "en_businesscode")
-    private String enBussinessCode;
-
-    /**
-     * 注册时间
-     */
-    @Column(name = "en_time")
-    private Date enDate;
-
-    public Long getUu() {
-        return uu;
-    }
-
-    public void setUu(Long uu) {
-        this.uu = uu;
-    }
-
-    public String getEnName() {
-        return enName;
-    }
-
-    public void setEnName(String enName) {
-        this.enName = enName;
-    }
-
-    public String getEnAddress() {
-        return enAddress;
-    }
-
-    public void setEnAddress(String enAddress) {
-        this.enAddress = enAddress;
-    }
-
-    public String getEnBussinessCode() {
-        return enBussinessCode;
-    }
-
-    public void setEnBussinessCode(String enBussinessCode) {
-        this.enBussinessCode = enBussinessCode;
-    }
-
-    public Date getEnDate() {
-        return enDate;
-    }
-
-    public void setEnDate(Date enDate) {
-        this.enDate = enDate;
-    }
-
-    @Override
-    public String toString() {
-        return "EnterpriseBaseInfo{" +
-                "uu=" + uu +
-                ", enName='" + enName + '\'' +
-                ", enAddress='" + enAddress + '\'' +
-                ", enBussinessCode='" + enBussinessCode + '\'' +
-                ", enDate=" + enDate +
-                '}';
-    }
-}

src/main/java/com/uas/platform/b2c/b2b/service/EnterpriseBaseInfoService.java

@@ -1,22 +0,0 @@
-package com.uas.platform.b2c.b2b.service;
-
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
-import com.uas.platform.core.model.PageInfo;
-import org.springframework.data.domain.Page;
-
-/**
- * 企业基本信息操作接口
- *
- * Created by hejq on 2018-04-20.
- */
-public interface EnterpriseBaseInfoService {
-
-    /**
-     * 分页查询企业信息
-     *
-     * @param info 分页参数
-     * @param keyword 关键字
-     * @return
-     */
-    Page<EnterpriseBaseInfo> findEnterPageByKeyword(PageInfo info, String keyword);
-}

src/main/java/com/uas/platform/b2c/b2b/service/impl/EnterpriseBaseInfoServiceImpl.java

@@ -1,63 +0,0 @@
-package com.uas.platform.b2c.b2b.service.impl;
-
-import com.uas.platform.b2c.b2b.dao.EnterpriseBaseInfoDao;
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
-import com.uas.platform.b2c.b2b.service.EnterpriseBaseInfoService;
-import com.uas.platform.b2c.fa.payment.utils.StringUtils;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.persistence.criteria.PredicateUtils;
-import com.uas.platform.core.persistence.criteria.SimpleExpression;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-/**
- * 企业基本信息操作实现
- *
- * Created by hejq on 2018-04-20.
- */
-@Service
-public class EnterpriseBaseInfoServiceImpl implements EnterpriseBaseInfoService {
-
-    @Autowired
-    private EnterpriseBaseInfoDao baseInfoDao;
-
-    /**
-     * UU号正则表达式
-     */
-    static final String UU_REGEXP = "^\\d{4,}$";
-
-    /**
-     * 分页查询企业信息
-     *
-     * @param info    分页参数
-     * @param keyword 关键字
-     * @return
-     */
-    @Override
-    public Page<EnterpriseBaseInfo> findEnterPageByKeyword(final PageInfo info, String keyword) {
-        if (!StringUtils.isEmpty(keyword)) {
-            SimpleExpression name = PredicateUtils.like("enName", keyword, false);
-            if (keyword.matches(UU_REGEXP)) {
-                SimpleExpression enUU = PredicateUtils.eq("uu", keyword, false);
-                SimpleExpression[] expressions = new SimpleExpression[]{name, enUU};
-                info.expression(PredicateUtils.or(expressions));
-            } else {
-                SimpleExpression[] expressions = new SimpleExpression[]{name};
-                info.expression(PredicateUtils.or(expressions));
-            }
-        }
-        return baseInfoDao.findAll(new Specification<EnterpriseBaseInfo>() {
-            public Predicate toPredicate(Root<EnterpriseBaseInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                query.where(info.getPredicates(root, query, builder));
-                return null;
-            }
-        }, info);
-    }
-}

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

@@ -54,7 +54,7 @@ public class AuthenticationController {
 				user.setIssys(Constant.NO);
 			}
 		}
-		request.getSession().setAttribute("user",user);
+		request.getSession().setAttribute("user", user);
 		UserInfo userInfo = new UserInfo(user);
 		Integer hasQuestion = user.getHasQuestion();
 		if (hasQuestion != null && hasQuestion ==1) {
@@ -82,7 +82,7 @@ public class AuthenticationController {
 			return null;
 		}
 		User user = userService.findUserByUserUU(SystemSession.getUser().getUserUU());
-		request.getSession().setAttribute("user",user);
+		request.getSession().setAttribute("user", user);
 		return new UserInfo(user);
 	}
 
@@ -94,6 +94,7 @@ public class AuthenticationController {
 	@RequestMapping(value = "/{enUU}")
 	@ResponseBody
 	public void switchEnterprise(@PathVariable("enUU") long enUU, HttpServletRequest request) {
+		userService.saveLoginTime(enUU);
 		User user = userService.switchEnterprise(enUU);
 		request.getSession().setAttribute("user", user);
 	}

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

@@ -217,7 +217,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 
 	@Override
 	public ResultMap registerEnterprise(FormEnterprise enterprise, String filePath, User user) {
-		//封装注册时的个人账户信息;
+		// 封装注册时的个人账户信息;
 		if (user == null) {
 			throw new RuntimeException("登录异常:用户不存在!");
 		}
@@ -234,7 +234,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		if (imid != null) {
 			userView.setImId(imid.toString());
 		}
-		//封装注册企业信息;
+		// 封装注册企业信息;
 		detail.setSpaceName(enterprise.getName());
 		detail.setCorporation(enterprise.getLawPerson());
 		detail.setAdmin(userView);
@@ -259,8 +259,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		try {
 			JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
 			String userSpa = data.toJSONString();
-			// 调用账户中心的接口注册企业
-			detail = AccountUtils.register(detail, userView);
+			// 调用账户中心的接口注册企业，账户中心不会回调保存，需要我们自己保存，以实现同步
+			detail = AccountUtils.register(detail, userView, false);
+			// 自己保存企业到商城数据库
 			v2EnterpriserService.update(detail);
 		} catch (Exception e) {
 			return new ResultMap(CodeType.SYSTEM_ERROR, e.getMessage());

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

@@ -45,7 +45,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 
     @Override
-    public synchronized Enterprise update(UserSpaceView userSpaceView) {
+    public Enterprise update(UserSpaceView userSpaceView) {
       /*  List<User> admins = userDao.findUserByUserUU(userSpaceView.getAdminUU());
         if (admins.size() != 1) {
             logger.log("更新企业信息出错，管理员有且仅有一个", "当前管理员数量:" + admins.size());

src/main/webapp/WEB-INF/views/normal/user_center-0321.html

@@ -1,95 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh-CN">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-<meta name="renderer" content="webkit">
-<title>买家中心-优软商城</title>
-<meta name="description" content="优软商城，电子元器件搜索引擎" />
-<meta name="keywords"
-	content="优软商城，B2B，B2C，行业门户，网上贸易，电子商务，网上贸易，网上交易，交易市场，在线交易，供求信息，采购，求购信息，供应信息" />
-<link href="static/img/all/u.png" rel="icon" type="image/x-icon" />
-<link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
-<link rel="stylesheet"
-	href="static/lib/fontawesome/css/font-awesome.min.css" />
-<link rel="stylesheet"
-	href="static/lib/jquery/themes/summernote/css/summernote.css" />
-<link rel="stylesheet" href="static/lib/iconfont/css/iconfont.css" />
-<link rel="stylesheet"
-	href="static/lib/jquery/themes/uploadify/uploadify.css" />
-<link rel="stylesheet" href="static/lib/angular/toaster.css" />
-<link rel="stylesheet" href="static/css/common.css" />
-<link rel="stylesheet" href="static/css/usercenter.css" />
-
-</head>
-<body>
-	<!-- 消息提示框  Start-->
-	<toaster-container
-		toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>
-	<!-- 消息提示框 End -->
-	<!-- Loading Start -->
-	<div id="loading" class="loading">
-		<i></i>
-	</div>
-	<!-- Loading End -->
-
-	<!-- header 标题Logo和搜索框 Start -->
-	<div ng-include src="'static/view/common/header.html'"></div>
-	<!-- header 标题Logo和搜索框 End -->
-	<!-- navigation 导航栏 Start -->
-	<div ng-include src="'static/view/common/nav.html'"></div>
-	<!-- navigation 导航栏  End -->
-
-	<!-- Start -->
-	<div class="main-panel" id="main">
-		<div class="container">
-			<!-- 左侧导航栏 Start -->
-			<div class="left">
-				<div ng-include src="'static/view/usercenter/left.html'"></div>
-			</div>
-			<!-- 左侧导航栏 End -->
-			<!-- 核心内容 Start -->
-			<div class="right">
-				<div ui-view></div>
-			</div>
-			<!-- 核心内容 End -->
-		</div>
-	</div>
-	<!-- End -->
-	<!-- 页脚 Start -->
-	<div ng-include src="'static/view/common/footer.html'"></div>
-	<!-- 页脚 End -->
-
-	<!-- 侧边栏Start -->
-	<div ng-include src="'static/view/common/sidebar.html'"></div>
-	<!-- 侧边栏End -->
-
-	<script type="text/javascript" src="static/lib/require.js"
-		data-main="static/js/usercenter/main.js"></script>
-	<script type="text/ng-template" id="offer/image/insert.html">
-		<div class="modal-header">
-			<button type="button" class="close" ng-click="close()">×</button>
-			<h4 class="modal-title">插入图片</h4>
-		</div>
-		<div class="modal-body">
-			<div class="row">
-				<div class="col-xs-7" style="padding: 20px;">
-					<p class="help-block">提示：选择的图片单张大小不超过3MB，支持jpg,jpeg,gif,bmp,png</p>
-					<div class="upload-container" ng-disabled="getImages().length == images.length">
-						<div id="uploadify" on-success="onUploadSuccess($data)" uploadify="{buttonText:'选择图片'}"></div>
-					</div>
-				</div>
-				<div class="col-xs-5">
-					<h3>预览</h3>
-					<div class="image-content">
-						<img ng-src="{{image.src}}" class="img-thumbnail" style="width: 100px; height: 100px;">
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<div class="pull-right"><a ng-click="confirm()" class="btn btn-primary" ng-disabled="!image.src">确定</a></div>
-		</div>
-	</script>
-</body>
-</html>

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

@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh-CN">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-<meta name="renderer" content="webkit">
-<title>卖家中心-优软商城</title>
-<meta name="description" content="优软商城，电子元器件搜索引擎" />
-<meta name="keywords"
-	content="优软商城，B2B，B2C，行业门户，网上贸易，电子商务，网上贸易，网上交易，交易市场，在线交易，供求信息，采购，求购信息，供应信息" />
-<link href="static/img/all/u.png" rel="icon" type="image/x-icon" />
-<link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
-<link rel="stylesheet" href="static/lib/angular/ng-table.css" />
-<link rel="stylesheet"
-	href="static/lib/fontawesome/css/font-awesome.min.css" />
-<link rel="stylesheet" href="static/lib/iconfont/css/iconfont.css" />
-<link rel="stylesheet" href="static/lib/angular/toaster.css" />
-<link rel="stylesheet" href="static/css/common.css" />
-<link rel="stylesheet" href="static/css/vendor.css" />
-</head>
-<body>
-	<!-- 消息提示框  Start-->
-	<toaster-container
-		toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>
-	<!-- 消息提示框 End -->
-	<!-- Loading Start -->
-	<div id="loading" class="loading">
-		<i></i>
-	</div>
-	<!-- Loading End -->
-
-	<!-- header 标题Logo和搜索框 Start -->
-	<div ng-include src="'static/view/common/header.html'"></div>
-	<!-- header 标题Logo和搜索框 End -->
-
-	<!-- navigation 导航栏 Start -->
-	<div ng-include src="'static/view/common/nav.html'"></div>
-	<!-- navigation 导航栏  End -->
-
-	<!-- 主体内容 Start -->
-	<div class="main-panel" id="main">
-		<div class="container">
-			<!-- 左侧导航栏 Start -->
-			<div class="left">
-				<div ng-include src="'static/view/vendor/left.html'"></div>
-			</div>
-			<!-- 左侧导航栏 End -->
-			<!-- 核心内容 Start -->
-			<div class="right">
-				<div ui-view></div>
-			</div>
-			<!-- 核心内容 End -->
-		</div>
-	</div>
-	<!-- 主体内容 End -->
-
-	<!-- 页脚 Start -->
-	<div ng-include src="'static/view/common/footer.html'"></div>
-	<!-- 页脚 End -->
-
-	<!-- 侧边栏Start -->
-	<div ng-include src="'static/view/common/sidebar.html'"></div>
-	<!-- 侧边栏End -->
-
-	<script type="text/javascript" src="static/lib/require.js"
-		data-main="static/js/vendor/main.js"></script>
-</body>
-</html>