需求 #14165

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

@@ -193,7 +193,7 @@ public class GoodsController {
 	
 	@ApiOperation("查询库存价格")
 	@ApiImplicitParams({
-		 	@ApiImplicitParam(paramType = "query", name = "uid", dataType = "String", required = true, value = "商品唯一标识"),
+		 	@ApiImplicitParam(paramType = "query", name = "uid", dataType = "String", required = true, value = "商品唯一标识  合同号1:商品ID1,合同号2:商品ID2,"),
 		 	@ApiImplicitParam(paramType = "query", name = "shopNo", dataType = "String", required = true), 
 		 	@ApiImplicitParam(paramType = "query", name = "orgNo", dataType = "String", required = true),  
 		 	@ApiImplicitParam(paramType = "query", name = "agentID", dataType = "String", required = true), 

src/main/java/com/egolm/shop/api/PageController.java

@@ -44,6 +44,7 @@ public class PageController {
  	})
 	@RequestMapping(value = "/queryBanner",method=RequestMethod.GET)
 	public String queryBanner(HttpServletRequest request) {
+		System.out.println("------------------------");
 		String custNo = request.getParameter("custNo");
 		String orgNO = request.getParameter("orgNo");
 		String adTypeID = request.getParameter("adTypeID");

src/main/java/com/egolm/shop/api/PromoController.java

@@ -66,6 +66,9 @@ public class PromoController {
 		String statusDesc = "正常活动";
 		Date now = new Date();
 		Map<String, Object> promoMap = service.getPromoDetail(promoPaperNO,agentID);
+		if (promoMap == null) {
+			return Rjx.jsonErr().setMessage("活动不存在");
+		}
 		Date dPromoBeginDate = (Date)promoMap.get("dPromoBeginDate");
 		Date dPromoEndDate = (Date)promoMap.get("dPromoEndDate");
 		Integer nTag = ((Number)promoMap.get("nTag")).intValue();

src/main/java/com/egolm/shop/api/service/impl/PageServiceImpl.java

@@ -71,8 +71,8 @@ public class PageServiceImpl implements PageService {
 				+ "   LayoutTypeID = b.sLayoutTypeID,LayoutType = b.sLayoutType,JumpTypeID = b.sJumpTypeID,JumpType = b.sJumpType,JumpList = b.sJumpList,Idx = b.nIdx,ImagePath = b.sImagePath,"
 				+ "  LinkPath = b.sLinkPath "
 				+ " from tBannerAd  b , tCustomer c  "
-				+ "  WHERE sOrgNO = ? AND sAdPositionTypeID = ? AND b.dStartTime <=getdate()  AND b.dEndTime >= getdate()  AND b.nTag&2 = 2  and b.nAgentID = c.nAgentID and c.nTag&2 = 2 and c.sCustNO = ? ";
-		 
+				+ "  WHERE b.sOrgNO = ? AND sAdPositionTypeID = ? AND b.dStartTime <=getdate()  AND b.dEndTime >= getdate()  AND b.nTag&2 = 2  and b.nAgentID = c.nAgentID and c.nTag&2 = 2 and c.sCustNO = ? ";
+		System.out.println(sql); 
 		return jdbcTemplate.limit(sql, page, orgNO, adTypeID,custNo);
 	}
 	

src/main/java/com/egolm/shop/api/service/impl/PromoServiceImpl.java

@@ -111,7 +111,11 @@ public class PromoServiceImpl implements PromoService {
 
 	@Override
 	public Map<String, Object> getPromoDetail(String promoPaperNO,String agentID) {
+		try {
 			return jdbcTemplate.queryForMap("select * from tPromo where sPromoPaperNO = ? and nTag&3 = 2 and nAgentID = ? ", promoPaperNO,agentID);
+		} catch (Exception e) {
+			return null;
+		}
 	}
 
 }

src/main/java/com/egolm/shop/schedules/qiyewx/QiyeWxMsgTask.java

@@ -29,7 +29,7 @@ public class QiyeWxMsgTask {
 	@Autowired
 	JdbcTemplate jdbcTemplate;
 	
-	@Scheduled(cron="${qiyewx.msg.timer}")
+/*	@Scheduled(cron="${qiyewx.msg.timer}")*/
 	public void execute() {
 		List<Map<String, Object>> list = jdbcTemplate.queryForList("select nID, sSMS from tSMS where sSendType = '2' and sChannelID = 'qywx' and sSendGroup = '6'");
 		if(list.size() > 0) {

src/main/java/com/egolm/shop/schedules/search/GoodsCollectTask.java

@@ -84,13 +84,13 @@ public class GoodsCollectTask extends AbstractSolrApi{
 		return Rjx.jsonOk().toJson();
 	}
 	
-	@Scheduled(cron="${solr.goods.cron-for-day}")
+/*	@Scheduled(cron="${solr.goods.cron-for-day}")*/
 	public void dayExecute() {
 		Date date = new Date(System.currentTimeMillis() - (offsetMinuteForDay*60L*1000L));
 		this.updateIndex(date);
 	}
 	
-	@Scheduled(cron="${solr.goods.cron-for-minute}")
+	/*@Scheduled(cron="${solr.goods.cron-for-minute}")*/
 	public void minuteExecute() {
 		Date date = new Date(System.currentTimeMillis() - (offsetMinuteForMinute*60L*1000L));
 		this.updateIndex(date);