Merge branch 'master' of http://zhangyong@gitlab.egolm.com/key/shop.git

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

@@ -93,4 +93,27 @@ public class CommonController {
 		return Rjx.jsonOk().set("list", list).toJson();
 	}
 	
+	@ApiOperation("获取配置信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType = "query", name = "appId", dataType = "String"),
+		@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 = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""),
+		@ApiImplicitParam(paramType = "query", name = "timestamp", dataType = "String", required = true, value = "时间戳", defaultValue = "")
+	})
+	@RequestMapping(value = "/getConfig",method=RequestMethod.GET)
+	public Object getConfig(String appId) {
+		Map<String, Object> map = jdbcTemplate.queryForMap("select sOrgNO, sOrgDesc  from tOrg where sAppID = ?", appId);
+		String ossSql = "" +
+				" declare @ChoiceOssKEY varchar(20)   " + 
+				" select @ChoiceOssKEY=sValue1 from tSystemCtrl " + 
+				" where sCode = 'ChoiceOssKEY' " + 
+				" select sChoiceOssKEY=@ChoiceOssKEY,sDesc,sValue1,sValue2,Value3=sValue3,sValue4,sValue5,sMemo  " + 
+				" from tSystemCtrl " + 
+				" where sCode = @ChoiceOssKEY";
+		Map<String, Object> omap = jdbcTemplate.queryForMap(ossSql.replaceAll("\\s+", " "));
+		Map<String, Object> cmap = jdbcTemplate.queryForMap("select sDesc,sValue1 from tSystemCtrl where sCode = 'ExemptCheck'");
+		return Rjx.jsonOk().set("OrgInfo", map).set("PicInfo", omap).set("ExemptCheck", cmap).toJson();
+		
+	}
 }

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

@@ -62,15 +62,18 @@ public class PromoController {
 		List<Map<String, Object>> list = service.getGroupGoodsDetail(orgNo, shopNo, promoPaperNO, promoGroupNO);
 		BigDecimal nTotalRealAmount = BigDecimal.ZERO;
 		BigDecimal nTotalPayAmount = BigDecimal.ZERO;
+		BigDecimal nTotalQty = BigDecimal.ZERO;
 		for(Map<String, Object> map : list) {
 			BigDecimal nMeetQty = (BigDecimal)map.get("nMeetQty");
 			BigDecimal nRealSalePrice = (BigDecimal)map.get("nRealSalePrice");
 			BigDecimal nDisPrice = (BigDecimal)map.get("nDisPrice");
 			nTotalRealAmount = nTotalRealAmount.add(nMeetQty.multiply(nRealSalePrice));
 			nTotalPayAmount = nTotalPayAmount.add(nMeetQty.multiply(nDisPrice));
+			nTotalQty = nTotalQty.add(nMeetQty);
 		}
 		promoMap.put("nTotalRealAmount", nTotalRealAmount);
 		promoMap.put("nTotalPayAmount", nTotalPayAmount);
+		promoMap.put("nTotalQty", nTotalQty);
 		List<Map<String, Object>> DLPicList = service.getGroupPicList("DL", promoPaperNO, promoGroupNO);
 		List<Map<String, Object>> BNPicList = service.getGroupPicList("BN", promoPaperNO, promoGroupNO);
 		return Rjx.jsonOk().set("data", promoMap).set("list", list).set("DLPicList", DLPicList).set("BNPicList", BNPicList).toJson();