Commit b91e88ff authored by 张永's avatar 张永

1

parent 19495898
...@@ -174,7 +174,7 @@ public class GoodsController { ...@@ -174,7 +174,7 @@ public class GoodsController {
@ApiImplicitParam(paramType = "query", name = "goodsId", dataType = "String", required = true, value = "商品编号", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "goodsId", dataType = "String", required = true, value = "商品编号", defaultValue = ""),
@ApiImplicitParam(paramType = "query", name = "contractNo", dataType = "String", required = true, value = "合同编号", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "contractNo", dataType = "String", required = true, value = "合同编号", defaultValue = ""),
@ApiImplicitParam(paramType = "query", name = "custTypeId", dataType = "String", required = false, value = "合同编号", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "custTypeId", dataType = "String", required = false, value = "合同编号", defaultValue = ""),
@ApiImplicitParam(paramType = "query", name = "ShopPriceTypeID", dataType = "String", required = false, value = "ShopPriceTypeID", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "shopPriceTypeID", dataType = "String", required = false, value = "ShopPriceTypeID", defaultValue = ""),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = false, value = "终端标识", defaultValue = "wechat"), @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 = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
@ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""),
...@@ -183,7 +183,7 @@ public class GoodsController { ...@@ -183,7 +183,7 @@ public class GoodsController {
@RequestMapping(value = "/goodsDetail",method=RequestMethod.GET) @RequestMapping(value = "/goodsDetail",method=RequestMethod.GET)
@IDCLogResource(name="商品详情") @IDCLogResource(name="商品详情")
public String goodsDetail(String orgNo, String goodsId, String contractNo, String custTypeId, String terminal,String ShopPriceTypeID, String langID,String agentID, HttpServletRequest request, HttpServletResponse response) { public String goodsDetail(String orgNo, String goodsId, String contractNo, String custTypeId, String terminal,String shopPriceTypeID, String langID,String agentID, HttpServletRequest request, HttpServletResponse response) {
Map<String,Object> params=new HashMap<>(); Map<String,Object> params=new HashMap<>();
params.put("orgNo", orgNo); params.put("orgNo", orgNo);
...@@ -193,7 +193,7 @@ public class GoodsController { ...@@ -193,7 +193,7 @@ public class GoodsController {
params.put("langID", langID); params.put("langID", langID);
params.put("terminal", terminal); params.put("terminal", terminal);
params.put("agentID", agentID); params.put("agentID", agentID);
params.put("ShopPriceTypeID", ShopPriceTypeID); params.put("shopPriceTypeID", shopPriceTypeID);
return goodsService.goodsDetail(params); return goodsService.goodsDetail(params);
} }
......
...@@ -167,7 +167,7 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -167,7 +167,7 @@ public class GoodsServiceImpl implements GoodsService {
String goodsId=(String) map.get("goodsId"); String goodsId=(String) map.get("goodsId");
String contractNo=(String) map.get("contractNo"); String contractNo=(String) map.get("contractNo");
String custTypeId=(String) map.get("custTypeId"); String custTypeId=(String) map.get("custTypeId");
String shopPriceTypeId=(String) map.get("ShopPriceTypeID"); String shopPriceTypeId=(String) map.get("shopPriceTypeID");
String agentID = map.get("agentID")+""; String agentID = map.get("agentID")+"";
boolean isCheckAgentID = StringUtil.isNotBlank(agentID)?true:false; boolean isCheckAgentID = StringUtil.isNotBlank(agentID)?true:false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment