增加网商回调

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

@@ -87,7 +87,7 @@ public class PayNotifyController {
 	@ApiOperation("网商银行回调通知接口") 
 	@RequestMapping(value = "/mybankCallback", method = RequestMethod.POST)
 	public Object mybankCallback(@RequestBody String req, HttpServletResponse resp) {
-		logger.info("网商银行回调通知接口 {}",req);
+		logger.info("从egoPay中接收网商银行回调通知接口 {}",req);
 		return "success";
 	}
 	

src/main/java/com/egolm/shop/api/service/OrderService.java

@@ -49,4 +49,6 @@ public interface OrderService {
 	public List<Map<String, Object>> payCallback(WxPayResponse postData);
 	
 	public List<Map<String, Object>> mePayCallback(String req);
+	
+	public List<Map<String, Object>> meBankCallback(String req);
 }

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

@@ -859,6 +859,8 @@ public class CartQueryServiceImpl implements CartQueryService {
 			      + "                        from tYWPromoMain a, tYWPromoDtl b "
 			      + "                        where a.sPromoPaperNO = b.sPromoPaperNO "
 			      + "                          and a.sPromoPaperNORuleID = b.sPromoPaperNO + isnull(convert(varchar,b.nRuleID),'') "
+				  + "                          and a.nTag&1=0 "
+				  + "                          and b.nTag&1=0 "
 			      + "                       ) p on p.sPromoPaperNO = c.sPromoPaperNO and p.nGoodsID = c.nGoodsID "
 			      + "WHERE c.sShopNO = '" + shopNo + "'";
 		String sqlClearPromoNo =