Merge branch 'dev-mysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/common/base/service/impl/RestMailServiceImpl.java

@@ -0,0 +1,152 @@
+package com.uas.platform.b2c.common.base.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.message.common.domain.MapMessage;
+import com.uas.message.common.domain.Page;
+import com.uas.message.mail.domain.MailLog;
+import com.uas.message.mail.service.MailService;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 基于RestTemplate实现的邮件发送接口
+ * @author suntg
+ * @since 2017年10月20日15:12:47
+ */
+@Service
+public class RestMailServiceImpl implements MailService {
+
+    private RestTemplate restTemplate;
+
+    /**
+     * 邮件服务主机地址
+     */
+    private static final String MAIL_CONSOLE_HOST = "http://10.10.100.23:28029/";
+
+    /**
+     * 发送邮件给单个人url
+     */
+    private static final String MAIL_SEND_URL = MAIL_CONSOLE_HOST  + "mail/send";
+
+    /**
+     * 发送邮件给多个人 url
+     */
+    private static final String MAIL_SEND_MANY_URL = MAIL_CONSOLE_HOST + "mail/send/o2m";
+
+    @Autowired
+    public RestMailServiceImpl(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+    @Override
+    public List<Map<String, Object>> sendByDefault(String[] strings, String s, String s1) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public MailLog send(MapMessage mapMessage) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public List<MailLog> sendAll(MapMessage mapMessage) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    /**
+     * 发送邮件给个人
+     * @param templateId
+     * @param receiver
+     * @param params
+     * @return
+     */
+    @Override
+    public MailLog send(String templateId, String receiver, Map<String, Object> params) {
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+
+        JSONObject object = new JSONObject();
+        object.put("templateId", templateId);
+        object.put("receiver", receiver);
+        object.put("params", params);
+
+        HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
+        ResponseEntity<MailLog> responseEntity = restTemplate.postForEntity(MAIL_SEND_URL, formEntity, MailLog.class);
+        return responseEntity.getBody();
+    }
+
+    /**
+     * 发送邮件给多个人
+     * @param templateId
+     * @param receivers
+     * @param params
+     * @return
+     */
+    @Override
+    public List<MailLog> sendAll(String templateId, Set<String> receivers, Map<String, Object> params) {
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+
+        JSONObject object = new JSONObject();
+        object.put("templateId", templateId);
+        object.put("receivers", receivers);
+        object.put("params", params);
+
+        HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(MAIL_SEND_MANY_URL, formEntity, String.class);
+        List<MailLog> mailLogs = FastjsonUtils.fromJsonArray(responseEntity.getBody(), MailLog.class);
+        return mailLogs;
+    }
+
+    @Override
+    public List<MailLog> sendAll(List<MapMessage> list) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public Page<MailLog> findLogs(int i, int i1) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public Page<MailLog> findLogs(String s, int i, int i1) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public Page<MailLog> findLogs(boolean b, int i, int i1) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public Page<MailLog> findLogs(String s, String s1, Boolean aBoolean, int i, int i1) {
+        // 没用到，暂无实现
+        return null;
+    }
+
+    @Override
+    public void deleteLogs(String s) {
+        // 没用到，暂无实现
+    }
+}

src/main/java/com/uas/platform/b2c/common/base/service/impl/RestSmsServiceImpl.java

@@ -0,0 +1,156 @@
+package com.uas.platform.b2c.common.base.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.message.common.domain.Page;
+import com.uas.message.common.domain.SimpleMessage;
+import com.uas.message.mail.domain.MailLog;
+import com.uas.message.sms.domain.SmsLog;
+import com.uas.message.sms.service.SmsService;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 基于RestTemplate实现的短信息发送接口
+ * @author suntg
+ * @since 2017年10月20日15:13:23
+ */
+@Service
+public class RestSmsServiceImpl implements SmsService {
+
+    private RestTemplate restTemplate;
+
+    /**
+     * 短信服务主机地址
+     */
+    private static final String SMS_CONSOLE_HOST = "http://10.10.100.23:28029/";
+
+    /**
+     * 发送短信给单个人url
+     */
+    private static final String SMS_SEND_URL = SMS_CONSOLE_HOST  + "sms/send";
+
+    /**
+     * 发送短信给多个人 url
+     */
+    private static final String SMS_SEND_MANY_URL = SMS_CONSOLE_HOST + "sms/send/o2m";
+
+    @Autowired
+    public RestSmsServiceImpl(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+    @Override
+    public List<Map<String, Object>> sendByDefault(String[] strings, String s) {
+        return null;
+    }
+
+    @Override
+    public SmsLog send(SimpleMessage simpleMessage) {
+        return null;
+    }
+
+    @Override
+    public List<SmsLog> sendAll(SimpleMessage simpleMessage) {
+        return null;
+    }
+
+    /**
+     * 发送短信给个人
+     * @param templateId
+     * @param receiver
+     * @param params
+     * @return
+     */
+    @Override
+    public SmsLog send(String templateId, String receiver, Object[] params) {
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+
+        JSONObject object = new JSONObject();
+        object.put("templateId", templateId);
+        object.put("receiver", receiver);
+        object.put("params", params);
+
+        HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
+        ResponseEntity<SmsLog> responseEntity = restTemplate.postForEntity(SMS_SEND_URL, formEntity, SmsLog.class);
+        return responseEntity.getBody();
+    }
+
+    /**
+     * 发送短信给多个人
+     * @param templateId
+     * @param receivers
+     * @param params
+     * @return
+     */
+    @Override
+    public List<SmsLog> sendAll(String templateId, Set<String> receivers, Object[] params) {
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+
+        JSONObject object = new JSONObject();
+        object.put("templateId", templateId);
+        object.put("receivers", receivers);
+        object.put("params", params);
+
+        HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(SMS_SEND_MANY_URL, formEntity, String.class);
+        List<SmsLog> mailLogs = FastjsonUtils.fromJsonArray(responseEntity.getBody(), SmsLog.class);
+        return mailLogs;
+    }
+
+    /**
+     * 发送多个发送请求
+     * @param list
+     * @return
+     */
+    @Override
+    public List<SmsLog> sendAll(List<SimpleMessage> list) {
+        if(! CollectionUtils.isEmpty(list)) {
+            for(SimpleMessage message : list) {
+                send(message.getTemplateId(), message.getReceiver(), message.getParams());
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Page<SmsLog> findLogs(int i, int i1) {
+        return null;
+    }
+
+    @Override
+    public Page<SmsLog> findLogs(String s, int i, int i1) {
+        return null;
+    }
+
+    @Override
+    public Page<SmsLog> findLogs(boolean b, int i, int i1) {
+        return null;
+    }
+
+    @Override
+    public Page<SmsLog> findLogs(String s, String s1, Boolean aBoolean, int i, int i1) {
+        return null;
+    }
+
+    @Override
+    public void deleteLogs(String s) {
+
+    }
+}

src/main/java/com/uas/platform/b2c/common/search/controller/SearcherController.java

@@ -4,6 +4,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.search.service.SearcherService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
+import com.uas.platform.b2c.prod.commodity.service.StockInOutHistService;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
 import com.uas.platform.b2c.trade.presale.service.StoreFocusService;
@@ -57,6 +58,9 @@ public class SearcherController {
 	@Autowired
 	private GoodsService goodsService;
 
+	@Autowired
+	private StockInOutHistService stockInOutHistService;
+
 	/**
 	 * 作搜索展示跳转
 	 * 
@@ -314,21 +318,24 @@ public class SearcherController {
 		PageInfo pageInfo = new PageInfo(params);
 		Page<StoreIn> stores = storeService.pageStoresByTypesAndKeyword(pageInfo, types, keyword);
 		List<Map<String, Object>> result = new ArrayList<>();
-		Map<String, Object> a = new HashedMap();
-		a.put("stores",stores);
-		result.add(a);
+		Map<String, Object> storesMap = new HashedMap();
+		storesMap.put("stores",stores);
+		result.add(storesMap);
 		Map<String, Object> b = new HashedMap();
 		ArrayList<String> flag = new ArrayList<>();
 		ArrayList<Object> flag2 = new ArrayList<>();
+		ArrayList<Object> flag3 = new ArrayList<>();
 		b.put("isFocus",flag);
 		b.put("image",flag2);
+		b.put("sales",flag3);
 		result.add(b);
 		for (StoreIn storeIn : stores){
 			flag.add(storeFocusService.storeIfFocus(storeIn.getId()));
-			PageInfo pageInfoCache = new PageInfo(1,4);
+			PageInfo pageInfoCache = new PageInfo(1,5);
 			//暂时只显示有图片的产品信息
 			pageInfoCache.expression(PredicateUtils.isNotNull("img"));
 			flag2.add(goodsService.pageCommoditiesByEnInfos(storeIn.getUuid(),null,null,pageInfoCache));
+			flag3.add(stockInOutHistService.getCountByenuuAndIoSellerType(storeIn.getEnUU(),1668));
 		}
 		return result;
 	}

src/main/java/com/uas/platform/b2c/common/search/service/impl/SearcherServiceImpl.java

@@ -148,7 +148,7 @@ public class SearcherServiceImpl implements SearcherService {
 		List<Map<String, Object>> brands = (List)brandMap.get("brands");
 		if (!CollectionUtils.isEmpty(brands)) {
 			for (Map<String, Object> brand : brands){
-				if (keyword.equals(brand.get("nameCn").toString()) || keyword.equals(brand.get("nameEn").toString())){
+				if (keyword.equalsIgnoreCase(brand.get("nameCn").toString()) || keyword.equalsIgnoreCase(brand.get("nameEn").toString())){
 					map.put("brands",brand);
 				}
 			}

src/main/java/com/uas/platform/b2c/prod/commodity/dao/StockInOutHistDao.java

@@ -3,6 +3,8 @@ package com.uas.platform.b2c.prod.commodity.dao;
 import com.uas.platform.b2c.prod.commodity.model.StockInOutHist;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -23,4 +25,15 @@ public interface StockInOutHistDao extends JpaRepository<StockInOutHist, Long>,
      * @return list
      */
     List<StockInOutHist> findStockInOutHistByProdidOrderByOperateDateDesc(Long prodid);
+
+    /**
+     * 根据企业和类型统计该类型下的总量
+     * @param sellerenuu
+     * @param status
+     * @param storeid
+     * @return
+     */
+    @Query(nativeQuery = true , value = "select count(stock_qty) from trade$stock_in_out where stock_enuu = :enuu and stock_ioseller_type = :type")
+    int getCountByenuuAndIoSellerType(@Param("enuu") Long enuu, @Param("type") Integer type);
+
 }

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

@@ -27,4 +27,10 @@ public interface StockInOutHistService {
      * @return List<StockInOutHist> stock in out hist by prod id
      */
     List<StockInOutHist> getStockInOutHistByProdId(Long prodId);
+
+    /**
+     * 根据企业和类型统计该类型下的总量
+     * @return
+     */
+    int getCountByenuuAndIoSellerType(long enuu,int type);
 }

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

@@ -44,4 +44,9 @@ public class StockInOutHistServiceImpl implements StockInOutHistService{
         }
         return stockInOutHistDao.findStockInOutHistByProdidOrderByOperateDateDesc(prodId);
     }
+
+    @Override
+    public int getCountByenuuAndIoSellerType(long enuu, int type) {
+        return stockInOutHistDao.getCountByenuuAndIoSellerType(enuu,type);
+    }
 }

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentGoods.java

@@ -106,6 +106,13 @@ public class ComponentGoods implements Serializable {
 	@Column(name = "cmp_brid")
 	private Long brandid;
 
+	/**
+	 * 器件描述
+	 */
+	@Column(name = "cmp_description", length = 4000)
+	private String description;
+
+
 	/**
 	 * 器件的品牌
 	 */
@@ -503,6 +510,14 @@ public class ComponentGoods implements Serializable {
 		this.packaging = packaging;
 	}
 
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
 	public String getEncapsulation() {
 		return encapsulation;
 	}

src/main/resources/spring/dubbo-consumer.xml

@@ -19,12 +19,5 @@
 		interface="com.uas.search.service.OrderSearchService" timeout="10000"
 		group="${dubbo.group}" />
 
-	<!-- 邮件服务 -->
-	<dubbo:reference id="mailService"
-		interface="com.uas.message.mail.service.MailService" timeout="10000" />
-
-	<!-- 短信服务 -->
-	<dubbo:reference id="smsService"
-					 interface="com.uas.message.sms.service.SmsService" timeout="10000" />
 
 </beans>

src/main/webapp/resources/view/common/modal/edit_address_modal.html

@@ -151,7 +151,7 @@
 					      		placeholder="建议你填写详细地址，例如街道名、门牌号，楼层和房间号等信息" autocomplete="off" ng-change="checkForm(3)">
 					    </div>
 						<div class="col-md-2" style="padding: 0; width: 100px; padding-left: 10px;">
-							<span class="text-inverse error" ng-show="myForm.addr.$dirty && addrError">请勿超过30个字</span>
+							<span class="text-inverse error" ng-show="address.detailAddress && addrError">请勿超过30个字</span>
 							<span ng-show="!myForm.addr.$invalid && !addrError" class="text-success heigth30">填写正确</span>
 							<span class="text-inverse error" ng-show="myForm.addr.$touched && myForm.addr.$invalid">请输入详细地址</span>
 						</div>

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

@@ -562,30 +562,22 @@
 					<span ng-if="order.invoicetype == 1205">增值税(专用)发票</span>
 					<span ng-if="order.invoicetype == 1206">增值税普通发票</span>
 				</p>
-				<p>
-					<b>收票人：</b>
-					<span ng-bind="order.invoiceInfo.name || '空'"></span>
-				</p>
-				<p>
-					<b>联系电话：</b>
-					<span ng-bind="order.invoiceInfo.telephone || '空'">13526395698</span>
-				</p>
 				<p>
 					<b>发票抬头：</b>
 					<span ng-bind="order.invoiceInfo.head || '空'"></span>
 				</p>
 				<p>
-					<b>发票地址：</b>
-					<span ng-bind="order.invoiceInfo.area + '，'+ order.invoiceInfo.detailAddress">广东省深圳市南山区高新南四道科苑南路英唐大厦6楼</span>
+					<b>单位地址：</b>
+					<span ng-bind="order.invoiceInfo.companyAddress || '空'"></span>
+				</p>
+				<p ng-if="order.invoicetype == 1205">
+					<b>单位电话：</b>
+					<span ng-bind="order.invoiceInfo.landlineNumber || '空'">0755-58956655</span>
 				</p>
 				<p ng-if="order.invoicetype == 1205">
 					<b>税务登记号：</b>
 					<span ng-bind="::order.invoiceInfo.companyTaxNumber || '空'">4536553333245556668</span>
 				</p>
-				<p>
-					<b>座机号码：</b>
-					<span ng-bind="order.invoiceInfo.landlineNumber || '空'">0755-58956655</span>
-				</p>
 				<p ng-if="order.invoicetype == 1205">
 					<b>开户银行：</b>
 					<span ng-bind="::order.invoiceInfo.bankName || '空'">招商银行深圳分行科技园支行</span>
@@ -594,6 +586,18 @@
 					<b>开户银行账户：</b>
 					<span ng-bind="::order.invoiceInfo.bankAccount || '空'">131362655641531321321321</span>
 				</p>
+				<p>
+					<b>收票人：</b>
+					<span ng-bind="order.invoiceInfo.name || '空'"></span>
+				</p>
+				<p>
+					<b>联系电话：</b>
+					<span ng-bind="order.invoiceInfo.telephone || '空'">13526395698</span>
+				</p>
+				<p>
+					<b>详细地址：</b>
+					<span ng-bind="order.invoiceInfo.area + '，'+ order.invoiceInfo.detailAddress">广东省深圳市南山区高新南四道科苑南路英唐大厦6楼</span>
+				</p>
 			</div>
 		</div>
 	</div>

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

@@ -637,15 +637,15 @@
 			</div>
 			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&&bill.name">
 				<p><em>发票类型：</em><span ng-bind="order.invoicetype | billTypeFilter "></span></p>
-				<p><em>收票人：</em><span ng-bind="bill.name || '空'"></span></p>
-				<p><em>收票人电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
-				<p><em>座机：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
-				<p><em>收票人地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>公司地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
+				<p><em>发票抬头：</em><span ng-bind="bill.head || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>单位地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>单位电话：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>税务登记号：</em><span ng-bind="bill.companyTaxNumber || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>公司电话：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>开户银行：</em><span ng-bind="bill.bankName || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>开户银行账户：</em><span ng-bind="bill.bankAccount || '空'"></span></p>
+				<p><em>收票人：</em><span ng-bind="bill.name || '空'"></span></p>
+				<p><em>联系电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
+				<p><em>详细地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
 			</div>
 		</div>
 		<!--确认订单信息-->

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

@@ -598,31 +598,22 @@
 					<span ng-if="purchase.invoicetype == 1205">增值税(专用)发票</span>
 					<span ng-if="purchase.invoicetype == 1206">增值税普通发票</span>
 				</p>
-				<p>
-					<b>收票人：</b>
-					<span ng-bind="purchase.invoiceInfo.name || '空'">张三</span>
-				</p>
-				<p>
-					<b>收票人联系电话：</b>
-					<span ng-bind="purchase.invoiceInfo.telephone  || '空'">13526395698</span>
-				</p>
 				<p>
 					<b>发票抬头：</b>
 					<span ng-bind="purchase.invoicetitle  || '空'">深圳市优软商城科技有限公司</span>
 				</p>
-				<p>
-					<b>发票地址：</b>
-					<span ng-if="purchase.invoiceInfo.area" ng-bind="purchase.invoiceInfo.area + purchase.invoiceInfo.detailAddress"></span>
-					<span ng-if="!purchase.invoiceInfo.area">空</span>
-				</p>
 				<p ng-if="purchase.invoicetype == 1205">
-					<b>税务登记号：</b>
-					<span ng-bind="purchase.invoiceInfo.companyTaxNumber || '空'"></span>
+					<b>单位地址：</b>
+					<span ng-if="purchase.invoiceInfo.companyAddress" ng-bind="purchase.invoiceInfo.companyAddress || '空'"></span>
 				</p>
 				<p ng-if="purchase.invoicetype == 1205">
-					<b>座机号码：</b>
+					<b>单位电话：</b>
 					<span ng-bind="purchase.invoiceInfo.companyPhone || '空'"></span>
 				</p>
+				<p ng-if="purchase.invoicetype == 1205">
+					<b>税务登记号：</b>
+					<span ng-bind="purchase.invoiceInfo.companyTaxNumber || '空'"></span>
+				</p>
 				<p ng-if="purchase.invoicetype == 1205">
 					<b>开户银行：</b>
 					<span ng-bind="purchase.invoiceInfo.bankName || '空'"></span>
@@ -631,6 +622,19 @@
 					<b>开户银行账户：</b>
 					<span ng-bind="purchase.invoiceInfo.bankAccount || '空'"></span>
 				</p>
+				<p>
+					<b>收票人：</b>
+					<span ng-bind="purchase.invoiceInfo.name || '空'">张三</span>
+				</p>
+				<p>
+					<b>联系电话：</b>
+					<span ng-bind="purchase.invoiceInfo.telephone  || '空'">13526395698</span>
+				</p>
+				<p>
+					<b>详细地址：</b>
+					<span ng-if="purchase.invoiceInfo.area" ng-bind="purchase.invoiceInfo.area + purchase.invoiceInfo.detailAddress"></span>
+					<span ng-if="!purchase.invoiceInfo.area">空</span>
+				</p>
 			</div>
 		</div>
 	</div>

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

@@ -989,7 +989,7 @@
 			<div ng-if="!canBatchOperation && !canEditProduct"><a ng-click="editRecommendProduct('BATCH_OPERATION', true)">批量操作</a></div>
 			<div ng-if="!canBatchOperation && !canEditProduct"><a ng-click="editRecommendProduct('EDIT_PRODUCTS', true)"><i class="fa fa-pencil"></i>编辑</a></div>
 			<div class="check" ng-if="canBatchOperation">
-				<label class="check-active">
+				<label class="check-active" ng-if="recommendProducts.length>0">
 					<input type="checkbox" id="isChooseAll" ng-checked="isChooseAll" ng-click="chooseAllProduct(!isChooseAll)" checked="checked">
 					<label for="isChooseAll"></label>
 					<span style="margin-left: 0;">全选</span>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -29,7 +29,7 @@
 		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a href="javascript:void(0)" ui-sref="vendor_brand_apply">品牌申请</a></li>
 		<li ng-class="{'active' : active == 'vendor_component_apply'}"><a href="javascript:void(0)" ui-sref="vendor_component_apply">器件申请</a></li>
 	<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_productOn">产品导入</a></li>-->
-		<li ng-class="{'active' : active == 'vendor_upload'}"><a href="javascript:void(0)" ui-sref="vendor_upload">产品导入</a></li>
+		<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_upload">产品导入</a></li>
 		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a href="javascript:void(0)" ui-sref="vendor_repository">仓库管理</a></li>-->
 		<li ng-class="{'active' : active == 'vendor_material'}"><a href="javascript:void(0)" ui-sref="vendor_material">产品管理</a></li>
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->

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

@@ -11,7 +11,7 @@
 	<div class="modal-body">
 		<div class="row">
 			<label class="col-md-4 col-sm-4 col text-right">用户：</label>
-			<div class="col-md-4 col-sm-4 col">{{::user.userUU}} - {{::user.userName}} </div>
+			<div class="col-md-4 col-sm-4 col">{{::user.userTel}} - {{::user.userName}} </div>
 		</div>
 		<div class="row line" ng-class="{'has-success': checkSuccess, 'has-error': checkFailed}">
 			<label class="col-md-4 col-sm-4 col text-right">原密码：</label>