1

src/main/java/com/egolm/shop/controller/AddressController.java

@@ -33,6 +33,7 @@ public class AddressController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name = "shopNO", dataType = "String", required = true, value = "店铺编码", defaultValue = ""), 
 		@ApiImplicitParam(paramType = "query", name = "userNO", dataType = "String", required = true, value = "用户编码", defaultValue = ""), 	
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
   		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
   		@ApiImplicitParam(paramType = "query", name = "index", dataType = "int", required = true, value = "页码", defaultValue = "1"),
 		@ApiImplicitParam(paramType = "query", name = "limit", dataType = "int", required = true, value = "每页显示数", defaultValue = "10"),
@@ -87,7 +88,8 @@ public class AddressController {
 		@ApiImplicitParam(paramType = "query", name = "mobile", dataType = "String", required = true, value = "手机号", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "tel", dataType = "String", required = true, value = "联系电话", defaultValue = ""), 
 		 
-		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
+  		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 
 	})
 	@RequestMapping(value = "/saveOrUpdate",method=RequestMethod.POST)
@@ -140,7 +142,8 @@ public class AddressController {
 		@ApiImplicitParam(paramType = "query", name = "shopNO", dataType = "String", required = true, value = "店铺编码", defaultValue = ""), 
 		@ApiImplicitParam(paramType = "query", name = "userNO", dataType = "String", required = true, value = "用户编码", defaultValue = ""), 	
 		@ApiImplicitParam(paramType = "query", name = "addId", dataType = "String", required = true, value = "地址ID", defaultValue = ""), 	
-		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
+  		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/delete",method=RequestMethod.GET)
 	public String delete(HttpServletRequest request) {
@@ -158,7 +161,8 @@ public class AddressController {
 		@ApiImplicitParam(paramType = "query", name = "userNO", dataType = "String", required = true, value = "用户编码", defaultValue = ""), 	
 		@ApiImplicitParam(paramType = "query", name = "addId", dataType = "String", required = true, value = "地址ID", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "type", dataType = "String", required = true, value = "操作类型  0为取消默认 ,2为设置默认", defaultValue = ""), 	
-		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
+  		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/defaultAdd",method=RequestMethod.GET)
 	public String defaultAdd(HttpServletRequest request) {
@@ -175,7 +179,8 @@ public class AddressController {
 	@ApiOperation("地址详情")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name = "addId", dataType = "String", required = true, value = "地址ID", defaultValue = ""),
-		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
+  		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/detail",method=RequestMethod.GET)
 	public String detail(HttpServletRequest request) {

src/main/java/com/egolm/shop/controller/BrandController.java

@@ -35,6 +35,7 @@ public class BrandController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name = "orgNO", dataType = "String", required = true, value = "区域编号", defaultValue = ""), 
 		@ApiImplicitParam(paramType = "query", name = "compNO", dataType = "String", required = true, value = "组件编号", defaultValue = ""), 	
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
   		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 		@ApiImplicitParam(paramType = "query", name = "index", dataType = "int", required = true, value = "页码", defaultValue = "1"),
 		@ApiImplicitParam(paramType = "query", name = "limit", dataType = "int", required = true, value = "每页显示数", defaultValue = "10"),
@@ -70,7 +71,8 @@ public class BrandController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "query", name = "OrgNO", dataType = "String", required = true, value = "区域编号", defaultValue = ""),
 			@ApiImplicitParam(paramType = "query", name = "ShopNO", dataType = "String", required = false, value = "店铺编号", defaultValue = ""),
-			
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
+	  		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	 })
 	@RequestMapping(value = "/getBrandList",method=RequestMethod.GET)
 	public String getBrandList(HttpServletRequest request, HttpServletResponse response) {
@@ -116,8 +118,8 @@ public class BrandController {
 	
 	@ApiOperation("热销品牌列表")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "query", name = "OrgNO", dataType = "String", required = true, value = "区域编号", defaultValue = ""),
-			@ApiImplicitParam(paramType = "query", name = "CompNO", dataType = "String", required = true, value = "组件编号", defaultValue = ""),
+			@ApiImplicitParam(paramType = "query", name = "orgNO", dataType = "String", required = true, value = "区域编号", defaultValue = ""),
+			@ApiImplicitParam(paramType = "query", name = "compNO", dataType = "String", required = true, value = "组件编号", defaultValue = ""),
 			@ApiImplicitParam(paramType = "query", name = "index", dataType = "String", required = false, value = "第几页", defaultValue = "1"),
 			@ApiImplicitParam(paramType = "query", name = "limit", dataType = "String", required = false, value = "每页数量", defaultValue = "20"),
 			})
@@ -125,8 +127,8 @@ public class BrandController {
 	public String getHotSaleBrands(HttpServletRequest request, HttpServletResponse response) {
 		List<Map<String,Object>> listMap;
 		Map<String,Object> params=new HashMap<>();
-		params.put("OrgNO", request.getParameter("OrgNO"));
-		params.put("CompNO", request.getParameter("CompNO"));
+		params.put("orgNO", request.getParameter("orgNO"));
+		params.put("compNO", request.getParameter("compNO"));
 		Page page=new Page();
 		page.setIndex(Long.valueOf(request.getParameter("index")==null?"1":request.getParameter("index")));
 		page.setLimit(Long.valueOf(request.getParameter("limit")==null?"20":request.getParameter("limit")));

src/main/java/com/egolm/shop/controller/CartController.java

@@ -34,7 +34,6 @@ public class CartController {
 		@ApiImplicitParam(paramType = "query", name="shopNO", dataType = "String", required = true, value = "店铺编号", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),  
   		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"), 
-
 	})
 
 	@RequestMapping(value = "/cartQuery",method=RequestMethod.GET)

src/main/java/com/egolm/shop/controller/CategoryController.java

@@ -30,6 +30,7 @@ public class CategoryController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "query", name = "orgNO", dataType = "String", required = true, value = "组织机构", defaultValue = ""),
 			@ApiImplicitParam(paramType = "query", name = "scopeTypeID", dataType = "String", required = true, value = "店铺类型", defaultValue = ""), 
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 

src/main/java/com/egolm/shop/controller/CommonController.java

@@ -25,7 +25,8 @@ public class CommonController {
 	@ApiOperation("组织构购获取省市区")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType = "query", name = "orgNO", dataType = "String", required = true, value = "组织机构", defaultValue = ""),
-		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), 
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
+		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/queryDistrictByOrgNO",method=RequestMethod.GET)
 	public String detail(HttpServletRequest request) {

src/main/java/com/egolm/shop/controller/CouponController.java

@@ -110,7 +110,8 @@ public class CouponController {
 		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端", defaultValue = ""),
 		@ApiImplicitParam(paramType = "query", name = "makePaperNO", dataType = "String", required = true, value = "制券单号", defaultValue = ""), 
 		@ApiImplicitParam(paramType = "query", name = "point", dataType = "int", required = false, value = "抵扣金币", defaultValue = ""), 
- 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
+		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/getCoupon",method=RequestMethod.GET)
 	public String getCoupon(HttpServletRequest request) {

src/main/java/com/egolm/shop/controller/GoodsController.java

@@ -38,6 +38,7 @@ public class GoodsController {
 		@ApiImplicitParam(paramType = "query", name = "orgNO", dataType = "String", required = true, value = "区域编号", defaultValue = ""), 
 		@ApiImplicitParam(paramType = "query", name = "userNO", dataType = "String", required = false, value = "用户编号", defaultValue = ""), 
 		@ApiImplicitParam(paramType = "query", name = "compNO", dataType = "String", required = true, value = "组件编号", defaultValue = ""), 	
+		@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 		@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/thinkLike",method=RequestMethod.GET)
@@ -82,6 +83,7 @@ public class GoodsController {
 			@ApiImplicitParam(paramType = "query", name = "compNO", dataType = "String", required = true, value = "组件编号", defaultValue = ""),
 			@ApiImplicitParam(paramType = "query", name = "index", dataType = "String", required = false, value = "第几页", defaultValue = "1"),
 			@ApiImplicitParam(paramType = "query", name = "limit", dataType = "String", required = false, value = "每页数量", defaultValue = "20"),
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 	@RequestMapping(value = "/getHotSaleGoods",method=RequestMethod.GET)
@@ -106,6 +108,7 @@ public class GoodsController {
 			@ApiImplicitParam(paramType = "query", name = "categoryNOB", dataType = "String", required = false, value = "二级分类编码", defaultValue = "%"),
 			@ApiImplicitParam(paramType = "query", name = "index", dataType = "String", required = false, value = "第几页", defaultValue = "1"),
 			@ApiImplicitParam(paramType = "query", name = "limit", dataType = "String", required = false, value = "每页数量", defaultValue = "20"),
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 
@@ -132,9 +135,9 @@ public class GoodsController {
 			@ApiImplicitParam(paramType = "query", name = "shopNO", dataType = "String", required = false, value = "店铺编号", defaultValue = "00029997"),
    			@ApiImplicitParam(paramType = "query", name = "index", dataType = "String", required = false, value = "第几页", defaultValue = "1"),
 			@ApiImplicitParam(paramType = "query", name = "limit", dataType = "String", required = false, value = "每页数量", defaultValue = "20"),
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	}) 
-
 	@RequestMapping(value = "/hotSearchKey",method=RequestMethod.GET)
 	public String hotSearchKey(HttpServletRequest request, HttpServletResponse response) {
 		List<Map<String,Object>> listMap;
@@ -150,7 +153,7 @@ public class GoodsController {
 	
 	@ApiOperation("统一搜索(支持品牌,分类，关键字，仓库等)")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "query", dataType = "String", required = true, value = "JSON参数", defaultValue = "{\"topCategoryNO\":\"01\",\"upCategoryNO\":\"\",\"categoryID\":[\"\"],\"brandID\":[\"\"],\"agentID\":\"\",\"warehouseNO\":\"\",\"scopeTypeID\":\"1\",\"districtID\":\"\",\"keyword\":\"*\",\"index\":1,\"userNO\":\"00034\",\"shopNO\":\"167728271\"}"), 
+			@ApiImplicitParam(paramType = "query", dataType = "String", required = true, value = "JSON参数", defaultValue = "{\"topCategoryNO\":\"01\",\"upCategoryNO\":\"\",\"categoryID\":[\"\"],\"brandID\":[\"\"],\"agentID\":\"\",\"warehouseNO\":\"\",\"scopeTypeID\":\"1\",\"districtID\":\"\",\"keyword\":\"*\",\"index\":1,\"limit\":10,\"userNO\":\"00034\",\"orgNO\":\"XIAN\",\"shopNO\":\"167728271\",\"langID\":\"936\",\"terminal\":\"wechat\"}"), 
 	})
 
 	@RequestMapping(value = "/searchGoods",method=RequestMethod.POST)
@@ -160,8 +163,9 @@ public class GoodsController {
  		Map<String, Object> argsMap = new HashMap<String,Object>();
 		try {
 			argsMap = GsonUtil.toMap(reqJson);
-			if(!argsMap.containsKey("index") || !argsMap.containsKey("limit") || !argsMap.containsKey("userNO") || !argsMap.containsKey("shopNO") || !argsMap.containsKey("orgNO")) {
-				return Rjx.jsonErr().setCode(-100).setMessage("参数缺失").set("errorMsg", "index,limit,userNO,shopNO,orgNO为必填项").toJson();
+			if(!argsMap.containsKey("index") || !argsMap.containsKey("limit") || !argsMap.containsKey("userNO") || !argsMap.containsKey("shopNO") || !argsMap.containsKey("orgNO") || !argsMap.containsKey("langID")
+					|| !argsMap.containsKey("terminal") ) {
+				return Rjx.jsonErr().setCode(-100).setMessage("参数缺失").set("errorMsg", "index,limit,userNO,shopNO,orgNO,langID,terminal为必填项").toJson();
 			}
 		} catch (Exception e) {
  			e.printStackTrace();
@@ -179,6 +183,7 @@ public class GoodsController {
 			@ApiImplicitParam(paramType = "query", name = "custNO", dataType = "String", required = true, value = "用户账号", defaultValue = ""),
 			@ApiImplicitParam(paramType = "query", name = "shopNO", dataType = "String", required = true, value = "店铺编号", defaultValue = ""), 
 			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端", defaultValue = ""), 
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 
@@ -216,6 +221,7 @@ public class GoodsController {
 		 	@ApiImplicitParam(paramType = "query", name = "goodsID", dataType = "String", required = true, value = "商品编号", defaultValue = "10"),
  			@ApiImplicitParam(paramType = "query", name = "shopNO", dataType = "String", required = true, value = "店铺编号", defaultValue = "00029975"), 
  			@ApiImplicitParam(paramType = "query", name = "override", dataType = "String", required = true, value = "收藏状态(1为收藏,0为取消)", defaultValue = "1"), 
+ 			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
  			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 

src/main/java/com/egolm/shop/controller/SystemCtrlController.java

@@ -29,6 +29,7 @@ public class SystemCtrlController {
 	@ApiOperation("获取字典参数")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "query", name = "code", dataType = "String", required = true, value = "编号", defaultValue = ""),
+			@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"),
 			@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
 	})
 

src/main/java/com/egolm/shop/service/impl/BrandServiceImpl.java

@@ -42,8 +42,9 @@ public class BrandServiceImpl implements BrandService {
 				+ "WHERE acg.sBrandID = b.sBrandID and acg.sOrgNO = ? "
 				+ "group by b.sPinyinCode, acg.sBrandID, b.sBrandName, b.sLogoUrl "
 				+ "ORDER BY b.sPinyinCode ";
-		String OrgNO=(String) map.get("OrgNO");
-		return jdbcTemplate.queryForList(sql, OrgNO);
+		String orgNO=(String) map.get("orgNO");
+		jdbcTemplate.setDialect(new SqlServerDialect());
+		return jdbcTemplate.queryForList(sql, orgNO);
 	}
 
 	@Override
@@ -60,8 +61,8 @@ public class BrandServiceImpl implements BrandService {
 				+ "and a.nGoodsID = acg.nGoodsID "
 				+ "WHERE acg.sOrgNO = ? "
 				+ "GROUP BY b.sBrandID, b.sBrandName, b.sLogoUrl ";
-		String OrgNO=(String) map.get("OrgNO");
+		String orgNO=(String) map.get("orgNO");
 		jdbcTemplate.setDialect(new SqlServerDialect());
-		return jdbcTemplate.limit(sql, page,OrgNO);
+		return jdbcTemplate.limit(sql, page,orgNO);
 	}
 }