Merge branch 'dev-mysql' into yc-imReplace-0420

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -75,6 +75,21 @@ public class Enterprise implements Serializable {
 	 */
 	@Column(name = "en_fax")
 	private String enFax;
+	/**
+	 * 手机
+	 */
+	@Column(name = "en_phone")
+	private String enPhone;
+	/**
+	 * 微信
+	 */
+	@Column(name = "en_weixin")
+	private String enWeixin;
+	/**
+	 * QQ
+	 */
+	@Column(name = "en_qq")
+	private String enQQ;
 	/**
 	 * 公司邮箱
 	 */
@@ -360,6 +375,30 @@ public class Enterprise implements Serializable {
 		this.enValidCode = enValidCode;
 	}
 
+	public String getEnPhone() {
+		return enPhone;
+	}
+
+	public void setEnPhone(String enPhone) {
+		this.enPhone = enPhone;
+	}
+
+	public String getEnWeixin() {
+		return enWeixin;
+	}
+
+	public void setEnWeixin(String enWeixin) {
+		this.enWeixin = enWeixin;
+	}
+
+	public String getEnQQ() {
+		return enQQ;
+	}
+
+	public void setEnQQ(String enQQ) {
+		this.enQQ = enQQ;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

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

@@ -9,6 +9,7 @@ import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
+import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserSpaceView;
 import org.apache.commons.collections.CollectionUtils;
@@ -52,6 +53,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         if (enterprise == null || enterprise.getUu() == null) {
             enterprise = new Enterprise();
         }
+        if (!StringUtils.isEmpty(userSpaceView.getAccessSecret())) {
+            enterprise.setAccessSecret(userSpaceView.getAccessSecret());
+        }
         enterprise.setEnAddress(userSpaceView.getRegAddress());
         //enterprise.setEnArea(userSpaceView.get());
         enterprise.setEnCorporation(userSpaceView.getCorporation());

src/main/java/com/uas/platform/b2c/logistics/model/DistributionRule.java

@@ -89,7 +89,7 @@ public class DistributionRule {
 
 	/**
 	 * 计费方式
-	 * 1-统一规定运费，2-按总金额计算, 3-到付，到付设置为统一运费0
+	 * 1-统一规定运费，2-按总金额计算, 3-到付，到付设置为统一运费0, 4-包邮，到付设置为统一运费0
 	 */
 	@Column(name = "rule_fare_type")
 	private Short fareType;

src/main/java/com/uas/platform/b2c/logistics/service/impl/DistributionRuleServiceImpl.java

@@ -144,6 +144,9 @@ public class DistributionRuleServiceImpl implements DistributionRuleService{
 				}
 			}
 		}
+		if (rule.getFareType() == 4) {
+			rule.setUniformPrice((double) 0);
+		}
 		distributionRuleDao.save(rule);
 		return ResultMap.success(null);
 	}
@@ -438,7 +441,7 @@ public class DistributionRuleServiceImpl implements DistributionRuleService{
 	 */
 	public Double getFareOfRule(DistributionRule rule, Double price){
 		Double needFare = null;
-		if (rule.getFareType() == 1 || rule.getFareType() == 3){
+		if (rule.getFareType() == 1 || rule.getFareType() == 3 || rule.getFareType() == 4){
 			needFare = rule.getUniformPrice();
 		}else {
 			if (CollectionUtils.isEmpty(rule.getFares())){

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreInFacadeImpl.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2c.prod.store.facade.impl;
 
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.facade.StoreInFacade;
 import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
@@ -33,11 +35,14 @@ public class StoreInFacadeImpl implements StoreInFacade {
 
 	private final QualificationService qualificationService;
 
+	private final EnterpriseDao enterpriseDao;
+
 	@Autowired
-	public StoreInFacadeImpl(StoreInDao storeInDao, StoreInService storeInService, QualificationService qualificationService) {
+	public StoreInFacadeImpl(StoreInDao storeInDao, StoreInService storeInService, QualificationService qualificationService, EnterpriseDao enterpriseDao) {
 		this.storeInDao = storeInDao;
 		this.storeInService = storeInService;
 		this.qualificationService = qualificationService;
+		this.enterpriseDao = enterpriseDao;
 	}
 
 	@Override
@@ -56,7 +61,8 @@ public class StoreInFacadeImpl implements StoreInFacade {
 		if (store == null) {
 			return new ResultMap(CodeType.ERROR_STATE, String.format("编号%s对应的店铺不存在", uuid));
 		}
-
+		store.setEnterpriseJson(newStoreInfo.getEnterpriseJson());
+		store.setEnterprise(newStoreInfo.getEnterprise());
 		ResultMap resultMap = setStoreInfoByKind(store, newStoreInfo, kind);
 		if (resultMap != null) {
 			return resultMap;
@@ -75,8 +81,23 @@ public class StoreInFacadeImpl implements StoreInFacade {
 			}
 		}
 		store.setQualifications(qualifications);
-
-		store = storeInDao.save(store);
+        Enterprise enterprise = enterpriseDao.findByUu(newStoreInfo.getEnterprise().getUu());
+        enterprise.setEnName(newStoreInfo.getEnterprise().getEnName());
+        enterprise.setEnShortname(newStoreInfo.getEnterprise().getEnShortname());
+        enterprise.setEnType(newStoreInfo.getEnterprise().getEnType());
+        enterprise.setEnAddress(newStoreInfo.getEnterprise().getEnAddress());
+        enterprise.setEnTel(newStoreInfo.getEnterprise().getEnTel());
+        enterprise.setEnFax(newStoreInfo.getEnterprise().getEnFax());
+        enterprise.setEnEmail(newStoreInfo.getEnterprise().getEnEmail());
+        enterprise.setEnBussinessCode(newStoreInfo.getEnterprise().getEnBusinessCode());
+        enterprise.setEnUrl(newStoreInfo.getEnterprise().getEnUrl());
+        enterprise.setEnPhone(newStoreInfo.getEnterprise().getEnPhone());
+        enterprise.setEnWeixin(newStoreInfo.getEnterprise().getEnWeixin());
+        enterprise.setEnQQ(newStoreInfo.getEnterprise().getEnQQ());
+        enterprise.setEnLogoUrl(newStoreInfo.getEnterprise().getEnLogoUrl());
+        enterprise.setEnDate(newStoreInfo.getEnterprise().getEnDate());
+        enterpriseDao.save(enterprise);
+        store = storeInDao.save(store);
 		return ResultMap.success(store);
 	}
 

src/main/java/com/uas/platform/b2c/prod/store/model/EnterpriseSimple.java

@@ -70,6 +70,19 @@ public class EnterpriseSimple {
 	 */
 	private String enUrl;
 
+	/**
+	 * 手机
+	 */
+	private String enPhone;
+	/**
+	 * 微信
+	 */
+	private String enWeixin;
+	/**
+	 * QQ
+	 */
+	private String enQQ;
+
 	/**
 	 * Logo
 	 */
@@ -187,6 +200,30 @@ public class EnterpriseSimple {
 		this.enLogoUrl = enLogoUrl;
 	}
 
+	public String getEnPhone() {
+		return enPhone;
+	}
+
+	public void setEnPhone(String enPhone) {
+		this.enPhone = enPhone;
+	}
+
+	public String getEnWeixin() {
+		return enWeixin;
+	}
+
+	public void setEnWeixin(String enWeixin) {
+		this.enWeixin = enWeixin;
+	}
+
+	public String getEnQQ() {
+		return enQQ;
+	}
+
+	public void setEnQQ(String enQQ) {
+		this.enQQ = enQQ;
+	}
+
 	public static EnterpriseSimple translateSimple(Enterprise enterprise) {
 		EnterpriseSimple simple = new EnterpriseSimple();
 		simple.uu = enterprise.getUu();
@@ -202,6 +239,9 @@ public class EnterpriseSimple {
 		simple.enUrl = enterprise.getEnUrl();
 		simple.enLogoUrl = enterprise.getEnLogoUrl();
 		simple.enEmail = StringUtils.isEmpty(enterprise.getEnEmail()) ? " " : enterprise.getEnEmail();
+		simple.enPhone = enterprise.getEnPhone();
+		simple.enWeixin = enterprise.getEnWeixin();
+		simple.enQQ = enterprise.getEnQQ();
 		return simple;
 	}
 

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

@@ -244,12 +244,16 @@ define(['app/app'], function(app) {
 		 * 计算运费和店铺费用合计
 		 */
 		$scope.calculateFare = function () {
-			var fare = 0;
-			angular.forEach($scope.fareList, function (v) {
+            var fare = 0;
+            angular.forEach($scope.fareList, function (v) {
 				fare = NumberService.add(v, fare);
 			});
-			$scope.order.ensurePrice = NumberService.add($scope.order.totalprice, fare);
-		};
+            $scope.order.ensurePrice = NumberService.add($scope.order.totalprice, fare);
+            if ($scope.deliveryList[$scope.order.storeid].fareType == 4) {
+                $scope.order.ensurePrice = $scope.order.ensurePrice - $scope.deliveryList[$scope.order.storeid].fare;
+                $scope.deliveryList[$scope.order.storeid].fare = 0;
+            }
+        };
 
 
 		/**

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

@@ -75,6 +75,11 @@ define(['app/app'], function (app) {
 			$scope.sampleStore.storeShortName = $scope.storeInfo.storeShortName;
             $scope.sampleStore.storeName = $scope.storeInfo.storeName;
 			$scope.sampleStore.description = $scope.storeInfo.description;
+
+            $scope.sampleStore.enPhone = '';
+            $scope.sampleStore.enWeixin = '';
+            $scope.sampleStore.enQQ = '';
+
 			$scope.sampleStore.enterprise = angular.copy($scope.storeInfo.enterprise);
 			$scope.sampleStore.enterprise.address = $scope.sampleStore.enterprise.address || $scope.storeInfo.enterprise.enAddress;
 			qulifications = angular.copy($scope.storeInfo.qualifications);
@@ -205,10 +210,49 @@ define(['app/app'], function (app) {
 			});
 		};
 
+        /**
+		 * 验证手机号
+         */
+		$scope.checkPhone = function () {
+            var enPhone = angular.element('.enPhone').val();
+            if (!/^1[3|4|5|6|7|8|9][0-9]{9}$/.test(enPhone) && enPhone) {
+                toaster.pop('error', '请输入正确的手机号码');
+                return false;
+            }
+
+        }
+
+        /**
+         * 验证微信号
+         */
+        $scope.checkWeixin = function () {
+            var enWeixin = angular.element('.enWeixin').val();
+            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+                toaster.pop('error', '请输入正确的微信号');
+                return false;
+            }
+
+        }
+
+        /**
+         * 验证QQ号
+         */
+        $scope.checkQQ = function () {
+            var enQQ = angular.element('.enQQ').val();
+            if (!/^[1-9][0-9]{4,10}$/.test(enQQ) && enQQ) {
+                toaster.pop('error', '请输入正确的QQ号');
+                return false;
+            }
+
+        }
+
 		/**
 		 * 验证修改的基础信息
 		 */
 		var validateBasicInfo = function () {
+            var enPhone = angular.element('.enPhone').val();
+            var enWeixin = angular.element('.enWeixin').val();
+            var enQQ = angular.element('.enQQ').val();
 			if (!$scope.sampleStore) {
 				toaster.pop('error', '店铺信息不能为空');
 				return false;
@@ -233,6 +277,21 @@ define(['app/app'], function (app) {
 				toaster.pop('error', '请输入正确的电话号码');
 				return false;
 			}
+
+
+            if (!/^1[3|4|5|6|7|8|9][0-9]{9}$/.test(enPhone) && enPhone) {
+                toaster.pop('error', '请输入正确的手机号码');
+                return false;
+            }
+
+            if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(enWeixin) && enWeixin) {
+                toaster.pop('error', '请输入正确的微信号');
+                return false;
+            }
+            if (!/^[1-9][0-9]{4,10}$/.test(enQQ) && enQQ) {
+                toaster.pop('error', '请输入正确的QQ号');
+                return false;
+            }
 			/*if (!$scope.sampleStore.enterprise.enFax || $scope.sampleStore.enterprise.enFax == '') {
 				toaster.pop('error', '请输入正确的企业传真');
 				return false;

src/main/webapp/resources/view/common/store_header.html

@@ -330,6 +330,15 @@
 							<li ng-if="storeInfo.enterprise.enFax.length > 0">
 								<span>传真：</span><span ng-bind="storeInfo.enterprise.enFax"></span>
 							</li>
+							<li ng-if="storeInfo.enterprise.enPhone.length > 0">
+								<span>手机：</span><span ng-bind="storeInfo.enterprise.enPhone"></span>
+							</li>
+							<li ng-if="storeInfo.enterprise.enWeixin.length > 0">
+								<span>微信：</span><span ng-bind="storeInfo.enterprise.enWeixin"></span>
+							</li>
+							<li ng-if="storeInfo.enterprise.enQQ.length > 0">
+								<span>QQ：</span><span ng-bind="storeInfo.enterprise.enQQ"></span>
+							</li>
 							<li ng-if="storeInfo.enterprise.enAddress.length > 0">
 								<span>地址：</span><span ng-bind="storeInfo.enterprise.enAddress"></span>
 							</li>

src/main/webapp/resources/view/store/default/contact.html

@@ -22,10 +22,13 @@
 		<div ng-if="storeInfo.enterprise">
 			<div class="contact-text">
 				<div ng-bind="storeInfo.enterprise.enName">深圳市华商龙商务互联科技有限公司</div>
-				<div ng-if="storeInfo.enterprise.enAddress.length >0">地址：<span ng-bind="storeInfo.enterprise.enAddress">深圳市南山区科技园科技南五路英唐大厦一楼</span></div>
 				<div ng-if="storeInfo.enterprise.enTel.length >0">电话：<span ng-bind="storeInfo.enterprise.enTel">0755-26038000/26038047/26038008/86140880</span></div>
-				<div ng-if="storeInfo.enterprise.enFax.length > 0">传真：<span ng-bind="storeInfo.enterprise.enFax">0755-26038111</span></div>
-			</div>
+                <div ng-if="storeInfo.enterprise.enFax.length > 0">传真：<span ng-bind="storeInfo.enterprise.enFax">0755-26038111</span></div>
+                <div ng-if="storeInfo.enterprise.enPhone.length > 0">手机：<span ng-bind="storeInfo.enterprise.enPhone"></span></div>
+                <div ng-if="storeInfo.enterprise.enWeixin.length > 0">微信：<span ng-bind="storeInfo.enterprise.enWeixin"></span></div>
+                <div ng-if="storeInfo.enterprise.enQQ.length > 0">QQ：<span ng-bind="storeInfo.enterprise.enQQ"></span></div>
+                <div ng-if="storeInfo.enterprise.enAddress.length >0">地址：<span ng-bind="storeInfo.enterprise.enAddress">深圳市南山区科技园科技南五路英唐大厦一楼</span></div>
+            </div>
 		</div>
 	</div>
 </div>

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

@@ -848,16 +848,20 @@
 							<span class="total-price">
 								<p><strong>运费：</strong>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
-									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType != 3" ng-bind="fareList[details[0].storeid] | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
+									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 4" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3) " style="font-weight: bold;color:#e64040"></em>
+									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType != 3 && deliveryList[details[0].storeid].fareType != 4" ng-bind="fareList[details[0].storeid] | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
 									<em ng-if="order.status!=501">
-										<em ng-if="!deliveryList && rule.fareType != 3" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
+										<em ng-if="!deliveryList && rule.fareType != 3 && rule.fareType != 4" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
 										<em ng-if="!deliveryList && rule.fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
-										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType != 3" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
+										<em ng-if="!deliveryList && rule.fareType == 4" style="font-weight: bold;color:#e64040">包邮</em>
+										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType != 3 && deliveryList[details[0].storeid].fareType != 4" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
 										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
+										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType == 4" style="font-weight: bold;color:#e64040">包邮</em>
 									</em>
 								</p>
 								<p><strong>店铺合计：</strong>
 									<em ng-if="order.status==501" ng-bind="storePrice[key] + fareList[details[0].storeid] | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
+
 									<em ng-if="order.status!=501" style="font-weight: bold">
 										<em ng-if="storeArray.length == 1" ng-bind="order.ensurePrice | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 										<em ng-if="storeArray.length != 1" ng-bind="storePrice[key] + deliveryList[details[0].storeid].fare | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
@@ -906,7 +910,10 @@
 					</div>
 					<dd class="pay_price">
 						<div>
-							<h4>总计:<em ng-bind="order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3) "></em></h4>
+							<h4>总计:
+								<em ng-bind="order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3) "></em>
+
+							</h4>
 							<h6 ng-if="payment.address.area"><strong>地址：</strong>{{formatArea}} {{payment.address.detailAddress}}</h6>
 							<h6 ng-if="payment.address.tel"><strong>收货人：</strong>{{payment.address.tel}}&nbsp;&nbsp;{{payment.address.name}}（收）</h6>
 						</div>

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

@@ -712,6 +712,11 @@
 						<label for="style03"></label>
 						到付
 					</label>
+					<label class="check-act" ng-click="checkTab(4)">
+						<input type="radio" id="style04" name="radio2" ng-checked="modifyRule.fareType==4"/>
+						<label for="style04"></label>
+						包邮
+					</label>
 				</div>
 				<!--统一规定运费-->
 				<div class="style-regulations common-style" ng-if="modifyRule.fareType==1">

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

@@ -737,6 +737,30 @@
 					<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
 				</div>
 			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>手&nbsp;&nbsp;&nbsp;&nbsp;机</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control enPhone" style="border-radius: inherit;" title="enPhone" ng-pattern="/^1[3|4|5|6|7|8|9][0-9]{9}$/" ng-blur="checkPhone()" ng-model="sampleStore.enterprise.enPhone" maxlength="11"/>
+				</div>
+			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>微&nbsp;&nbsp;&nbsp;&nbsp;信</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control enWeixin" style="border-radius: inherit;" title="enWeixin" ng-pattern="/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/" ng-blur="checkWeixin()" ng-model="sampleStore.enterprise.enWeixin"/>
+				</div>
+			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>Q&nbsp;&nbsp;&nbsp;&nbsp;Q</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control enQQ" style="border-radius: inherit;" title="enQQ" ng-pattern="/^[1-9][0-9]{4,10}$/" ng-blur="checkQQ()" ng-model="sampleStore.enterprise.enQQ" maxlength="11"/>
+				</div>
+			</div>
 		</div><!-- 店铺基础信息输入 end -->
 		<!-- 店铺基础信息展示 start -->
 		<div style="margin-bottom: 20px;" ng-if="!editBasicInfo" class="width120">
@@ -820,6 +844,36 @@
 					</div>
 				</div>
 			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>手&nbsp;&nbsp;&nbsp;&nbsp;机</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enPhone || '暂无信息'}}
+					</div>
+				</div>
+			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>微&nbsp;&nbsp;&nbsp;&nbsp;信</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enWeixin || '暂无信息'}}
+					</div>
+				</div>
+			</div>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>Q&nbsp;&nbsp;&nbsp;&nbsp;Q</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enQQ || '暂无信息'}}
+					</div>
+				</div>
+			</div>
 		</div><!-- 店铺基础信息展示 end -->
 	</div>
 	<!-- 资质证明输入 start -->