Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -157,9 +157,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
             if (user != null) {
                 user.setIp(AgentUtils.getIp(request));
                 request.getSession().setAttribute("user", user);
-                setGrantedAuthorities(user);
             }
         }
+        setGrantedAuthorities(user);
         if (user != null) {
             SystemSession.setUser(user);
             accessDecision(request, user);
@@ -176,7 +176,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         }
         Iterator<ConfigAttribute> iterator = configAttributes.iterator();
         String needPermission = null;
-        if (!authorities.containsKey(user.getUserUU())) {
+        if (null == authorities || !authorities.containsKey(user.getUserUU())) {
             setGrantedAuthorities(user);
         }
         Collection<GrantedAuthority> userAuthorities = authorities.get(user.getUserUU());

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

@@ -1941,19 +1941,6 @@ public class GoodsServiceImpl implements GoodsService {
 		goodsHist.setMessage(goodsHist.getMessage() + "该批次下架");
 		goodsHistoryService.save(goodsHist);
 
-//		ProductStandardPutOnInfo standardPutOnInfo = productStandardPutOnInfoDao.findOne(goods.getStandprodid());
-//		if(standardPutOnInfo != null) {
-//			standardPutOnInfo.setStatus(Status.REMOVED.value());
-//			standardPutOnInfo.setAvailableOnSale(NumberUtil.add(standardPutOnInfo.getAvailableOnSale(), standardPutOnInfo.getOnSaleQty()));
-//			standardPutOnInfo.setOnSaleQty(0.0d);
-//			productStandardPutOnInfoDao.save(standardPutOnInfo);
-//
-//			Product product = productDao.findOne(standardPutOnInfo.getProductid());
-//			product.setAvailableOnSale(standardPutOnInfo.getAvailableOnSale());
-//			product.setOnSaleQty(standardPutOnInfo.getOnSaleQty());
-//			productDao.save(product);
-//		}
-
 		//下架对应的批次
 		goodsDao.deleteByBatchCode(goods.getBatchCode());
 		return ResultMap.success(goods);
@@ -2277,28 +2264,11 @@ public class GoodsServiceImpl implements GoodsService {
 			histories.add(goodsHistory);
 			goodsUpdate.add(goods);
 
-//			ProductStandardPutOnInfo standardPutOnInfo = productStandardPutOnInfoDao.findOne(goods.getStandprodid());
-//			if(standardPutOnInfo != null) {
-//				standardPutOnInfo.setStatus(Status.REMOVED.value());
-//				standardPutOnInfo.setAvailableOnSale(NumberUtil.add(standardPutOnInfo.getAvailableOnSale(), standardPutOnInfo.getOnSaleQty()));
-//				standardPutOnInfo.setOnSaleQty(0.0d);
-//				productStandardPutOnInfoList.add(standardPutOnInfo);
-//
-//				Product product = productDao.findOne(standardPutOnInfo.getProductid());
-//				product.setAvailableOnSale(standardPutOnInfo.getAvailableOnSale());
-//				product.setOnSaleQty(standardPutOnInfo.getOnSaleQty());
-//				products.add(product);
-//			}else {
-//				throw new IllegalOperatorException("找不到对应的标准上架产品信息");
-//			}
-//			productStandardPutOnInfoService.updateAvailableQty(goods.getStandprodid(), goods.getReserve());
             uuids.add(goods.getUuid());
 		}
 
 		goodsDao.delete(goodsUpdate);
         goodsHistoryDao.save(histories);
-//		productDao.save(products);
-//		productStandardPutOnInfoDao.save(productStandardPutOnInfoList);
         for (String uuid : uuids) {
             updateComponentTradeInfos(uuid);
         }
@@ -2360,8 +2330,6 @@ public class GoodsServiceImpl implements GoodsService {
 		orderService.save(orders);
 		cartService.saveCart(carts);
 		browsingHistoryService.saveGoodsBrowsingHistoryList(browsingHistoryList);
-//		productStandardPutOnInfoService.save(putOnInfo);
-//		productService.save(product);
 		goodsHistoryService.save(goodsHistory);
 		return ResultMap.success(null);
 	}

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

@@ -523,6 +523,16 @@
 		/*width: 200px;*/
 		/*margin-left: -10px;*/
 	/*}*/
+	.com-del-box {
+		top: 101%!important ;
+		left: 24%!important ;
+	}
+	.com-del-box .title{
+		width: 100%!important ;
+	}
+	.com-del-box .title i{
+		background: none;
+	}
 </style>
 <div class="user_right fr" id="buyer_cart">
 	<!--订单中心-->

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

@@ -86,6 +86,7 @@
         overflow-x: hidden;
         border-radius: 0;
         box-shadow: none;
+        margin-top: -1px;
     }
     .sell_oder .sure_oder .oder_xq_list dl span .dropdown-menu li{
         font-size: 14px;