小程序整改

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsSpecificationController.java

@@ -1,5 +1,6 @@
 package com.kmall.admin.controller;
 
+import com.google.common.collect.Maps;
 import com.kmall.admin.entity.GoodsSpecificationEntity;
 import com.kmall.admin.entity.SpecificationEntity;
 import com.kmall.admin.service.GoodsSpecificationService;
@@ -103,7 +104,7 @@ public class GoodsSpecificationController {
                 }
             }
         }
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("ids", goodsSpecificationIds);
         List<SpecificationEntity> specificationEntityList = specificationService.queryList(param);
         Collections.sort(specificationEntityList, new Comparator<SpecificationEntity>() {

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsGroupOpenServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kmall.admin.service.impl;
 
+import com.google.common.collect.Maps;
 import com.kmall.admin.dao.GoodsGroupOpenDao;
 import com.kmall.admin.dao.GoodsGroupOpenDetailDao;
 import com.kmall.admin.dao.OrderDao;
@@ -83,7 +84,7 @@ public class GoodsGroupOpenServiceImpl implements GoodsGroupOpenService {
         groupOpenEntity.setAttendStatus(3);
         goodsGroupOpenDao.update(groupOpenEntity);
         // 更新团购明细
-        Map detailMap = new HashMap();
+        Map detailMap = Maps.newHashMap();
         detailMap.put("openId", id);
         List<GoodsGroupOpenDetailEntity> openDetailEntityList = goodsGroupOpenDetailDao.queryList(detailMap);
         if (null != openDetailEntityList && openDetailEntityList.size() > 0) {

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.Maps;
 import com.kmall.admin.dao.*;
 import com.kmall.admin.dto.GoodsDto;
 import com.kmall.admin.entity.*;
@@ -360,7 +361,7 @@ public class GoodsServiceImpl implements GoodsService {
             }
         }
 
-        Map cartMap = new HashMap();
+        Map cartMap = Maps.newHashMap();
         cartMap.put("goodsId",goods.getId());
         List<CartEntity> cartList = cartDao.queryList(cartMap);
         if (cartList != null && cartList.size() > 0) {
@@ -454,7 +455,7 @@ public class GoodsServiceImpl implements GoodsService {
         goodsEntity.setIsOnSale(Integer.parseInt(Dict.isOnSale.item_0.getItem()));
         goodsEntity.setUpdateUserId(user.getUserId());
         goodsEntity.setUpdateTime(new Date());
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("goodsId", id);
         List<GoodsGroupEntity> groupVos = goodsGroupDao.queryList(params);
         if (null != groupVos && groupVos.size() > 0) {

kmall-admin/src/main/java/com/kmall/admin/service/impl/OfflineCartServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kmall.admin.service.impl;
 
+import com.google.common.collect.Maps;
 import com.kmall.admin.dao.OfflineCartDao;
 import com.kmall.admin.entity.GoodsEntity;
 import com.kmall.admin.entity.OfflineCartEntity;
@@ -93,7 +94,7 @@ public class OfflineCartServiceImpl implements OfflineCartService {
             cartEntity.setCreateTime(new Date());
             save(cartEntity);
         }
-        Map map= new HashMap();
+        Map map= Maps.newHashMap();
         map.put("userId",user.getUserId());
         map.put("storeId",goods.getStoreId());
         return offlineCartDao.queryOfflineCartByBizType(map);

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.admin.dao.*;
 import com.kmall.admin.entity.*;
 import com.kmall.admin.entity.OrderProcessRecordEntity;
@@ -496,7 +497,7 @@ public class OrderServiceImpl implements OrderService {
             }
         }
 
-        Map logisticsInfo = new HashMap();
+        Map logisticsInfo = Maps.newHashMap();
         List<WuliuEntity> wuliuEntityList = new ArrayList<>();
         OrderProcessRecordEntity orderProcessRecordEntity =
                 orderProcessRecordDao.queryObjectByOrderSn(orderEntity.getOrderSn());
@@ -602,7 +603,7 @@ public class OrderServiceImpl implements OrderService {
     @Transactional
     @Override
     public Map orderSubmit(List<OfflineCartEntity> offlineCartList, SysUserEntity user) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         try {
             if (user == null) {
                 resultObj.put("errno", 400);
@@ -622,7 +623,7 @@ public class OrderServiceImpl implements OrderService {
             Long userId = user.getUserId();
             Integer storeId = user.getStoreId();
             //获取要购买的商品
-            Map param = new HashMap();
+            Map param = Maps.newHashMap();
             param.put("userId", userId);
             param.put("storeId", storeId);
             if (null == offlineCartList && offlineCartList.size() == 0) {
@@ -680,7 +681,7 @@ public class OrderServiceImpl implements OrderService {
                 }
                 //清空预订单商品临时表
                 offlineCartDao.deleteByUserId(userId);
-                Map orderInfoMap = new HashMap();
+                Map orderInfoMap = Maps.newHashMap();
                 orderInfoMap.put("orderInfo", order);
                 resultObj.put("errno", 0);
                 resultObj.put("errmsg", "订单提交成功");

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.impl;
 
 import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.Maps;
 import com.kmall.admin.dao.*;
 import com.kmall.admin.entity.*;
 import com.kmall.admin.service.ProductStoreRelaService;
@@ -124,7 +125,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         if(!goodsEntity.getMerchSn().equalsIgnoreCase(productStoreRela.getMerchSn())) {
             throw new RRException("该商品所属商户不属于该门店所属商户！");
         }
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = Maps.newHashMap();
         map.put("goodsId", goodsEntity.getId());
         map.put("storeId", productStoreRela.getStoreId());
         List<ProductStoreRelaEntity> storeRelaList = querySameList(map);
@@ -229,7 +230,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             throw new RRException("该商品所属商户不属于该门店所属商户！");
         }
 
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = Maps.newHashMap();
         map.put("goodsId", goodsEntity.getId());
         map.put("storeId", productStoreRela.getStoreId());
         map.put("id", productStoreRela.getId());
@@ -278,7 +279,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
                 }
             }
         }
-        Map cartMap = new HashMap();
+        Map cartMap = Maps.newHashMap();
         cartMap.put("goodsId",goodsEntity.getId());
         List<CartEntity> cartList = cartDao.queryList(cartMap);
         if (cartList != null && cartList.size() > 0) {

kmall-admin/src/main/webapp/WEB-INF/page/shop/ad.html

@@ -81,7 +81,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -20px;">
-                    <span style="margin-left: 80px;color: red;font-size: 12px;">尺寸建议750*280像素以内，大小2M以下</span>
+                    <span style="margin-left: 80px;color: red;font-size: 12px;">尺寸建议750*400像素以内，大小2M以下</span>
                 </i-col>
             </Row>
             <Form-item label="内容" prop="content">

kmall-api/src/main/java/com/kmall/api/api/ApiAddressController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.AddressVo;
@@ -40,7 +41,7 @@ public class ApiAddressController extends ApiBaseAction {
      */
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         List<AddressVo> addressEntities = addressService.queryList(param);
         return toResponsSuccess(addressEntities);
@@ -88,7 +89,7 @@ public class ApiAddressController extends ApiBaseAction {
         }
         // 更新默认
         if (entity.getIsDefault() == 1) {
-            Map params = new HashMap();
+            Map params = Maps.newHashMap();
             params.put("user_id", entity.getUserId());
             params.put("is_default", 1);
             List<AddressVo> addressVoList = addressService.queryList(params);
@@ -142,7 +143,7 @@ public class ApiAddressController extends ApiBaseAction {
             }
         }
         //
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("user_id", entity.getUserId());
         List<AddressVo> addressVoList = addressService.queryList(params);
         if (null != addressVoList) {

kmall-api/src/main/java/com/kmall/api/api/ApiAuthController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.entity.*;
 import com.kmall.api.service.ApiMerchUserService;
@@ -50,7 +51,7 @@ public class ApiAuthController extends ApiBaseAction {
     @IgnoreAuth
     @PostMapping("login_by_weixin")
     public Object loginByWeixin() {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         JSONObject jsonParam = this.getJsonRequest();
         FullUserInfo fullUserInfo = null;
         Long storeId = jsonParam.getLong("storeId");
@@ -140,7 +141,7 @@ public class ApiAuthController extends ApiBaseAction {
     @GetMapping("nearbyList")
     @IgnoreAuth
     public Object nearbyList(@RequestParam BigDecimal latitude, @RequestParam BigDecimal longitude,@RequestParam String storeId) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         if(org.apache.commons.lang3.StringUtils.isNotEmpty(storeId)){
             param.put("storeId", storeId);
         }
@@ -159,7 +160,7 @@ public class ApiAuthController extends ApiBaseAction {
     @GetMapping("storeListByCity")
     @IgnoreAuth
     public Object storeListByCity(@RequestParam String provinceName, @RequestParam String cityName, @RequestParam String countyName) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("province_name", provinceName);
         param.put("city_name", cityName);
         param.put("county_name", countyName);
@@ -178,7 +179,7 @@ public class ApiAuthController extends ApiBaseAction {
         Long storeId = jsonParam.getLong("storeId");
         String merchSn = (String)jsonParam.get("merchSn");
         //
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         Map<String, Object> tokenMap = tokenService.createAndUpdateToken(openId, storeId,getUserId(),merchSn);
         String token = MapUtils.getString(tokenMap, "token");
         resultObj.put("token", token);

kmall-api/src/main/java/com/kmall/api/api/ApiBrandController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.entity.BrandVo;
 import com.kmall.api.service.ApiBrandService;
@@ -33,7 +34,7 @@ public class ApiBrandController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("index")
     public Object index() {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         List<BrandVo> entityList = brandService.queryList(param);
         return toResponsSuccess(entityList);
     }
@@ -46,7 +47,7 @@ public class ApiBrandController extends ApiBaseAction {
     public Object list(@RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "size", defaultValue = "10") Integer size) {
         //查询列表数据
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("fields", "id, name, floor_price, app_list_pic_url");
         params.put("page", page);
         params.put("limit", size);
@@ -67,7 +68,7 @@ public class ApiBrandController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("detail")
     public Object detail(@RequestParam Integer id) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //查询列表数据
         BrandVo entity = brandService.queryObject(id);
         //

kmall-api/src/main/java/com/kmall/api/api/ApiCartController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.common.constant.Dict;
 import com.kmall.api.entity.*;
@@ -54,9 +55,9 @@ public class ApiCartController extends ApiBaseAction {
      */
     @GetMapping("getCartMoney")
     public Object getCartMoney(@LoginUser UserVo loginUser, String checkCart) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //查询列表数据
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         Long storeId = getStoreId();
         param.put("store_id", storeId);
@@ -78,7 +79,7 @@ public class ApiCartController extends ApiBaseAction {
 
         resultObj.put("cartList", cartList);
         //
-        Map<String, Object> cartTotal = new HashMap();
+        Map<String, Object> cartTotal = Maps.newHashMap();
         cartTotal.put("goodsCount", goodsCount);
         cartTotal.put("goodsAmount", goodsAmount);
         cartTotal.put("checkedGoodsCount", checkedGoodsCount);
@@ -95,9 +96,9 @@ public class ApiCartController extends ApiBaseAction {
     public Object getCart(String checkCart) {
         UserVo loginUser = new UserVo();
         loginUser.setId(getUserId());
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //查询列表数据
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         Long storeId = getStoreId();
         param.put("store_id", storeId);
@@ -168,7 +169,7 @@ public class ApiCartController extends ApiBaseAction {
         resultObj.put("cartList", cartList);
         resultObj.put("validCartList", validCartList);
         //
-        Map<String, Object> cartTotal = new HashMap();
+        Map<String, Object> cartTotal = Maps.newHashMap();
         cartTotal.put("goodsCount", goodsCount);
         cartTotal.put("goodsAmount", goodsAmount);
         cartTotal.put("checkedGoodsCount", checkedGoodsCount);
@@ -189,9 +190,9 @@ public class ApiCartController extends ApiBaseAction {
      */
     @GetMapping("getFootCart")
     public Object getFootCart(@LoginUser UserVo loginUser) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //查询列表数据
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         Long storeId = getStoreId();
         param.put("store_id", storeId);
@@ -263,7 +264,7 @@ public class ApiCartController extends ApiBaseAction {
             productInfo.setMarket_price(goodsInfo.getMarket_price());
         }
         //判断购物车中是否存在此规格商品
-        Map cartParam = new HashMap();
+        Map cartParam = Maps.newHashMap();
         cartParam.put("goods_id", goodsId);
         cartParam.put("product_id", productId);
         cartParam.put("user_id", loginUser.getId());
@@ -289,6 +290,7 @@ public class ApiCartController extends ApiBaseAction {
             cartInfo.setGoodsBizType(goodsInfo.getGoodsBizType());//业务类型
             cartInfo.setStockNum(productInfo.getStock_num());
             cartInfo.setMerchSn(goodsInfo.getMerchSn());
+            cartInfo.setSku(goodsInfo.getSku());
             cartService.save(cartInfo);
         } else {
             if(number + cartInfo.getNumber() > productInfo.getStock_num()){
@@ -297,6 +299,7 @@ public class ApiCartController extends ApiBaseAction {
             cartInfo.setNumber(cartInfo.getNumber() + number);
             cartInfo.setGoodsBizType(goodsInfo.getGoodsBizType());//业务类型
             cartInfo.setStockNum(productInfo.getStock_num());
+            cartInfo.setSku(goodsInfo.getSku());
             cartService.update(cartInfo);
         }
         return toResponsSuccess(getCart(checkCart));
@@ -330,7 +333,7 @@ public class ApiCartController extends ApiBaseAction {
     public Object addByOrder(@LoginUser UserVo loginUser, Long orderId) {
         JSONObject jsonParam = getJsonRequest();
         //
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("order_id", orderId);
         List<OrderGoodsVo> orderGoodsVos = apiOrderGoodsService.queryList(params);
         for (OrderGoodsVo goodsVo : orderGoodsVos) {
@@ -366,8 +369,9 @@ public class ApiCartController extends ApiBaseAction {
             cartInfo.setGoodsBizType(goodsVo.getOrderBizType());
             cartInfo.setStockNum(productInfo.getStock_num());
             cartInfo.setMerchSn(goodsVo.getMerchSn());
+            cartInfo.setSku(goodsVo.getSku());
 
-            Map map = new HashMap();
+            Map map = Maps.newHashMap();
             map.put("user_id", getUserId());
             map.put("store_id", getStoreId());
             map.put("goods_id",goodsVo.getGoods_id());
@@ -398,7 +402,7 @@ public class ApiCartController extends ApiBaseAction {
         Integer productId = jsonParam.getInteger("productId");
         Integer number = jsonParam.getInteger("number");
         //判断购物车中是否存在此规格商品
-        Map cartParam = new HashMap();
+        Map cartParam = Maps.newHashMap();
         cartParam.put("goods_id", goodsId);
         cartParam.put("product_id", productId);
         Long storeId = getStoreId();
@@ -457,7 +461,7 @@ public class ApiCartController extends ApiBaseAction {
             return toResponsObject(0, msg, getCart(checkCart));
         }
 
-        Map cartParam = new HashMap();
+        Map cartParam = Maps.newHashMap();
         cartParam.put("goodsId", goodsId);
         cartParam.put("productId", productId);
         cartParam.put("store_id", storeId);
@@ -471,6 +475,7 @@ public class ApiCartController extends ApiBaseAction {
             cartInfo.setMarket_price(productInfo.getRetail_price());
             cartInfo.setGoods_specification_name_value(productInfo.getGoods_specification_name_value());
             cartInfo.setGoods_specification_ids(productInfo.getGoods_specification_ids());
+//            cartInfo.setSku(goodsVo.getSku());
             cartService.update(cartInfo);
         } else {
             //添加规格名和值
@@ -480,6 +485,7 @@ public class ApiCartController extends ApiBaseAction {
             cartInfo.setRetail_price(productInfo.getRetail_price());
             cartInfo.setMarket_price(productInfo.getRetail_price());
             cartInfo.setGoods_specification_name_value(productInfo.getGoods_specification_name_value());
+            cartInfo.setSku(newcartInfo.getSku());
             cartInfo.setGoods_specification_ids(productInfo.getGoods_specification_ids());
             cartService.update(cartInfo);
         }
@@ -533,9 +539,9 @@ public class ApiCartController extends ApiBaseAction {
         if (null == loginUser || null == loginUser.getId()) {
             return toResponsFail("未登录");
         }
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //查询列表数据
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("store_id", getStoreId());
         List<CartVo> cartList = cartService.queryList(param);
@@ -546,7 +552,7 @@ public class ApiCartController extends ApiBaseAction {
         }
         resultObj.put("cartList", cartList);
         //
-        Map<String, Object> cartTotal = new HashMap();
+        Map<String, Object> cartTotal = Maps.newHashMap();
         cartTotal.put("goodsCount", goodsCount);
         //
         resultObj.put("cartTotal", cartTotal);
@@ -558,9 +564,9 @@ public class ApiCartController extends ApiBaseAction {
      */
     @GetMapping("checkout")
     public Object checkout(@LoginUser UserVo loginUser, Long userCouponId, String merchSn, String checkCart) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //选择的收货地址
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("is_default", 1);
         param.put("user_id", loginUser.getId());
         List<AddressVo> addressEntityList = addressService.queryList(param);
@@ -670,7 +676,7 @@ public class ApiCartController extends ApiBaseAction {
         if (null != addressEntityList && addressEntityList.size() > 0) {
             resultObj.put("addressVo", addressEntityList.get(0));
         } else { // 没有默认地址,选择一个
-            param = new HashMap();
+            param = Maps.newHashMap();
             param.put("user_id", loginUser.getId());
             addressEntityList = addressService.queryList(param);
             if (null != addressEntityList && addressEntityList.size() > 0) {
@@ -692,7 +698,7 @@ public class ApiCartController extends ApiBaseAction {
     @GetMapping("checkedCouponList")
     public Object checkedCouponList(@LoginUser UserVo loginUser) {
         //查询列表数据
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         Long storeId = getStoreId();
         param.put("store_id", storeId);
@@ -736,7 +742,7 @@ public class ApiCartController extends ApiBaseAction {
     @GetMapping("deleteValidCart")
     public Object deleteValidCart(String checkCart) {
         try{
-            Map param = new HashMap();
+            Map param = Maps.newHashMap();
             param.put("user_id", getUserId());
             Long storeId = getStoreId();
             param.put("store_id", storeId);

kmall-api/src/main/java/com/kmall/api/api/ApiCatalogController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.BrandVo;
@@ -39,8 +40,8 @@ public class ApiCatalogController extends ApiBaseAction {
     public Object index(@LoginUser UserVo loginUser, Integer id,
                         @RequestParam(value = "page", defaultValue = "1") Integer page,
                         @RequestParam(value = "size", defaultValue = "10") Integer size) {
-        Map<String, Object> resultObj = new HashMap();
-        Map params = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
+        Map params = Maps.newHashMap();
         params.put("page", page);
         params.put("limit", size);
         params.put("sidx", "sort_order");
@@ -65,7 +66,7 @@ public class ApiCatalogController extends ApiBaseAction {
         }
         resultObj.put("categoryList", data);
         resultObj.put("currentCategory", currentCategory);
-        Map brandMap = new HashMap();
+        Map brandMap = Maps.newHashMap();
         brandMap.put("categoryId", currentCategory.getId());
         List<BrandVo> brandVoList = brandService.queryList(brandMap);
 
@@ -78,8 +79,8 @@ public class ApiCatalogController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("current")
     public Object current(@LoginUser UserVo loginUser, Integer id) {
-        Map<String, Object> resultObj = new HashMap();
-        Map params = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
+        Map params = Maps.newHashMap();
         params.put("parent_id", 0);
         CategoryVo currentCategory = null;
         if (null != id) {
@@ -91,7 +92,7 @@ public class ApiCatalogController extends ApiBaseAction {
             currentCategory.setSubCategoryList(categoryService.queryList(params));
         }
         resultObj.put("currentCategory", currentCategory);
-        Map brandMap = new HashMap();
+        Map brandMap = Maps.newHashMap();
         brandMap.put("categoryId", currentCategory.getId());
         List<BrandVo> brandVoList = brandService.queryList(brandMap);
 

kmall-api/src/main/java/com/kmall/api/api/ApiCollectController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.CollectVo;
 import com.kmall.api.entity.UserVo;
@@ -33,7 +34,7 @@ public class ApiCollectController extends ApiBaseAction {
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser, Integer typeId) {
 
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("type_id", typeId);
         param.put("store_id", getStoreId());
@@ -51,7 +52,7 @@ public class ApiCollectController extends ApiBaseAction {
         Integer typeId = jsonParam.getInteger("typeId");
         Integer valueId = jsonParam.getInteger("valueId");
 
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("type_id", typeId);
         param.put("value_id", valueId);
@@ -75,7 +76,7 @@ public class ApiCollectController extends ApiBaseAction {
         }
 
         if (collectRes > 0) {
-            Map data = new HashMap();
+            Map data = Maps.newHashMap();
             data.put("type", handleType);
             return toResponsSuccess(data);
         }

kmall-api/src/main/java/com/kmall/api/api/ApiCommentController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.*;
@@ -42,7 +43,7 @@ public class ApiCommentController extends ApiBaseAction {
      */
     @PostMapping("post")
     public Object post(@LoginUser UserVo loginUser) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         //
         JSONObject jsonParam = getJsonRequest();
         Integer typeId = jsonParam.getInteger("typeId");
@@ -51,12 +52,12 @@ public class ApiCommentController extends ApiBaseAction {
         // 是否领取优惠券
         if (null != insertId && insertId > 0 && typeId == 0) {
             // 当前是否评价过
-            Map param = new HashMap();
+            Map param = Maps.newHashMap();
             param.put("user_id", loginUser.getId());
             param.put("orderId", orderId);
             Integer hasComment = commentService.queryTotal(param);
             if (hasComment == 1) {
-                Map couponParam = new HashMap();
+                Map couponParam = Maps.newHashMap();
                 couponParam.put("send_type", CouponTypeEnum.COUPONTYPE6.getIndex());
                 CouponVo newCouponConfig = apiCouponService.queryMaxUserEnableCoupon(couponParam);
                 if (null != newCouponConfig) {
@@ -76,9 +77,9 @@ public class ApiCommentController extends ApiBaseAction {
      */
     @GetMapping("count")
     public Object count(@LoginUser UserVo loginUser, Integer typeId, Integer valueId, Integer orderId) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("type_id", typeId);
         param.put("value_id", valueId);
         param.put("orderId", orderId);
@@ -103,9 +104,9 @@ public class ApiCommentController extends ApiBaseAction {
     public Object list(Integer typeId, Integer valueId, Integer orderId, Integer showType,
                        @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "size", defaultValue = "10") Integer size,
                        String sort, String order) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         List<CommentVo> commentList = new ArrayList();
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("type_id", typeId);
         param.put("value_id", valueId);
         param.put("orderId", orderId);
@@ -135,7 +136,7 @@ public class ApiCommentController extends ApiBaseAction {
 //            commentItem.setContent(BaseStr64.decode(commentItem.getContent()));
             commentItem.setUser_info(userService.queryObject(commentItem.getUserId()));
 
-            Map paramPicture = new HashMap();
+            Map paramPicture = Maps.newHashMap();
             paramPicture.put("comment_id", commentItem.getId());
             List<CommentPictureVo> commentPictureEntities = commentPictureService.queryList(paramPicture);
             commentItem.setPic_list(commentPictureEntities);

kmall-api/src/main/java/com/kmall/api/api/ApiCouponController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.CouponVo;
 import com.kmall.api.entity.SmsLogVo;
@@ -10,6 +11,7 @@ import com.kmall.api.service.ApiCouponService;
 import com.kmall.api.service.ApiUserCouponService;
 import com.kmall.api.service.ApiUserService;
 import com.kmall.api.util.ApiBaseAction;
+import com.kmall.common.constant.Dict;
 import com.kmall.common.entity.SysSmsLogEntity;
 import com.kmall.common.service.SysSmsLogService;
 import com.kmall.common.utils.enums.CouponTypeEnum;
@@ -48,8 +50,8 @@ public class ApiCouponController extends ApiBaseAction {
      */
     @GetMapping("enableActivity")
     public Object enableActivity() {
-        Map resultObj = new HashMap();
-        Map param = new HashMap();
+        Map resultObj = Maps.newHashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", getUserId());
         // 需要点击领取的优惠券
         Integer[] send_types = new Integer[]{CouponTypeEnum.COUPONTYPE1.getIndex()};
@@ -63,7 +65,7 @@ public class ApiCouponController extends ApiBaseAction {
             return toResponsSuccess(resultObj);
         }
 //        // 已经发放，但是没有提醒的
-//        param = new HashMap();
+//        param = Maps.newHashMap();
 //        send_types = new Integer[]{0, 2, 4, 5, 6};
 //        param.put("user_id", loginUser.getId());
 //        param.put("send_types", send_types);
@@ -81,7 +83,7 @@ public class ApiCouponController extends ApiBaseAction {
 //            return toResponsSuccess(couponVo);
 //        }
         // 无需领取的优惠券
-//        param = new HashMap();
+//        param = Maps.newHashMap();
 //        param.put("user_id", loginUser.getId());
 //        send_types = new Integer[]{3, 7};
 //        param.put("send_types", send_types);
@@ -100,7 +102,7 @@ public class ApiCouponController extends ApiBaseAction {
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser) {
 
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("enabled", true);
         param.put("unUsed", true);
@@ -120,7 +122,7 @@ public class ApiCouponController extends ApiBaseAction {
             return toResponsFail("当前优惠码无效");
         }
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("coupon_number", coupon_number);
         param.put("merchSn", getMerchSn());
         List<UserCouponVo> couponVos = apiUserCouponService.queryList(param);
@@ -162,10 +164,8 @@ public class ApiCouponController extends ApiBaseAction {
         }
         // 更新手机号码
         if (!StringUtils.isNullOrEmpty(phone)) {
-            if (!phone.equals(loginUser.getMobile())) {
-                loginUser.setMobile(phone);
-                apiUserService.update(loginUser);
-            }
+            loginUser.setMobile(phone);
+            apiUserService.update(loginUser);
         }
         /*// 判断是否是新用户
         if (!StringUtils.isNullOrEmpty(loginUser.getMobile())) {
@@ -174,23 +174,40 @@ public class ApiCouponController extends ApiBaseAction {
             loginUser.setMobile(phone);
             apiUserService.update(loginUser);
         }*/
-        // 是否领取过了
-        Map params = new HashMap();
-        params.put("user_id", loginUser.getId());
-        params.put("send_type", 4);
-        List<CouponVo> couponVos = apiCouponService.queryUserCoupons(params);
-        if (null != couponVos && couponVos.size() > 0) {
-            return toResponsFail("已经领取过，不能重复领取");
+        Boolean isCoupon = false;//false 不可以领优惠券
+        Map queryMap = Maps.newHashMap();
+        queryMap.put("store_id", getStoreId());
+        List<CouponVo> list = apiCouponService.queryList(queryMap);
+        if(null!= list && list.size()>0){
+            CouponVo couponVo = list.get(0);
+            if(couponVo.getIsAll().equalsIgnoreCase("1")){
+                isCoupon = true;
+            }
+        }else{
+            isCoupon = false;
         }
-        // 领取
-        Map couponParam = new HashMap();
-        couponParam.put("send_type", CouponTypeEnum.COUPONTYPE4.getIndex());
-        CouponVo newCouponConfig = apiCouponService.queryMaxUserEnableCoupon(couponParam);
-        if (null != newCouponConfig) {
-            UserCouponVo userCouponVo = apiCouponService.takeCoupon(newCouponConfig, loginUser.getId(), "", 0L, 1);
-            return toResponsSuccess(userCouponVo);
-        } else {
-            return toResponsFail("领取失败");
+        if(isCoupon){
+            // 是否领取过了
+            Map params = Maps.newHashMap();
+            params.put("user_id", loginUser.getId());
+            params.put("store_id", getStoreId());
+            params.put("send_type", 4);
+            List<CouponVo> couponVos = apiCouponService.queryUserCoupons(params);
+            if (null != couponVos && couponVos.size() > 0) {
+                return toResponsFail("已经领取过，不能重复领取");
+            }
+            // 领取
+            Map couponParam = Maps.newHashMap();
+            couponParam.put("send_type", CouponTypeEnum.COUPONTYPE4.getIndex());
+            CouponVo newCouponConfig = apiCouponService.queryMaxUserEnableCoupon(couponParam);
+            if (null != newCouponConfig) {
+                UserCouponVo userCouponVo = apiCouponService.takeCoupon(newCouponConfig, loginUser.getId(), "", 0L, 1);
+                return toResponsSuccess(userCouponVo);
+            } else {
+                return toResponsFail("领取失败");
+            }
+        }else{
+            return toResponsSuccess(null);
         }
     }
     /**
@@ -199,7 +216,7 @@ public class ApiCouponController extends ApiBaseAction {
     @GetMapping("checkActivit")
     public Object checkActivit(@LoginUser UserVo loginUser) {
         // 是否领取过了
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("user_id", loginUser.getId());
         params.put("send_type", 4);
         List<CouponVo> couponVos = apiCouponService.queryUserCoupons(params);
@@ -216,7 +233,7 @@ public class ApiCouponController extends ApiBaseAction {
     @GetMapping("transActivit")
     public Object transActivit(@LoginUser UserVo loginUser, String sourceKey, Long referrer) {
         // 是否领取过了
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("user_id", loginUser.getId());
         params.put("send_type", 2);
         params.put("source_key", sourceKey);
@@ -225,7 +242,7 @@ public class ApiCouponController extends ApiBaseAction {
             return toResponsObject(2, "已经领取过", couponVos);
         }
         // 领取
-        Map couponParam = new HashMap();
+        Map couponParam = Maps.newHashMap();
         couponParam.put("send_type", CouponTypeEnum.COUPONTYPE2.getIndex());
         CouponVo newCouponConfig = apiCouponService.queryMaxUserEnableCoupon(couponParam);
         if (null != newCouponConfig) {
@@ -233,7 +250,7 @@ public class ApiCouponController extends ApiBaseAction {
             List<UserCouponVo> userCouponVos = new ArrayList();
             userCouponVos.add(userCouponVo);
             //
-            params = new HashMap();
+            params = Maps.newHashMap();
             params.put("user_id", loginUser.getId());
             params.put("send_type", 2);
             params.put("source_key", sourceKey);

kmall-api/src/main/java/com/kmall/api/api/ApiFootprintController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.FootprintVo;
 import com.kmall.api.entity.UserVo;
@@ -31,7 +32,7 @@ public class ApiFootprintController extends ApiBaseAction {
         //删除当天的同一个商品的足迹
         FootprintVo footprintEntity = footprintService.queryObject(footprintId);
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("goods_id", footprintEntity.getGoods_id());
         footprintService.deleteByParam(param);
@@ -45,11 +46,11 @@ public class ApiFootprintController extends ApiBaseAction {
     public Object list(@LoginUser UserVo loginUser,
                        @RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "size", defaultValue = "10") Integer size) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
 
         Long storeId = getStoreId();
         //查询列表数据
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("page", page);
         params.put("limit", size);
         params.put("sidx", "f.id");
@@ -107,10 +108,10 @@ public class ApiFootprintController extends ApiBaseAction {
      */
     @GetMapping("glist")
     public Object glist(@LoginUser UserVo loginUser,String storeId,String checkCart) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
 
         //查询列表数据
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("sidx", "f.id");
         params.put("user_id", loginUser.getId());
         params.put("maxFoot", true);
@@ -148,10 +149,10 @@ public class ApiFootprintController extends ApiBaseAction {
     public Object sharelist(@LoginUser UserVo loginUser,
                             @RequestParam(value = "page", defaultValue = "1") Integer page,
                             @RequestParam(value = "size", defaultValue = "10") Integer size) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
 
         //查询列表数据
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("sidx", "f.id");
         params.put("order", "desc");
         params.put("referrer", loginUser.getId());

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsActivityController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.dto.GoodsActivityVo;
@@ -42,7 +43,7 @@ public class ApiGoodsActivityController extends ApiBaseAction {
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser, @RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "size", defaultValue = "10") Integer size, Integer type) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("page", page);
         param.put("limit", size);
         param.put("type", type);

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.*;
@@ -77,7 +78,7 @@ public class ApiGoodsController extends ApiBaseAction {
     @GetMapping("index")
     public Object index(@LoginUser UserVo loginUser) {
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         List<GoodsVo> goodsList = goodsService.queryList(param);
         //
         return toResponsSuccess(goodsList);
@@ -89,13 +90,13 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("sku")
     public Object sku(@LoginUser UserVo loginUser, Long goodsId) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
         GoodsVo goodsVo = goodsService.queryObjectByStoreId(goodsId, getStoreId());
         //
         List<Map> goodsSpecificationEntityList = goodsSpecificationService.queryByGoodsIdGroupByNames(goodsId);
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", goodsId);
         param.put("store_id", getStoreId());
         List<ProductVo> productEntityList = productService.queryList(param);
@@ -118,7 +119,7 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("goodsGallery")
     public Object goodsGallery(Integer goods_id) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", goods_id);
         List<GoodsGalleryVo> gallery = goodsGalleryService.queryList(param);
         return toResponsSuccess(gallery);
@@ -129,7 +130,7 @@ public class ApiGoodsController extends ApiBaseAction {
      * */
     @GetMapping("detail")
     public Object detail(Long id, Long referrer,String merchSn) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
         Long userId = getUserId();
         Long storeId = getStoreId();
@@ -140,7 +141,7 @@ public class ApiGoodsController extends ApiBaseAction {
         BrandVo brand = apiBrandService.queryObject(info.getBrand_id());
         resultObj.put("brand", brand);
 
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", id);
         param.put("store_id", getStoreId());
         List<Map> specificationList = goodsSpecificationService.queryByGoodsIdGroupByNames(id);
@@ -150,14 +151,14 @@ public class ApiGoodsController extends ApiBaseAction {
         List<GoodsGalleryVo> gallery = goodsGalleryService.queryList(param);
         resultObj.put("gallery", gallery);
 
-        Map ngaParam = new HashMap();
+        Map ngaParam = Maps.newHashMap();
         ngaParam.put("fields", "nga.value, na.name");
         ngaParam.put("sidx", "nga.id");
         ngaParam.put("order", "asc");
         ngaParam.put("goods_id", id);
         List<AttributeVo> attribute = attributeService.queryList(ngaParam);
         //
-        Map issueParam = new HashMap();
+        Map issueParam = Maps.newHashMap();
         issueParam.put("merch_sn", merchSn);
         List<GoodsIssueVo> issue = goodsIssueService.queryList(issueParam);
         //
@@ -165,23 +166,23 @@ public class ApiGoodsController extends ApiBaseAction {
         param.put("type_id", 0);
         Integer commentCount = commentService.queryTotal(param);
         List<CommentVo> hotComment = commentService.queryList(param);
-        Map commentInfo = new HashMap();
+        Map commentInfo = Maps.newHashMap();
         if (null != hotComment && hotComment.size() > 0) {
             UserVo commentUser = userService.queryObject(hotComment.get(0).getUserId());
             commentInfo.put("content", hotComment.get(0).getContent());
             commentInfo.put("add_time", DateUtils.timeToStr(hotComment.get(0).getAddTime(), DateUtils.PATTERN_YYYY_MM_DD_HH_MM));
             commentInfo.put("nickname", commentUser.getNickname());
             commentInfo.put("avatar", commentUser.getAvatar());
-            Map paramPicture = new HashMap();
+            Map paramPicture = Maps.newHashMap();
             paramPicture.put("comment_id", hotComment.get(0).getId());
             List<CommentPictureVo> commentPictureEntities = commentPictureService.queryList(paramPicture);
             commentInfo.put("pic_list", commentPictureEntities);
         }
-        Map comment = new HashMap();
+        Map comment = Maps.newHashMap();
         comment.put("count", commentCount);
         comment.put("data", commentInfo);
         //当前用户是否收藏
-        Map collectParam = new HashMap();
+        Map collectParam = Maps.newHashMap();
         collectParam.put("user_id", getUserId());
         collectParam.put("value_id", id);
         collectParam.put("type_id", 0);
@@ -205,7 +206,7 @@ public class ApiGoodsController extends ApiBaseAction {
         }
         footprintService.save(footprintEntity);
 
-        Map cartMap= new HashMap();
+        Map cartMap= Maps.newHashMap();
         cartMap.put("user_id",userId);
         cartMap.put("goods_id",info.getId());
         List<CartVo> cartVoList = cartService.queryList(cartMap);
@@ -233,12 +234,12 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("transferCoupon")
     public Object transferCoupon(@LoginUser UserVo loginUser, Long goods_id, Integer send_type, Long referrer) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         // 记录推荐人是否可以领取红包，用户登录时校验
         Long userId = getUserId();
         try {
             // 是否已经有可用的转发红包
-            Map params = new HashMap();
+            Map params = Maps.newHashMap();
             params.put("user_id", userId);
             params.put("send_type", send_type);
             params.put("unUsed", true);
@@ -246,14 +247,14 @@ public class ApiGoodsController extends ApiBaseAction {
             if ((null == enabledCouponVos || enabledCouponVos.size() == 0)
                     && null != referrer && null != userId) {
                 // 获取优惠信息提示
-                Map couponParam = new HashMap();
+                Map couponParam = Maps.newHashMap();
                 couponParam.put("enabled", true);
                 Integer[] send_types = new Integer[]{CouponTypeEnum.COUPONTYPE2.getIndex()};
                 couponParam.put("send_types", send_types);
                 List<CouponVo> couponVos = apiCouponService.queryList(couponParam);
                 if (null != couponVos && couponVos.size() > 0) {
                     CouponVo couponVo = couponVos.get(0);
-                    Map footprintParam = new HashMap();
+                    Map footprintParam = Maps.newHashMap();
                     footprintParam.put("goods_id", goods_id);
                     footprintParam.put("referrer", referrer);
                     Integer footprintNum = footprintService.queryTotal(footprintParam);
@@ -275,12 +276,12 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("category")
     public Object category(@LoginUser UserVo loginUser, Integer id) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
         CategoryVo currentCategory = categoryService.queryObject(id);
         //
         CategoryVo parentCategory = categoryService.queryObject(currentCategory.getParent_id());
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("parent_id", currentCategory.getParent_id());
         List<CategoryVo> brotherCategory = categoryService.queryList(params);
         //
@@ -296,12 +297,12 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("brand")
     public Object brand(@LoginUser UserVo loginUser, Integer id) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
         BrandVo currentBrand = apiBrandService.queryObject(id);
         //
         CategoryVo parentCategory = categoryService.queryObject(currentBrand.getCategoryId());
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("categoryId", currentBrand.getCategoryId());
         List<BrandVo> brandList = apiBrandService.queryList(params);
         //
@@ -319,7 +320,7 @@ public class ApiGoodsController extends ApiBaseAction {
                        @RequestParam(value = "page", defaultValue = "1") Integer
                                page, @RequestParam(value = "size", defaultValue = "10") Integer size,
                        String sort, String order) {
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         if(org.apache.commons.lang3.StringUtils.isNotEmpty(keyword)){
             try{
                 keyword = new String(keyword.getBytes("iso-8859-1"),"utf-8");
@@ -376,7 +377,7 @@ public class ApiGoodsController extends ApiBaseAction {
                 }
             }
             //查找二级分类的parent_id
-            Map categoryParam = new HashMap();
+            Map categoryParam = Maps.newHashMap();
             categoryParam.put("ids", categoryIds);
             categoryParam.put("fields", "parent_id");
             List<CategoryVo> parentCategoryList = categoryService.queryList(categoryParam);
@@ -386,7 +387,7 @@ public class ApiGoodsController extends ApiBaseAction {
                 parentIds.add(categoryEntity.getParent_id());
             }
             //一级分类
-            categoryParam = new HashMap();
+            categoryParam = Maps.newHashMap();
             categoryParam.put("fields", "id,name");
             categoryParam.put("order", "asc");
             categoryParam.put("sidx", "sort_order");
@@ -422,10 +423,10 @@ public class ApiGoodsController extends ApiBaseAction {
     @GetMapping("hotGoodsList")
     public Object hotGoodsList(@LoginUser UserVo loginUser, Integer categoryId,
                                String sort, String order) {
-        Map reusltObj = new HashMap();
+        Map reusltObj = Maps.newHashMap();
         //
         Long store_id = getStoreId();
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         //筛选的分类
         List<CategoryVo> filterCategory = new ArrayList();
         CategoryVo rootCategory = new CategoryVo();
@@ -449,7 +450,7 @@ public class ApiGoodsController extends ApiBaseAction {
                 categoryIds.add(goodsVo.getCategory_id());
             }
             //查找二级分类的parent_id
-            Map categoryParam = new HashMap();
+            Map categoryParam = Maps.newHashMap();
             categoryParam.put("ids", categoryIds);
             categoryParam.put("fields", "parent_id");
             List<CategoryVo> parentCategoryList = categoryService.queryList(categoryParam);
@@ -459,7 +460,7 @@ public class ApiGoodsController extends ApiBaseAction {
                 parentIds.add(categoryEntity.getParent_id());
             }
             //一级分类
-            categoryParam = new HashMap();
+            categoryParam = Maps.newHashMap();
             categoryParam.put("fields", "id,name");
             categoryParam.put("order", "asc");
             categoryParam.put("sidx", "sort_order");
@@ -495,8 +496,8 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("new")
     public Object newAction(@LoginUser UserVo loginUser) {
-        Map<String, Object> resultObj = new HashMap();
-        Map bannerInfo = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
+        Map bannerInfo = Maps.newHashMap();
         bannerInfo.put("url", "");
         bannerInfo.put("name", "坚持初心，为你寻觅世间好物");
         bannerInfo.put("img_url", "http://yanxuan.nosdn.127.net/8976116db321744084774643a933c5ce.png");
@@ -510,19 +511,19 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("hot")
     public Object hot(@LoginUser UserVo loginUser) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("ad_position_id", 4);
         List<AdVo> adVoList = apiAdService.queryList(param);
         if (null != adVoList && adVoList.size() > 0) {
-            Map bannerInfo = new HashMap();
+            Map bannerInfo = Maps.newHashMap();
             bannerInfo.put("url", "");
             bannerInfo.put("name", adVoList.get(0).getName());
             bannerInfo.put("img_url", adVoList.get(0).getImageUrl());
             resultObj.put("bannerInfo", bannerInfo);
         } else {
-            Map bannerInfo = new HashMap();
+            Map bannerInfo = Maps.newHashMap();
             bannerInfo.put("url", "");
             bannerInfo.put("name", "大家都在商城选好物");
             bannerInfo.put("img_url", "https://platform-wxmall.oss-cn-beijing.aliyuncs.com/upload/20180807/1057182334dfb2.png");
@@ -537,8 +538,8 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("related")
     public Object related(@LoginUser UserVo loginUser, Long id) {
-        Map<String, Object> resultObj = new HashMap();
-        Map param = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", id);
         param.put("fields", "related_goods_id");
         List<RelatedGoodsVo> relatedGoodsEntityList = relatedGoodsService.queryList(param);
@@ -552,7 +553,7 @@ public class ApiGoodsController extends ApiBaseAction {
             //查找同分类下的商品
             GoodsVo goodsCategory = goodsService.queryObjectByStoreId(id, getStoreId());
             if (null != goodsCategory) {
-                Map paramRelated = new HashMap();
+                Map paramRelated = Maps.newHashMap();
                 paramRelated.put("store_id", getStoreId());
                 paramRelated.put("notGoodsBizType", true);
                 paramRelated.put("fields", "a.id, a.name, a.list_pic_url, psr1.retail_price,b.id as product_id");
@@ -560,7 +561,7 @@ public class ApiGoodsController extends ApiBaseAction {
                 relatedGoods = goodsService.queryList(paramRelated);
             }
         } else {
-            Map paramRelated = new HashMap();
+            Map paramRelated = Maps.newHashMap();
             paramRelated.put("store_id", getStoreId());
             paramRelated.put("notGoodsBizType", true);
             paramRelated.put("goods_ids", relatedGoodsIds);
@@ -577,8 +578,8 @@ public class ApiGoodsController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("count")
     public Object count(@LoginUser UserVo loginUser) {
-        Map<String, Object> resultObj = new HashMap();
-        Map param = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
+        Map param = Maps.newHashMap();
         param.put("storeId", getStoreId());
         param.put("notGoodsBizType", true);
         param.put("is_delete", 0);
@@ -598,7 +599,7 @@ public class ApiGoodsController extends ApiBaseAction {
                               @RequestParam(value = "page", defaultValue = "1") Integer
                                       page, @RequestParam(value = "size", defaultValue = "10") Integer size,
                               String sort, String order) {
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("is_new", isNew);
         params.put("page", page);
         params.put("limit", size);
@@ -640,7 +641,7 @@ public class ApiGoodsController extends ApiBaseAction {
         if (null != getUserId()) {
             Long storeId = getStoreId();
             //查询列表数据
-            Map cartParam = new HashMap();
+            Map cartParam = Maps.newHashMap();
             cartParam.put("user_id", getUserId());
             cartParam.put("store_id", storeId);
             cartList = cartService.queryList(cartParam);

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsCrashController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.GoodsCrashVo;
 import com.kmall.api.entity.UserVo;
@@ -33,7 +34,7 @@ public class ApiGoodsCrashController extends ApiBaseAction {
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser, Long goodsId) {
 
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", goodsId);
         List<GoodsCrashVo> crashVos = apiGoodsCrashService.queryList(param);
         return toResponsSuccess(crashVos);

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsGroupController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.common.constant.Dict;
@@ -68,7 +69,7 @@ public class ApiGoodsGroupController extends ApiBaseAction {
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser, @RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "size", defaultValue = "10") Integer size) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("page", page);
         param.put("limit", size);
 //        param.put("sidx", "end_time");
@@ -88,13 +89,13 @@ public class ApiGoodsGroupController extends ApiBaseAction {
      */
     @GetMapping("info")
     public Object info(Long id, Long referrer) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
         Long userId = getUserId();
         Long storeId = getStoreId();
         GoodsGroupVo groupVo = apiGoodsGroupService.queryObjectByStoreId(id, storeId);
         GoodsVo info = apiGoodsService.queryObjectByStoreId(groupVo.getGoods_id(), storeId);
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", groupVo.getGoods_id());
         param.put("store_id", storeId);
         //
@@ -103,14 +104,14 @@ public class ApiGoodsGroupController extends ApiBaseAction {
         List<ProductVo> productEntityList = apiProductService.queryList(param);
         //
         List<GoodsGalleryVo> gallery = apiGoodsGalleryService.queryList(param);
-        Map ngaParam = new HashMap();
+        Map ngaParam = Maps.newHashMap();
         ngaParam.put("fields", "nga.value, na.name");
         ngaParam.put("sidx", "nga.id");
         ngaParam.put("order", "asc");
         ngaParam.put("goods_id", groupVo.getGoods_id());
         List<AttributeVo> attribute = attributeService.queryList(ngaParam);
         //
-        Map issueParam = new HashMap();
+        Map issueParam = Maps.newHashMap();
 //        issueParam.put("goods_id", groupVo.getGoods_id());
         List<GoodsIssueVo> issue = goodsIssueService.queryList(issueParam);
         //
@@ -118,23 +119,23 @@ public class ApiGoodsGroupController extends ApiBaseAction {
         param.put("type_id", 0);
         Integer commentCount = commentService.queryTotal(param);
         List<CommentVo> hotComment = commentService.queryList(param);
-        Map commentInfo = new HashMap();
+        Map commentInfo = Maps.newHashMap();
         if (null != hotComment && hotComment.size() > 0) {
             UserVo commentUser = userService.queryObject(hotComment.get(0).getUserId());
             commentInfo.put("content", hotComment.get(0).getContent());
             commentInfo.put("add_time", DateUtils.timeToStr(hotComment.get(0).getAddTime(), DateUtils.DATE_PATTERN));
             commentInfo.put("nickname", commentUser.getNickname());
             commentInfo.put("avatar", commentUser.getAvatar());
-            Map paramPicture = new HashMap();
+            Map paramPicture = Maps.newHashMap();
             paramPicture.put("comment_id", hotComment.get(0).getId());
             List<CommentPictureVo> commentPictureEntities = commentPictureService.queryList(paramPicture);
             commentInfo.put("pic_list", commentPictureEntities);
         }
-        Map comment = new HashMap();
+        Map comment = Maps.newHashMap();
         comment.put("count", commentCount);
         comment.put("data", commentInfo);
         //当前用户是否收藏
-        Map collectParam = new HashMap();
+        Map collectParam = Maps.newHashMap();
         collectParam.put("user_id", getUserId());
         collectParam.put("value_id", id);
         collectParam.put("type_id", 2);

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsGroupOpenController.java

@@ -1,6 +1,7 @@
 package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.*;
@@ -67,7 +68,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("list")
     public Object list(Integer type, Integer groupId) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("sidx", "open_time");
         param.put("order", "desc");
         param.put("group_id", groupId);
@@ -87,7 +88,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("attendList")
     public Object attendList(Long openId) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("open_id", openId);
         param.put("attend_statuss", new Integer[]{1, 2, 3});
         //查询列表数据
@@ -118,7 +119,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
      */
     @GetMapping("myList")
     public Object myList(@LoginUser UserVo loginUser) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("sidx", "open_time");
         param.put("order", "desc");
         param.put("user_id", getUserId());
@@ -132,13 +133,13 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
      */
     @GetMapping("groupInfo")
     public Object groupInfo(Long id, Long referrer) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         //
         Long userId = getUserId();
         Long storeId = getStoreId();
         GoodsGroupVo groupVo = apiGoodsGroupService.queryObjectByStoreId(id, storeId);
         GoodsVo info = apiGoodsService.queryObjectByStoreId(groupVo.getGoods_id(), storeId);
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("goods_id", groupVo.getGoods_id());
         param.put("store_id", getStoreId());
         //
@@ -147,14 +148,14 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
         List<ProductVo> productEntityList = apiProductService.queryList(param);
         //
         List<GoodsGalleryVo> gallery = apiGoodsGalleryService.queryList(param);
-        Map ngaParam = new HashMap();
+        Map ngaParam = Maps.newHashMap();
         ngaParam.put("fields", "nga.value, na.name");
         ngaParam.put("sidx", "nga.id");
         ngaParam.put("order", "asc");
         ngaParam.put("goods_id", groupVo.getGoods_id());
         List<AttributeVo> attribute = attributeService.queryList(ngaParam);
         //
-        Map issueParam = new HashMap();
+        Map issueParam = Maps.newHashMap();
 //        issueParam.put("goods_id", groupVo.getGoods_id());
         List<GoodsIssueVo> issue = goodsIssueService.queryList(issueParam);
         //
@@ -162,23 +163,23 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
         param.put("type_id", 0);
         Integer commentCount = commentService.queryTotal(param);
         List<CommentVo> hotComment = commentService.queryList(param);
-        Map commentInfo = new HashMap();
+        Map commentInfo = Maps.newHashMap();
         if (null != hotComment && hotComment.size() > 0) {
             UserVo commentUser = userService.queryObject(hotComment.get(0).getUserId());
             commentInfo.put("content", hotComment.get(0).getContent());
             commentInfo.put("add_time", DateUtils.timeToStr(hotComment.get(0).getAddTime(), DateUtils.DATE_PATTERN));
             commentInfo.put("nickname", commentUser.getNickname());
             commentInfo.put("avatar", commentUser.getAvatar());
-            Map paramPicture = new HashMap();
+            Map paramPicture = Maps.newHashMap();
             paramPicture.put("comment_id", hotComment.get(0).getId());
             List<CommentPictureVo> commentPictureEntities = commentPictureService.queryList(paramPicture);
             commentInfo.put("pic_list", commentPictureEntities);
         }
-        Map comment = new HashMap();
+        Map comment = Maps.newHashMap();
         comment.put("count", commentCount);
         comment.put("data", commentInfo);
         //当前用户是否收藏
-        Map collectParam = new HashMap();
+        Map collectParam = Maps.newHashMap();
         collectParam.put("user_id", getUserId());
         collectParam.put("value_id", id);
         collectParam.put("type_id", 2);
@@ -202,7 +203,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
         }
         footprintService.save(footprintEntity);
         // 是否已经有开团了
-        Map openParam = new HashMap();
+        Map openParam = Maps.newHashMap();
         openParam.put("group_id", id);
         openParam.put("attend_status", 1);
         List<GoodsGroupOpenVo> groupOpenVos = apiGoodsGroupOpenService.queryList(openParam);
@@ -301,7 +302,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
      */
     @GetMapping("groupcheck")
     public Object groupcheck(@LoginUser UserVo loginUser, Long groupId, Long productId, Integer number) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         // 默认全国包邮
         BigDecimal freightPrice = Constant.ZERO;
         Long storeId = getStoreId();
@@ -315,7 +316,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
         BigDecimal orderPrice = groupVo.getRetail_min_price().multiply(new BigDecimal(number));
 
         //获取可用的优惠券信息
-        Map usercouponMap = new HashMap();
+        Map usercouponMap = Maps.newHashMap();
         usercouponMap.put("user_id", loginUser.getId());
 
         resultObj.put("freightPrice", freightPrice);
@@ -327,7 +328,7 @@ public class ApiGoodsGroupOpenController extends ApiBaseAction {
         resultObj.put("productVo", productVo);
         resultObj.put("goodsVo", goodsVo);
         // 地址
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = Maps.newHashMap();
         map.put("is_default", 1);
         map.put("user_id", loginUser.getId());
         List<AddressVo> list = apiAddressService.queryList(map);

kmall-api/src/main/java/com/kmall/api/api/ApiHelpIssueController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.entity.HelpIssueVo;
 import com.kmall.api.entity.HelpTypeVo;
@@ -49,7 +50,7 @@ public class ApiHelpIssueController extends ApiBaseAction {
     @IgnoreAuth
     public Object issueList(Long type_id,String merchSn) {
 
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("type_id", type_id);
         params.put("merchSn",merchSn);
         List<HelpIssueVo> helpIssueList = helpIssueService.queryList(params);

kmall-api/src/main/java/com/kmall/api/api/ApiIndexController.java

@@ -2,6 +2,7 @@ package com.kmall.api.api;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.dto.IdCardMsgVo;
@@ -54,12 +55,12 @@ public class ApiIndexController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("index")
     public Object index() {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         // init
         Long userId = getUserId();
         Long storeId = getStoreId();
         //
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
 //        param.put("ad_position_ids", new Integer[]{1, 2, 3});
         param.put("ad_position_ids", new Integer[]{1});//用户注册
         param.put("storeId",storeId);
@@ -77,13 +78,13 @@ public class ApiIndexController extends ApiBaseAction {
         }
         resultObj.put("banner", banner);
         //
-        param = new HashMap();
+        param = Maps.newHashMap();
         param.put("sidx", "sort_order ");
         param.put("order", "asc ");
         List<ChannelVo> channel = channelService.queryList(param);
         resultObj.put("channel", channel);
         // 超级折扣，需要门店过滤
-        param = new HashMap();
+        param = Maps.newHashMap();
         param.put("fields", "distinct a.id,a.name,a.goods_brief,a.list_pic_url,psr1.retail_price,psr1.market_price,b.id as product_id,psr1.stock_num");
         param.put("is_hot", "1");
         param.put("offset", 0);
@@ -96,7 +97,7 @@ public class ApiIndexController extends ApiBaseAction {
         List<CartVo> cartList = new ArrayList();
         if (null != userId) {
             //查询列表数据
-            Map cartParam = new HashMap();
+            Map cartParam = Maps.newHashMap();
             cartParam.put("user_id", userId);
             cartParam.put("store_id", storeId);
             cartList = cartService.queryList(cartParam);
@@ -118,10 +119,10 @@ public class ApiIndexController extends ApiBaseAction {
      */
     @GetMapping("ucenterIndex")
     public Object ucenterIndex() {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         Long userId = getUserId();
         // 统计个人中心订单数据
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("user_id", userId);
         Map countMap = apiOrderService.queryUcenterMap(params);
         resultObj.put("countMap", countMap);

kmall-api/src/main/java/com/kmall/api/api/ApiOrderController.java

@@ -2,6 +2,7 @@ package com.kmall.api.api;
 
 import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.common.constant.Dict;
@@ -68,7 +69,7 @@ public class ApiOrderController extends ApiBaseAction {
                        @RequestParam(value = "size", defaultValue = "10") Integer size,
                        Integer evaluate_status, Integer order_status) {
         //
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         params.put("user_id", loginUser.getId());
         params.put("page", page);
         params.put("order_status", order_status);
@@ -88,7 +89,7 @@ public class ApiOrderController extends ApiBaseAction {
         int total = orderService.queryTotal(query);
         //
         for (OrderVo item : orderEntityList) {
-            Map orderGoodsParam = new HashMap();
+            Map orderGoodsParam = Maps.newHashMap();
             orderGoodsParam.put("order_id", item.getId());
             if(item.getRefundStatus() !=null){
                 if(item.getRefundStatus().equalsIgnoreCase(Dict.RefundStatus.item_1.getItem()) ||
@@ -119,13 +120,13 @@ public class ApiOrderController extends ApiBaseAction {
      */
     @GetMapping("detail")
     public Object detail(@LoginUser UserVo loginUser, Long orderId) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         //
         OrderVo orderInfo = orderService.queryObject(orderId);
         if (null == orderInfo) {
             return toResponsObject(400, "订单不存在", "");
         }
-        Map orderGoodsParam = new HashMap();
+        Map orderGoodsParam = Maps.newHashMap();
         orderGoodsParam.put("order_id", orderId);
         //订单的商品
         List<OrderGoodsVo> orderGoods = orderGoodsService.queryList(orderGoodsParam);
@@ -142,7 +143,7 @@ public class ApiOrderController extends ApiBaseAction {
         if (entity != null) {
             if((orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_10.getItem()) ||
                     orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_02.getItem()))){
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 map.put("AcceptStation", PrintTicketPropertiesBuilder.instance().getAddress()
                         + "送达" + apiStoreService.queryObject(orderInfo.getStore_id()).getStoreAddress()
                         + ";交易完成，用户已提走");
@@ -154,7 +155,7 @@ public class ApiOrderController extends ApiBaseAction {
                         mapList = (List<Map>) Traces.get("Traces");
                         String State = (String) Traces.get("State"); //物流状态：2-在途中,3-签收,4-问题件
                         if (Dict.logisticsStatus.item_0.getItem().equalsIgnoreCase(State)) {
-                            Map noDataMap = new HashMap();
+                            Map noDataMap = Maps.newHashMap();
                             noDataMap.put("AcceptTime", "");
                             noDataMap.put("AcceptStation", Traces.get("Reason"));
                             mapList.add(noDataMap);
@@ -163,31 +164,31 @@ public class ApiOrderController extends ApiBaseAction {
                 }
             }
             if (Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsCustomsSend()) && entity.getShipmentStartTime() != null) {
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getShipmentStartTime()));
                 map.put("AcceptStation", "订单已出库");
                 mapList.add(map);
             }
             if (Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsCustomsSend())) {
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getCustomsSuccTime()));
                 map.put("AcceptStation", "订单清关完成，等待仓库发货");
                 mapList.add(map);
             }
             if (Dict.isSend.item_0.getItem().equalsIgnoreCase(entity.getIsCustomsSend())) {
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getCustomsSuccTime()));
                 map.put("AcceptStation", "订单清关失败");
                 mapList.add(map);
             }
             if (Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsPaymentSend())) {
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getPaySuccTime()));
                 map.put("AcceptStation", "订单支付成功");
                 mapList.add(map);
             }
             if (Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsAddOrderSend())) {
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getAddOrderSuccTime()));
                 map.put("AcceptStation", "客户下单成功");
                 mapList.add(map);
@@ -209,7 +210,7 @@ public class ApiOrderController extends ApiBaseAction {
         for(int i=0;i<orderIds.length;i++){
             orderIdList.add(orderIds[i]);
         }
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
 
         List<OrderVo> orderVoList = orderService.queryObjectByIdList(orderIdList);
         BigDecimal actualPrice = Constant.ZERO;
@@ -315,8 +316,8 @@ public class ApiOrderController extends ApiBaseAction {
      */
     @GetMapping("getLogistics")
     public Object getLogistics(Long orderId) {
-        Map resultObj = new HashMap();
-        Map map = new HashMap();
+        Map resultObj = Maps.newHashMap();
+        Map map = Maps.newHashMap();
         OrderVo orderInfo = orderService.queryObject(orderId);
         if (null == orderInfo) {
             return toResponsObject(400, "订单不存在", "");

kmall-api/src/main/java/com/kmall/api/api/ApiPayController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.cus.pay.data.open.CusPayDataOpenVo;
@@ -107,7 +108,7 @@ public class ApiPayController extends ApiBaseAction {
         String nonceStr = CharUtil.getRandomString(32);
 
         //https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=3
-        Map<Object, Object> resultObj = new HashMap();
+        Map<Object, Object> resultObj = Maps.newHashMap();
 
         try {
             Map<Object, Object> parame = new TreeMap<>();

kmall-api/src/main/java/com/kmall/api/api/ApiRegionController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.common.cache.RegionCacheUtil;
 import com.kmall.api.entity.RegionVo;
@@ -129,7 +130,7 @@ public class ApiRegionController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("regionIdsByNames")
     public Object regionIdsByNames(String provinceName, String cityName, String districtName) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         Integer provinceId = 0;
         Integer cityId = 0;
         Integer districtId = 0;

kmall-api/src/main/java/com/kmall/api/api/ApiSearchController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.KeywordsVo;
@@ -39,8 +40,8 @@ public class ApiSearchController extends ApiBaseAction {
      */
     @GetMapping("index")
     public Object index(@LoginUser UserVo loginUser) {
-        Map<String, Object> resultObj = new HashMap();
-        Map param = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
+        Map param = Maps.newHashMap();
         param.put("is_default", 1);
         param.put("page", 1);
         param.put("limit", 1);
@@ -50,7 +51,7 @@ public class ApiSearchController extends ApiBaseAction {
         //取出输入框默认的关键词
         KeywordsVo defaultKeyword = null != keywordsEntityList && keywordsEntityList.size() > 0 ? keywordsEntityList.get(0) : null;
         //取出热闹关键词
-        param = new HashMap();
+        param = Maps.newHashMap();
         param.put("fields", "distinct keyword,is_hot");
         param.put("page", 1);
         param.put("limit", 10);
@@ -59,7 +60,7 @@ public class ApiSearchController extends ApiBaseAction {
         Query query = new Query(param);
         List<Map> hotKeywordList = keywordsService.hotKeywordList(query);
         //
-        param = new HashMap();
+        param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("fields", "distinct keyword");
         param.put("page", 1);
@@ -88,7 +89,7 @@ public class ApiSearchController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("helper")
     public Object helper(@LoginUser UserVo loginUser, String keyword) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("fields", "distinct keyword");
         param.put("keyword", keyword);
         param.put("limit", 10);

kmall-api/src/main/java/com/kmall/api/api/ApiTopicController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.TopicVo;
@@ -35,7 +36,7 @@ public class ApiTopicController extends ApiBaseAction {
     @GetMapping("list")
     public Object list(@LoginUser UserVo loginUser, @RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "size", defaultValue = "10") Integer size) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("page", page);
         param.put("limit", size);
         param.put("sidx", "id");
@@ -63,7 +64,7 @@ public class ApiTopicController extends ApiBaseAction {
     @IgnoreAuth
     @GetMapping("related")
     public Object related(@LoginUser UserVo loginUser, Integer id) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("limit", 4);
         List<TopicVo> topicEntities = topicService.queryList(param);
         return toResponsSuccess(topicEntities);

kmall-api/src/main/java/com/kmall/api/api/ApiUserController.java

@@ -42,7 +42,7 @@ public class ApiUserController extends ApiBaseAction {
     /*@IgnoreAuth
     @GetMapping("info")
     public Object info(String mobile) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("mobile", mobile);
         UserVo user = userService.queryByMobile(mobile);
         user.setPassword("");
@@ -93,6 +93,8 @@ public class ApiUserController extends ApiBaseAction {
             }else{
                 smsLog.setSendStatus(0);
                 smsLog.setReturnMsg(vo.getMsg());
+                smsLog.setStoreId(getStoreId().intValue());
+                smsLog.setMerchSn(getMerchSn());
                 smsLogService.sendSms(smsLog);
                 return toResponsFail("短信发送失败："+vo.getMsg());
             }

kmall-api/src/main/java/com/kmall/api/api/wxGlobal/ApiWxGlobalPayController.java

@@ -1,5 +1,6 @@
 package com.kmall.api.api.wxGlobal;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.common.constant.Dict;
@@ -103,7 +104,7 @@ public class ApiWxGlobalPayController extends ApiBaseAction {
             actual_price = actual_price.add(orderInfo.getActual_price());
         }
         String nonceStr = CharUtil.getRandomString(32);
-        Map<Object, Object> resultObj = new HashMap();
+        Map<Object, Object> resultObj = Maps.newHashMap();
 
         try {
             //订单的商品

kmall-api/src/main/java/com/kmall/api/entity/OrderVo.java

@@ -1,6 +1,7 @@
 package com.kmall.api.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.collect.Maps;
 import com.kmall.api.dto.GeometryMarker;
 import org.apache.commons.lang.StringUtils;
 
@@ -739,7 +740,7 @@ public class OrderVo implements Serializable {
 
     //
     public Map getHandleOption() {
-        handleOption = new HashMap();
+        handleOption = Maps.newHashMap();
         handleOption.put("cancel", false);//取消操作
         handleOption.put("delete", false);//删除操作
         handleOption.put("pay", false);//支付操作

kmall-api/src/main/java/com/kmall/api/service/ApiCartService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.dao.ApiCartMapper;
 import com.kmall.api.dao.ApiGoodsCrashMapper;
 import com.kmall.api.dao.ApiGoodsMapper;
@@ -56,11 +57,11 @@ public class ApiCartService {
         cartDao.save(cart);
         // 更新购物车搭配减价
         // 判断购物车中是否存在此规格商品
-        Map cartParam = new HashMap();
+        Map cartParam = Maps.newHashMap();
         cartParam.put("user_id", cart.getUser_id());
         List<CartVo> cartInfoList = cartDao.queryList(cartParam);
         // 是否有搭配减价
-        Map crashParam = new HashMap();
+        Map crashParam = Maps.newHashMap();
         List<Long> goods_ids = new ArrayList();
         List<CartVo> cartUpdateList = new ArrayList();
         if(cartInfoList != null && cartInfoList.size() > 0) {
@@ -132,11 +133,11 @@ public class ApiCartService {
      * @param goods_id
      */
     public Map addByGoodsId(Long user_id, Long goods_id, Long store_id) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = Maps.newHashMap();
         resultObj.put("errno", 0);
         resultObj.put("errmsg", "添加成功");
         // 判断购物车中是否存在此规格商品
-        Map cartParam = new HashMap();
+        Map cartParam = Maps.newHashMap();
         cartParam.put("user_id", user_id);
         cartParam.put("goods_id", goods_id);
         List<CartVo> cartInfoList = cartDao.queryList(cartParam);

kmall-api/src/main/java/com/kmall/api/service/ApiCouponService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.common.constant.Dict;
 import com.kmall.api.dao.ApiCouponMapper;
 import com.kmall.api.dao.ApiUserCouponMapper;
@@ -91,7 +92,7 @@ public class ApiCouponService {
     public CouponVo matchShippingSign(Long userId, BigDecimal goodsTotalPrice) {
         CouponVo result = new CouponVo();
         //
-        Map couponParam = new HashMap();
+        Map couponParam = Maps.newHashMap();
         couponParam.put("enabled", true);
         Integer[] send_types = new Integer[]{7};
         couponParam.put("send_types", send_types);
@@ -149,7 +150,7 @@ public class ApiCouponService {
     public BigDecimal matchShipping(Long userId, BigDecimal goodsTotalPrice) {
         BigDecimal result = new BigDecimal(10);
         //
-        Map couponParam = new HashMap();
+        Map couponParam = Maps.newHashMap();
         couponParam.put("enabled", true);
         Integer[] send_types = new Integer[]{7};
         couponParam.put("send_types", send_types);
@@ -176,7 +177,7 @@ public class ApiCouponService {
     public CouponVo matchFullSub(Long userId, BigDecimal goodsTotalPrice) {
         CouponVo result = new CouponVo();
         //
-        Map couponParam = new HashMap();
+        Map couponParam = Maps.newHashMap();
         couponParam.put("enabled", true);
         // 获取优惠信息提示 满减
         Integer[] send_types = new Integer[]{0};
@@ -212,7 +213,7 @@ public class ApiCouponService {
     public CouponVo matchFullSubSign(Long userId, BigDecimal goodsTotalPrice) {
         CouponVo result = new CouponVo();
         //
-        Map couponParam = new HashMap();
+        Map couponParam = Maps.newHashMap();
         couponParam.put("enabled", true);
         // 获取优惠信息提示 满减
         Integer[] send_types = new Integer[]{0};

kmall-api/src/main/java/com/kmall/api/service/ApiGoodsGroupOpenService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.dao.*;
 import com.kmall.api.entity.*;
 import com.kmall.api.util.CommonUtil;
@@ -79,7 +80,7 @@ public class ApiGoodsGroupOpenService {
     @Transactional
     public Map openGroup(Long groupId, Long productId, String postscript,
                          Integer number, Long userId, Long addressId, Long storeId, String delivery_remark) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         // 开团
         GoodsGroupVo groupVo = apiGoodsGroupMapper.queryObject(groupId);
         GoodsVo goodsVo = apiGoodsMapper.queryObjectByStoreId(groupVo.getGoods_id(), storeId);
@@ -179,7 +180,7 @@ public class ApiGoodsGroupOpenService {
         resultObj.put("errno", 0);
         resultObj.put("errmsg", "订单提交成功");
         //
-        Map orderInfoMap = new HashMap();
+        Map orderInfoMap = Maps.newHashMap();
         orderInfoMap.put("orderInfo", orderInfo);
         //
         resultObj.put("data", orderInfoMap);
@@ -192,7 +193,7 @@ public class ApiGoodsGroupOpenService {
     @Transactional
     public Map attendGroup(Long openId, Long productId, String postscript,
                            Integer number, Long userId, Long addressId, String delivery_remark) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         // 开团
         GoodsGroupOpenVo openVo = apiGoodsGroupOpenMapper.queryObject(openId);
         GoodsGroupVo groupVo = apiGoodsGroupMapper.queryObject(openVo.getGroup_id());
@@ -267,7 +268,7 @@ public class ApiGoodsGroupOpenService {
         resultObj.put("errno", 0);
         resultObj.put("errmsg", "订单提交成功");
         //
-        Map orderInfoMap = new HashMap();
+        Map orderInfoMap = Maps.newHashMap();
         orderInfoMap.put("orderInfo", orderInfo);
         //
         resultObj.put("data", orderInfoMap);

kmall-api/src/main/java/com/kmall/api/service/ApiGoodsSpecificationService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.dao.ApiGoodsSpecificationMapper;
 import com.kmall.api.entity.GoodsSpecificationVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +54,7 @@ public class ApiGoodsSpecificationService {
 
     public String[] queryNamesByIds(String[] ids) {
         String[] goodsSepcifitionValue = null;
-        Map specificationParam = new HashMap();
+        Map specificationParam = Maps.newHashMap();
         specificationParam.put("ids", ids);
         List<GoodsSpecificationVo> specificationEntities = queryList(specificationParam);
         goodsSepcifitionValue = new String[specificationEntities.size()];
@@ -67,7 +68,7 @@ public class ApiGoodsSpecificationService {
      * 按规格名称分组
      */
     public List<Map> queryByGoodsIdGroupByNames(Long goodsId) {
-        Map specificationParam = new HashMap();
+        Map specificationParam = Maps.newHashMap();
         specificationParam.put("fields", "gs.*, s.name");
         specificationParam.put("goods_id", goodsId);
         specificationParam.put("specification", true);
@@ -89,7 +90,7 @@ public class ApiGoodsSpecificationService {
             }
             //
             if (null == tempList) {
-                Map temp = new HashMap();
+                Map temp = Maps.newHashMap();
                 temp.put("specification_id", specItem.getSpecification_id());
                 temp.put("name", specItem.getName());
                 tempList = new ArrayList();

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -2,6 +2,7 @@ package com.kmall.api.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
 import com.kmall.common.constant.Dict;
 import com.kmall.api.dao.*;
 import com.kmall.api.dto.IdCardMsgVo;
@@ -99,7 +100,7 @@ public class ApiOrderService {
 
     @Transactional
     public void cancelOrder(OrderVo order) {
-        Map orderGoodsParam = new HashMap();
+        Map orderGoodsParam = Maps.newHashMap();
         orderGoodsParam.put("order_id", order.getId());
         //订单的商品
         List<OrderGoodsVo> goodsList = apiOrderGoodsMapper.queryList(orderGoodsParam);
@@ -148,7 +149,7 @@ public class ApiOrderService {
 
     @Transactional
     public Map submit(JSONObject jsonParam, UserVo loginUser, Long storeId) {
-        Map resultObj = new HashMap();
+        Map resultObj = Maps.newHashMap();
         AddressVo addressVo = jsonParam.getObject("checkedAddress", AddressVo.class);
         if (addressVo == null) {
             resultObj.put("errno", 400);
@@ -187,7 +188,7 @@ public class ApiOrderService {
         }
 
         //获取要购买的商品
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", loginUser.getId());
         param.put("store_id", storeId);
         param.put("checked", 1);
@@ -333,7 +334,7 @@ public class ApiOrderService {
                         if(goodsVo==null){
                             throw new RRException("订单提交失败：商品不存在");
                         }
-                        OrderGoodsVo orderGoodsVo = setOrderGoodsVo(orderInfo, goodsItem,goodsVo);
+                        OrderGoodsVo orderGoodsVo = setOrderGoodsVo(orderInfo, goodsItem, goodsVo);
                         apiOrderGoodsMapper.save(orderGoodsVo);
                     }
                 }
@@ -360,7 +361,7 @@ public class ApiOrderService {
             resultObj.put("errno", 0);
             resultObj.put("errmsg", "订单提交成功");
             //
-            Map orderInfoMap = new HashMap();
+            Map orderInfoMap = Maps.newHashMap();
             orderInfoMap.put("orderInfo", orderInfoList);
             resultObj.put("data", orderInfoMap);
 
@@ -426,7 +427,7 @@ public class ApiOrderService {
         }
 
         /*// 获取优惠信息提示
-        Map couponParam = new HashMap();
+        Map couponParam = Maps.newHashMap();
         couponParam.put("enabled", true);
         Integer[] send_types = new Integer[]{7};
         couponParam.put("send_types", send_types);
@@ -613,7 +614,7 @@ public class ApiOrderService {
             paras.add(new TemplateData("keyword1", orderInfo.getMerchOrderSn(), "#000000"));
 
             //订单的商品
-            Map orderGoodsParam = new HashMap();
+            Map orderGoodsParam = Maps.newHashMap();
             orderGoodsParam.put("order_id", orderInfo.getId());
             List<OrderGoodsVo> orderGoods = apiOrderGoodsMapper.queryList(orderGoodsParam);
             String body = "";
@@ -656,7 +657,7 @@ public class ApiOrderService {
             paras.add(new TemplateData("keyword2", DateUtils.format(groupOpenVo.getOpen_time(), DateUtils.DATE_TIME_PATTERN), "#000000"));
 
             //订单的商品
-            Map orderGoodsParam = new HashMap();
+            Map orderGoodsParam = Maps.newHashMap();
             orderGoodsParam.put("order_id", orderInfo.getId());
             List<OrderGoodsVo> orderGoods = apiOrderGoodsMapper.queryList(orderGoodsParam);
             String body = "";
@@ -670,7 +671,7 @@ public class ApiOrderService {
             }
             paras.add(new TemplateData("keyword3", body, "#000000"));
             // 团成员
-            Map groupParam = new HashMap();
+            Map groupParam = Maps.newHashMap();
             groupParam.put("open_id", orderInfo.getActivity_id());
             List<GoodsGroupOpenDetailVo> openDetailVos = apiGoodsGroupOpenDetailMapper.queryList(groupParam);
             String attendMember = "";

kmall-api/src/main/java/com/kmall/api/service/ApiPayService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.dao.ApiOrderExceptionRecordMapper;
 import com.kmall.api.dao.ApiOrderProcessRecordMapper;
 import com.kmall.api.dao.ApiOrderRefundMapper;
@@ -72,7 +73,7 @@ public class ApiPayService {
             orderInfo.setOrder_status(Integer.parseInt(Dict.orderStatus.item_100.getItem()));
             orderService.update(orderInfo);
 
-            Map map = new HashMap();
+            Map map = Maps.newHashMap();
             map.put("orderSn", orderInfo.getOrder_sn());
             List<PayerChildOrderRealEntity> list = payerChildOrderRealService.queryList(map);
             PayerChildOrderRealEntity entity = new PayerChildOrderRealEntity();
@@ -131,6 +132,8 @@ public class ApiPayService {
                 if((Dict.orderStatus.item_100.getItem().equalsIgnoreCase(orderInfo.getOrder_status()+"")
                         && Dict.payStatus.item_1.getItem().equalsIgnoreCase(orderInfo.getPay_status()+""))
                         || (Dict.orderStatus.item_0.getItem().equalsIgnoreCase(orderInfo.getOrder_status()+"")
+                        && Dict.payStatus.item_0.getItem().equalsIgnoreCase(orderInfo.getPay_status() + ""))
+                        || (Dict.orderStatus.item_101.getItem().equalsIgnoreCase(orderInfo.getOrder_status()+"")
                         && Dict.payStatus.item_0.getItem().equalsIgnoreCase(orderInfo.getPay_status() + ""))) {
 
                     OrderProcessRecordEntity processRecordEntity = orderProcessRecordMapper.queryObjectByOrderSn(orderInfo.getOrder_sn());
@@ -162,7 +165,8 @@ public class ApiPayService {
                     orderInfo.setPay_status(Integer.parseInt(Dict.payStatus.item_2.getItem()));
                     orderInfo.setPay_time(timeEnd);//微信下单完成时间
                     if (orderInfo.getOrder_status() == Integer.parseInt(Dict.orderStatus.item_100.getItem()) ||
-                            orderInfo.getOrder_status() == Integer.parseInt(Dict.orderStatus.item_0.getItem())) {
+                            orderInfo.getOrder_status() == Integer.parseInt(Dict.orderStatus.item_0.getItem()) ||
+                            orderInfo.getOrder_status() == Integer.parseInt(Dict.orderStatus.item_101.getItem())) {
                         orderInfo.setOrder_status(Integer.parseInt(Dict.orderStatus.item_201.getItem()));
                     }
                     orderService.update(orderInfo);
@@ -178,7 +182,7 @@ public class ApiPayService {
                         openVo.setAttend_num(openVo.getAttend_num() + 1);
                         if (openVo.getMin_open_group() <= openVo.getAttend_num()) { // 一人拼团，直接结束
                             openVo.setAttend_status(2);
-                            Map param = new HashMap();
+                            Map param = Maps.newHashMap();
                             param.put("open_id", openDetailVo.getOpen_id());
                             apiGoodsGroupOpenDetailService.updateComplete(param);
                         } else {

kmall-api/src/main/java/com/kmall/api/service/ApiUserCouponService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.common.constant.Dict;
 import com.kmall.api.dao.ApiUserCouponMapper;
 import com.kmall.api.entity.UserCouponVo;
@@ -60,7 +61,7 @@ public class ApiUserCouponService {
      * @return
      */
     public List<UserCouponVo> signUserCouponList(Long userId,String merchSn, BigDecimal goodsTotalPrice) {
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", userId);
         param.put("unUsed", true);
         param.put("enabled", true);
@@ -89,7 +90,7 @@ public class ApiUserCouponService {
      */
     public List<UserCouponVo> matchUserCouponList(Long userId, String merchSn, BigDecimal goodsTotalPrice) {
         List<UserCouponVo> result = new ArrayList();
-        Map param = new HashMap();
+        Map param = Maps.newHashMap();
         param.put("user_id", userId);
         param.put("unUsed", true);
         param.put("enabled", true);

kmall-api/src/main/java/com/kmall/api/service/TokenService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.api.cache.UserTokenCache;
 import com.kmall.api.entity.TokenEntity;
 import com.kmall.common.utils.CharUtil;
@@ -59,7 +60,7 @@ public class TokenService {
             UserTokenCache.putUserToken(tokenEntity);
         }
 
-        Map<String, Object> map = new HashMap();
+        Map<String, Object> map = Maps.newHashMap();
         map.put("token", token);
         map.put("expire", EXPIRE);
 

kmall-api/src/main/java/com/kmall/api/service/wxGlobal/ApiWxGlobalPayService.java

@@ -1,5 +1,6 @@
 package com.kmall.api.service.wxGlobal;
 
+import com.google.common.collect.Maps;
 import com.kmall.common.constant.Dict;
 import com.kmall.api.dao.*;
 import com.kmall.api.entity.*;
@@ -68,7 +69,7 @@ public class ApiWxGlobalPayService {
             orderInfo.setPay_status(Integer.parseInt(Dict.payStatus.item_1.getItem())); // 付款中
             orderService.update(orderInfo);
 
-            Map map = new HashMap();
+            Map map = Maps.newHashMap();
             map.put("orderSn", orderInfo.getOrder_sn());
             List<PayerChildOrderRealEntity> list = payerChildOrderRealService.queryList(map);
             PayerChildOrderRealEntity entity = new PayerChildOrderRealEntity();

kmall-api/src/main/resources/mybatis/mapper/ApiCouponMapper.xml

@@ -33,6 +33,9 @@
     <select id="queryList" resultMap="couponMap">
         select * from mall_coupon a
         where 1 = 1
+        <if test="store_id != null">
+            and a.`store_id` = #{store_id}
+        </if>
         <if test="send_types != null">
             and send_type in
             <foreach item="item" collection="send_types" open="(" separator="," close=")">
@@ -65,6 +68,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="store_id != null">
+            and a.`store_id` = #{store_id}
+        </if>
         <if test="enabled != null and enabled == true">
             and a.use_end_date >= now()
             and now() >= a.use_start_date
@@ -79,6 +85,9 @@
         <if test="user_id != null">
             and b.`user_id` = #{user_id}
         </if>
+        <if test="store_id != null">
+            and a.`store_id` = #{store_id}
+        </if>
         <if test="send_type != null">
             and a.send_type = #{send_type}
         </if>

kmall-api/src/main/resources/mybatis/mapper/ApiGoodsMapper.xml

@@ -101,6 +101,7 @@
 
     <select id="queryObjectByStoreId" resultMap="goodsMap">
         select
+        a.sku,
         a.id,
         psr1.category_id,
         a.goods_sn,

kmall-common/src/main/java/com/kmall/common/utils/RRExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.kmall.common.utils;
 
+import com.google.common.collect.Maps;
 import org.apache.shiro.authz.AuthorizationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +54,7 @@ public class RRExceptionHandler {
 
     @ExceptionHandler(ApiRRException.class)
     public Object handleApiRRException(ApiRRException e) {
-        HashMap result = new HashMap();
+        HashMap result = Maps.newHashMap();
         result.put("errno", e.getErrno());
         result.put("errmsg", e.getErrmsg());
         return result;

kmall-common/src/main/java/com/kmall/common/utils/TreeUtils.java

@@ -12,6 +12,7 @@
  */
 package com.kmall.common.utils;
 
+import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.lang.reflect.Field;
@@ -41,7 +42,7 @@ public class TreeUtils {
         try {
             if (tree != null) {
                 List t_list = new ArrayList();
-                Map map = new HashMap();
+                Map map = Maps.newHashMap();
                 for (Object o : tree) {
                     Class clazz = o.getClass();
                     Field id = clazz.getDeclaredField("id");

kmall-common/src/main/java/com/kmall/common/utils/excel/ExcelUtil.java

@@ -26,7 +26,7 @@ import java.util.zip.ZipInputStream;
 /**
  * 导出EXCEL表格
  *
- * @author 曾俊
+ * @author
  * @create 2017-05-27 10:26
  */
 @Component
@@ -192,7 +192,7 @@ public class ExcelUtil {
 
     /**
      * @desc 拿到图片OSS路径转换为流
-     * @author 曾俊
+     * @author
      * @create 2017/7/25 0025 17:31
      **/
     public static InputStream getInputStream(String path) throws IOException {

kmall-common/src/main/java/com/kmall/common/utils/pingan/utils/TLinxMapUtil.java

@@ -5,6 +5,8 @@
  */
 package com.kmall.common.utils.pingan.utils;
 
+import com.google.common.collect.Maps;
+
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -16,7 +18,7 @@ import java.util.*;
  */
 @SuppressWarnings("all")
 public class TLinxMapUtil {
-	private Map map = new HashMap();
+	private Map map = Maps.newHashMap();
 	private Set keySet = map.keySet();
 
 	public Object get(String key) {

kmall-framework/src/test/java/com/kmall/framework/controller/TestSysUserController.java

@@ -1,5 +1,6 @@
 package com.kmall.framework.controller;
 
+import com.google.common.collect.Maps;
 import com.kmall.framework.BaseSpringTestCase;
 import com.kmall.common.entity.SysUserEntity;
 import com.kmall.framework.service.TestSysUserService;
@@ -26,7 +27,7 @@ public class TestSysUserController extends BaseSpringTestCase {
 
     @Test
     public void querySysUserList() {
-        Map params = new HashMap();
+        Map params = Maps.newHashMap();
         List<SysUserEntity> list = testSysUserService.queryList(params);
         if (list != null && list.size() != 0) {
             for (SysUserEntity userEntity : list) {

kmall-schedule/src/main/java/com/kmall/schedule/service/QzOrderService.java

@@ -1,5 +1,6 @@
 package com.kmall.schedule.service;
 
+import com.google.common.collect.Maps;
 import com.kmall.common.constant.Dict;
 import com.kmall.common.utils.*;
 import com.kmall.common.utils.pay.data.open.cus.CusPropertiesBuilder;
@@ -154,7 +155,7 @@ public class QzOrderService {
                 tem.setData(paras);
                 WxTemplateUtil.sendMessage(tem);
                 // 更新团购失败订单
-                Map updateFailParams = new HashMap();
+                Map updateFailParams = Maps.newHashMap();
                 updateFailParams.put("id", id);
                 qzGroupMapper.updatePastGroup(updateFailParams);
             }
@@ -217,7 +218,7 @@ public class QzOrderService {
                 Integer number = MapUtils.getInteger("number", map);
                 Integer stock_num = MapUtils.getInteger("stock_num", map);
                 Long storeRelaId = MapUtils.getLong("storeRelaId", map);
-                Map param = new HashMap();
+                Map param = Maps.newHashMap();
                 param.put("id", storeRelaId);
                 param.put("stock_num", stock_num + number);
                 qzOrderMapper.updateStockNum(param);
@@ -275,8 +276,8 @@ public class QzOrderService {
         WechatRefundQueryResult result = WechatUtil.wxRefundquery(out_trade_no);
         if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
             if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
-                Map refundRaram = new HashMap();
-                Map orderRaram = new HashMap();
+                Map refundRaram = Maps.newHashMap();
+                Map orderRaram = Maps.newHashMap();
                 int msgCount = Integer.parseInt(result.getRefund_count());
                 for (int i = 0; i < msgCount; i++) {
                     WechatRefundQueryResult querySuccessResponseDto =
@@ -354,8 +355,8 @@ public class QzOrderService {
                 String tradeResult = refundResult.getString("trade_result");
 
                 JSONObject result = JSONObject.fromObject(tradeResult);
-                Map refundParam = new HashMap();
-                Map orderParam = new HashMap();
+                Map refundParam = Maps.newHashMap();
+                Map orderParam = Maps.newHashMap();
 
                 String refundCount= MapUtils.getString("refund_count", result);
                 if (!StringUtils.isNullOrEmpty(refundCount) && !"null".equals(refundCount)) {
@@ -437,8 +438,8 @@ public class QzOrderService {
         /*WechatRefundQueryResult result = WechatUtil.wxRefundquery(out_trade_no);
         if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
             if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
-                Map refundRaram = new HashMap();
-                Map orderRaram = new HashMap();
+                Map refundRaram = Maps.newHashMap();
+                Map orderRaram = Maps.newHashMap();
                 int msgCount = Integer.parseInt(result.getRefund_count());
                 for (int i = 0; i < msgCount; i++) {
                     WechatRefundQueryResult querySuccessResponseDto =
@@ -506,8 +507,8 @@ public class QzOrderService {
         WechatGlobalRefundQueryResult result = WechatGlobalUtil.wxRefundquery(out_trade_no);
         if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
             if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
-                Map orderRaram = new HashMap();
-                Map refundRaram = new HashMap();
+                Map orderRaram = Maps.newHashMap();
+                Map refundRaram = Maps.newHashMap();
                 int msgCount = Integer.parseInt(result.getRefund_count());
                 for (int i = 0; i < msgCount; i++) {
                     //微信部分退款时返回的多条退款信息数据解析
@@ -627,21 +628,21 @@ public class QzOrderService {
                 if(result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_SUCCESS.getItem())) {
                     Date successTime = DateUtils.convertStringToDate(result.getTime_end(),
                             DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS);
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_2.getItem());//已支付
                     orderRaram.put("orderStatus", Dict.orderStatus.item_201.getItem());//已支付
                     orderRaram.put("payTransactionId", result.getTransaction_id());
                     orderRaram.put("payTime", successTime);
                     orderRaram.put("orderId", orderId);
                     qzOrderMapper.updateOrderInfo(orderRaram);
-                    Map processParam = new HashMap();
+                    Map processParam = Maps.newHashMap();
                     processParam.put("payTime", successTime);
                     processParam.put("orderSn", orderSn);
                     qzOrderMapper.updateOrderProcessRecord(processParam);
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_NOTPAY.getItem())) {//订单未支付
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
-                        Map param = new HashMap();
+                        Map param = Maps.newHashMap();
                         param.put("id", storeRelaId);
                         param.put("stock_num", stock_num + number);
                         qzOrderMapper.updateStockNum(param);//库存还原
@@ -654,19 +655,19 @@ public class QzOrderService {
                     orderRaram.put("orderId", orderId);
                     qzOrderMapper.updateOrderInfo(orderRaram);
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_CLOSED.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_7.getItem());
                     orderRaram.put("orderStatus", Dict.orderStatus.item_500.getItem());
                     orderRaram.put("orderId", orderId);
                     qzOrderMapper.updateOrderInfo(orderRaram);
-                    Map param = new HashMap();
+                    Map param = Maps.newHashMap();
                     param.put("id", storeRelaId);
                     param.put("stock_num", stock_num + number);
                     qzOrderMapper.updateStockNum(param);//库存还原
                     logger.info(">>>>>>>>>>>>>>>>>>>>wxOrderByTransactionIdQueryUpdFail 根据支付单查询微信接口返回信息：state 【" + result.getTrade_state() +
                             "】，des【" + result.getTrade_state_desc() + "】");
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_PAYERROR.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_8.getItem());
                     orderRaram.put("orderStatus", Dict.orderStatus.item_501.getItem());
                     orderRaram.put("orderId", orderId);
@@ -674,7 +675,7 @@ public class QzOrderService {
                     logger.info(">>>>>>>>>>>>>>>>>>>>wxOrderByTransactionIdQueryUpdFail 根据支付单查询微信接口返回信息：state 【" + result.getTrade_state() +
                             "】，des【" + result.getTrade_state_desc() + "】");
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_USERPAYING.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_1.getItem());
                     orderRaram.put("orderStatus", Dict.orderStatus.item_100.getItem());
                     orderRaram.put("orderId", orderId);
@@ -715,7 +716,7 @@ public class QzOrderService {
                 if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_SUCCESS.getItem())) {
                     Date successTime = DateUtils.convertStringToDate(result.getTime_end(),
                             DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS);
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_2.getItem());//已支付
                     orderRaram.put("orderStatus", Dict.orderStatus.item_201.getItem());//已支付
                     orderRaram.put("payTransactionId", result.getTransaction_id());
@@ -728,14 +729,14 @@ public class QzOrderService {
                     orderRaram.put("cashFeeType", result.getCash_fee_type());//用户支付金额币种
                     orderRaram.put("rate", result.getRate());//汇率
                     qzOrderMapper.updateOrderInfo(orderRaram);
-                    Map processParam = new HashMap();
+                    Map processParam = Maps.newHashMap();
                     processParam.put("payTime", successTime);
                     processParam.put("orderSn", orderSn);
                     qzOrderMapper.updateOrderProcessRecord(processParam);
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_NOTPAY.getItem())) {//订单未支付
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
-                        Map param = new HashMap();
+                        Map param = Maps.newHashMap();
                         param.put("id", storeRelaId);
                         param.put("stock_num", stock_num + number);
                         qzOrderMapper.updateStockNum(param);//库存还原
@@ -748,19 +749,19 @@ public class QzOrderService {
                     orderRaram.put("orderId", orderId);
                     qzOrderMapper.updateOrderInfo(orderRaram);
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_CLOSED.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_7.getItem());
                     orderRaram.put("orderStatus", Dict.orderStatus.item_500.getItem());
                     orderRaram.put("orderId", orderId);
                     qzOrderMapper.updateOrderInfo(orderRaram);
-                    Map param = new HashMap();
+                    Map param = Maps.newHashMap();
                     param.put("id", storeRelaId);
                     param.put("stock_num", stock_num + number);
                     qzOrderMapper.updateStockNum(param);//库存还原
                     logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalOrderByTransactionIdQueryUpdFail 根据支付单查询微信国际接口返回信息：state 【" + result.getTrade_state() +
                             "】，des【" + Dict.tradeState.item_CLOSED.getItemName() + "】");
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_PAYERROR.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_8.getItem());
                     orderRaram.put("orderStatus", Dict.orderStatus.item_501.getItem());
                     orderRaram.put("orderId", orderId);
@@ -768,7 +769,7 @@ public class QzOrderService {
                     logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalOrderByTransactionIdQueryUpdFail 根据支付单查询微信国际接口返回信息：state 【" + result.getTrade_state() +
                             "】，des【" + Dict.tradeState.item_PAYERROR.getItemName() + "】");
                 } else if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_USERPAYING.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     orderRaram.put("payStatus", Dict.payStatus.item_1.getItem());
                     orderRaram.put("orderStatus", Dict.orderStatus.item_100.getItem());
                     orderRaram.put("orderId", orderId);
@@ -822,23 +823,23 @@ public class QzOrderService {
                         Date nowDate = new Date();
                         // 订单状态（1交易成功，2待支付，4已取消，9等待用户输入密码确认）
                         if (payOrderDto.getStatus() == 1) {
-                            Map orderParam = new HashMap();
+                            Map orderParam = Maps.newHashMap();
                             orderParam.put("payStatus", 2);//已支付
                             orderParam.put("orderStatus", 201);//已支付
                             orderParam.put("payTransactionId", payOrderDto.getTradeNo());
                             orderParam.put("payTime", payOrderDto.getTradeTime());
                             orderParam.put("orderId", orderId);
                             qzOrderMapper.updateOrderInfo(orderParam);
-                            Map processParam = new HashMap();
+                            Map processParam = Maps.newHashMap();
                             processParam.put("payTime", payOrderDto.getTradeTime());
                             processParam.put("orderSn", orderSn);
                             qzOrderMapper.updateOrderProcessRecord(processParam);
                         } else {
-                            Map orderRaram = new HashMap();
+                            Map orderRaram = Maps.newHashMap();
                             if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
                                 orderRaram.put("payStatus", 0);//支付状态未支付
                                 orderRaram.put("orderStatus", 101);//订单状态已取消
-                                Map param = new HashMap();
+                                Map param = Maps.newHashMap();
                                 param.put("id", storeRelaId);
                                 param.put("stock_num", stockNum + number);
                                 qzOrderMapper.updateStockNum(param);
@@ -910,9 +911,9 @@ public class QzOrderService {
             if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode()) ){
                 //订单未支付
                 if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_NOTPAY.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
-                        Map param = new HashMap();
+                        Map param = Maps.newHashMap();
                         param.put("id", storeRelaId);
                         param.put("stock_num", stock_num + number);
                         qzOrderMapper.updateStockNum(param);//库存还原
@@ -952,9 +953,9 @@ public class QzOrderService {
             if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode()) ){
                 //订单未支付
                 if (result.getTrade_state().equalsIgnoreCase(Dict.tradeState.item_NOTPAY.getItem())) {
-                    Map orderRaram = new HashMap();
+                    Map orderRaram = Maps.newHashMap();
                     if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
-                        Map param = new HashMap();
+                        Map param = Maps.newHashMap();
                         param.put("id", storeRelaId);
                         param.put("stock_num", stock_num + number);
                         qzOrderMapper.updateStockNum(param);//库存还原
@@ -997,7 +998,7 @@ public class QzOrderService {
 
                 WechatRefundApiResult result = WechatUtil.wxOrderQuery(out_trade_no_wx);
                 if (WechatUtil.WXTradeState.SUCCESS.getCode().equals(result.getReturn_code()) && WechatUtil.WXTradeState.SUCCESS.getCode().equals(result.getResult_code())) {
-                    Map recordRaram = new HashMap();
+                    Map recordRaram = Maps.newHashMap();
                     recordRaram.put("id", id);
                     recordRaram.put("trade_state", result.getTrade_state());
                     //查询到支付成功
@@ -1025,7 +1026,7 @@ public class QzOrderService {
                         } else if (MapUtils.getInteger("order_status", order) == 102) {
                             logger.info(">>>>>>>>>>>>>>>>>>>>orderWXPayRecordQueryUpdate 此订单已删除： " + out_trade_no);
                         } else {
-                            Map orderRaram = new HashMap();
+                            Map orderRaram = Maps.newHashMap();
                             orderRaram.put("payStatus", 2);//已支付
                             orderRaram.put("orderStatus", 201);//已支付
                             orderRaram.put("payFlag", "weixin");
@@ -1093,7 +1094,7 @@ public class QzOrderService {
         List<Map> shipmentOrderList = qzOrderMapper.queryShipmentOrderList();
         if (null != shipmentOrderList && shipmentOrderList.size() > 0) {
             for (Map map : shipmentOrderList) {
-                Map orderMap = new HashMap();
+                Map orderMap = Maps.newHashMap();
                 orderMap.put("orderId", MapUtils.getLong("orderId", map));
                 qzOrderMapper.updateShipmentOrder(orderMap);
             }
@@ -1102,7 +1103,7 @@ public class QzOrderService {
         List<Map> shipmentBondedOrderList = qzOrderMapper.queryShipmentBondedOrderList();
         if (null != shipmentBondedOrderList && shipmentBondedOrderList.size() > 0) {
             for (Map map : shipmentBondedOrderList) {
-                Map orderMap = new HashMap();
+                Map orderMap = Maps.newHashMap();
                 orderMap.put("orderId", MapUtils.getLong("orderId", map));
                 qzOrderMapper.updateShipmentOrder(orderMap);
             }
@@ -1128,7 +1129,7 @@ public class QzOrderService {
                 String goodsSpecificationNameValue = MapUtils.getString("goodsSpecificationNameValue", map);
                 String goodsName = MapUtils.getString("goodsName", map);
 
-                Map param = new HashMap();
+                Map param = Maps.newHashMap();
                 param.put("userId", userId);
                 param.put("orderId", orderId);
                 param.put("valueId", goodsId);

wx-mall/pages/auth/newuser/newuser.js

@@ -56,7 +56,10 @@ Page({
         wx.showToast({
           title: '手机号绑定成功'
         });
-        wx.redirectTo({ url: '/pages/ucenter/coupon/coupon' });
+        // wx.redirectTo({ url: '/pages/ucenter/coupon/coupon' });
+        wx.switchTab({
+          url: '/pages/ucenter/index/index'
+        });
       } else {
         util.showErrorToast(res.errmsg);
       }

wx-mall/pages/cart/cart.js

@@ -47,11 +47,28 @@ Page({
     // 页面渲染完成
 
   },
-  onShow: function() {
+  onShow: function () {
+    let that = this;
     // 页面显示
     if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
-      this.getCartList();
-      this.getFootprintList();
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            that.reLoad();
+          }
+        });
+        that.getCartList();
+        that.getFootprintList();
+      }else{
+        wx.switchTab({
+          url: '/pages/index/index'
+        });
+      }
     } else {
       wx.navigateTo({
         url: '/pages/auth/btnAuth/btnAuth',
@@ -93,6 +110,31 @@ Page({
     // 页面关闭
 
   },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
   setCommonData(res) {
     let that = this;
     that.setData({
@@ -579,7 +621,8 @@ Page({
         wx.showToast({
           title: res.errmsg,
           icon: 'none'
-        })
+        });
+        that.hideSwitchAttrPop();
       }
     });
   },

wx-mall/pages/catalog/catalog.js

@@ -61,8 +61,7 @@ Page({
   getCatalog: function () {
     //CatalogList
     let that = this;
-    
-    util.request(api.CatalogList).then(function (res) { 
+    util.request(api.CatalogList).then(function (res) {
       if (!wx.getStorageSync('currentCategory')) {
         that.setData({
           navList: res.data.categoryList,
@@ -70,12 +69,14 @@ Page({
           brandList: res.data.brandList
         });
         wx.setStorageSync('currentCategory', res.data.currentCategory);
-        // console.log(that.data.brandList);
       } else {
         if (that.data.currentCategory && that.data.currentCategory.id > 0) {
           that.setData({
             navList: res.data.categoryList
           });
+          console.log(res.data.categoryList);
+          console.log(res.data.currentCategory);
+          console.log(res.data.brandList);
         } else {
           that.setData({
             navList: res.data.categoryList,
@@ -108,14 +109,30 @@ Page({
     // 页面渲染完成
   },
   onShow: function () {
-    this.setData({
+    let that = this;
+    that.setData({
       goodsBizType: app.globalData.appGoodsBizType
     });
-
     // 页面显示
     if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
-      this.getFootCart();
-      this.getCatalog();
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            that.reLoad();
+          }
+        });
+        that.getFootCart();
+        that.getCatalog();
+      } else {
+        wx.switchTab({
+          url: '/pages/index/index'
+        });
+      }
     } else {
       wx.navigateTo({
         url: '/pages/auth/btnAuth/btnAuth',
@@ -131,6 +148,31 @@ Page({
   onUnload: function () {
     // 页面关闭
   },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
   getList: function () {
     var that = this;
     util.request(api.ApiRootUrl + 'api/catalog/' + that.data.currentCategory.id)

wx-mall/pages/goods/goods.js

@@ -256,8 +256,26 @@ Page({
     });
   },
   onShow: function () {
+    let that = this;
     // 页面显示
-
+    if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            that.reLoad();
+          }
+        });
+      }
+    } else {
+      wx.navigateTo({
+        url: '/pages/auth/btnAuth/btnAuth',
+      })
+    }
   },
   onHide: function () {
     // 页面隐藏
@@ -277,6 +295,31 @@ Page({
       openAttr: false
     })
   },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
   changeProperty: function (e) {
     var propertyName = e.currentTarget.dataset.propertyName;
     console.log(propertyName);
@@ -393,9 +436,9 @@ Page({
               icon: 'none'
             })
             that.hideSwitchAttrPop();
-            that.setData({
-              stockNum: 0
-            });
+            // that.setData({
+            //   stockNum: 0
+            // });
           }
         });
 

wx-mall/pages/index/index.js

@@ -79,6 +79,7 @@ Page({
       that.setData({
         storeId: scene
       });
+      wx.setStorageSync('storeId', scene);
     } else {
       console.log("no scene");
     }
@@ -138,10 +139,10 @@ Page({
   },
   reLoad: function () {
     let that = this;
-    if (wx.getStorageSync('storeId')) {
       // console.log(wx.getStorageSync('userId'));
       // console.log(wx.getStorageSync('storeId'));
       // console.log(wx.getStorageSync('merchSn'));
+    if (wx.getStorageSync('storeId')) {
       if (wx.getStorageSync('userId')){
         wx.request({
           url: api.updateLoginUser,
@@ -222,7 +223,7 @@ Page({
     util.request(api.ChooseStoreId, { storeId: storeId, merchSn: merchSn }, 'POST').then(function (res) {
       if (res.errno === 0) {
         wx.setStorageSync('storeId', storeId);
-        wx.setStorageSync('merchSn', merchSn);        
+        wx.setStorageSync('merchSn', merchSn);
         that.reLoad();
       }
     });
@@ -432,4 +433,11 @@ Page({
     //   })
     // }
   },
+
+  shows: function (e) {
+
+    wx.redirectTo({
+      url: '/pages/images/images'
+    })
+  }
 })

wx-mall/pages/pay/pay.js

@@ -22,8 +22,26 @@ Page({
 
   },
   onShow: function () {
+    let that = this;
     // 页面显示
-
+    if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            that.reLoad();
+          }
+        });
+      }
+    } else {
+      wx.navigateTo({
+        url: '/pages/auth/btnAuth/btnAuth',
+      })
+    }
   },
   onHide: function () {
     // 页面隐藏
@@ -33,6 +51,31 @@ Page({
     // 页面关闭
 
   },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
   //改变支付方式
   changePayType: function (e) {
     console.log(e.currentTarget.id);

wx-mall/pages/payResult/payResult.js

@@ -18,7 +18,6 @@ Page({
           // orderId: parseInt(options.orderId)
             orderIds: options.orderIds
         });
-        this.getOrderDetail();
     },
     getOrderDetail() {
       let that = this;
@@ -59,8 +58,27 @@ Page({
 
     },
     onShow: function () {
-        // 页面显示
-
+      let that = this;
+      // 页面显示
+      if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+        if (wx.getStorageSync('storeId')) {
+          util.request(api.ChooseStoreId, {
+            storeId: wx.getStorageSync('storeId'),
+            merchSn: wx.getStorageSync('merchSn')
+          }, 'POST').then(function (res) {
+            if (res.errno === 0) {
+              wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+              wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+              that.reLoad();
+            }
+            });
+          this.getOrderDetail();
+        }
+      } else {
+        wx.navigateTo({
+          url: '/pages/auth/btnAuth/btnAuth',
+        })
+      }
     },
     onHide: function () {
         // 页面隐藏
@@ -69,7 +87,32 @@ Page({
     onUnload: function () {
         // 页面关闭
 
-    },
+  },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
     onShareAppMessage: function () {
         var that = this;
         // console.log("url:" + that.data.goods.list_pic_url);

wx-mall/pages/shopping/checkout/checkout.js

@@ -351,12 +351,31 @@ Page({
 
   },
   onShow: function () {
+    let that = this;
     // 页面显示
     wx.showLoading({
       title: '加载中...',
     })
-    this.getCheckoutInfo();
-    this.initPicker()
+    if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            that.reLoad();
+          }
+        });
+        that.getCheckoutInfo();
+        that.initPicker()
+      }
+    } else {
+      wx.navigateTo({
+        url: '/pages/auth/btnAuth/btnAuth',
+      })
+    }
   },
   onHide: function () {
     // 页面隐藏
@@ -366,6 +385,31 @@ Page({
     // 页面关闭
 
   },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
   // 校验身份证号
 //校验码校验
 checkCode: function (val) {

wx-mall/pages/shopping/checkout/checkout.wxml

@@ -314,7 +314,7 @@
   
 </view>
 
-  <view class="goods-items-all-end" wx:if="{{couponList.length > 0}}">
+  <!-- <view class="goods-items-all-end" wx:if="{{couponList.length > 0}}">
     
     <view class="list-cell-checked" bindtap="selectCoupon" wx:if="{{couponList.length > 0}}">
       <view class="list-cell-checked-bd">
@@ -326,7 +326,7 @@
         <text wx:if="{{!checkedCoupon}}" class="txt">{{couponList.length}}张</text>
       </view>
     </view>
-  </view>
+  </view> -->
 
 <!-- 
     <view class="list-cell">

wx-mall/pages/ucenter/applyRefund/applyRefund.js

@@ -36,15 +36,29 @@ Page({
    */
   onShow: function () {
     let that = this;
-    util.request(api.OrderDetail, {
-      orderId: that.data.orderId
-    }).then(function (res) {
-      if (res.errno === 0) {
-        that.setData({
-          orderGoods: res.data.orderGoods
+    // 页面显示
+    if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+          }
+        });
+        util.request(api.OrderDetail, {
+          orderId: that.data.orderId
+        }).then(function (res) {
+          if (res.errno === 0) {
+            that.setData({
+              orderGoods: res.data.orderGoods
+            });
+          }
         });
       }
-    });
+    }
   },
 
   /**
@@ -101,9 +115,8 @@ Page({
           showCancel: false,
           success: function (res) {
             if (res.confirm) {
-              wx.navigateTo({
-                url: '/pages/ucenter/order/order?tabIndex=2'
-              });
+
+              wx.navigateBack()
             }
           }
         });

wx-mall/pages/ucenter/collect/collect.js

@@ -20,13 +20,28 @@ Page({
     });
   },
   onLoad: function (options) {
-    this.getCollectList();
+    // this.getCollectList();
   },
   onReady: function () {
 
   },
   onShow: function () {
-
+    let that = this;
+    // 页面显示
+    if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+          }
+          });
+        this.getCollectList();
+      }
+    }
   },
   onHide: function () {
     // 页面隐藏

wx-mall/pages/ucenter/footprint/footprint.js

@@ -60,7 +60,21 @@ Page({
 
   },
   onShow: function () {
-
+    let that = this;
+    // 页面显示
+    if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+          }
+        });
+      }
+    }
   },
   onHide: function () {
     // 页面隐藏

wx-mall/pages/ucenter/index/index.js

@@ -29,6 +29,18 @@ Page({
       this.setData({
         userInfo: app.globalData.userInfo,
       });
+      if (wx.getStorageSync('storeId')) {
+        util.request(api.ChooseStoreId, {
+          storeId: wx.getStorageSync('storeId'),
+          merchSn: wx.getStorageSync('merchSn')
+        }, 'POST').then(function (res) {
+          if (res.errno === 0) {
+            wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+            wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            that.reLoad();
+          }
+        });
+      }
       util.request(api.getCurUser, {
         userInfo: app.globalData.userInfo
       }, 'POST').then(function (res) {
@@ -64,6 +76,31 @@ Page({
   onUnload: function () {
     // 页面关闭
   },
+  reLoad: function () {
+    let that = this;
+    if (wx.getStorageSync('storeId')) {
+      if (wx.getStorageSync('userId')) {
+        wx.request({
+          url: api.updateLoginUser,
+          data: {
+            userId: wx.getStorageSync('userId'), storeId: wx.getStorageSync('storeId'), merchSn: wx.getStorageSync('merchSn')
+          },
+          method: 'POST',
+          header: {
+            'Content-Type': 'application/json'
+          },
+          success: function (wxRes) {
+            if (wxRes.data.errno === 0) {
+              // console.log("用户信息更新成功");
+            }
+          },
+          fail: function (err) {
+            console.log("failed");
+          }
+        });
+      }
+    }
+  },
   bindMobile:function(){
     wx.navigateTo({
       url: '../../auth/newuser/newuser'

wx-mall/pages/ucenter/order/order.js

@@ -176,13 +176,30 @@ Page({
         // 页面渲染完成
     },
     onShow: function () {
-        // 页面显示
-        let that = this;
-        that.setData({ orderList: [] });//初始化列表
-        that.switchOrderType(that.data.tabIndex);
-        that.setData({
-          currentStoreId: wx.getStorageSync('storeId')
-        });
+      let that = this;
+      // 页面显示
+      if (wx.getStorageSync('userInfo') || wx.getStorageSync('token')) {
+        if (wx.getStorageSync('storeId')) {
+          util.request(api.ChooseStoreId, {
+            storeId: wx.getStorageSync('storeId'),
+            merchSn: wx.getStorageSync('merchSn')
+          }, 'POST').then(function (res) {
+            if (res.errno === 0) {
+              wx.setStorageSync('storeId', wx.getStorageSync('storeId'));
+              wx.setStorageSync('merchSn', wx.getStorageSync('merchSn'));
+            }
+          });
+          that.setData({ orderList: [] });//初始化列表
+          that.switchOrderType(that.data.tabIndex);
+          that.setData({
+            currentStoreId: wx.getStorageSync('storeId')
+          });
+        }
+      } else {
+        // wx.navigateTo({
+        //   url: '/pages/auth/btnAuth/btnAuth',
+        // })
+      }
     },
     onHide: function () {
         // 页面隐藏