|
@@ -51,6 +51,8 @@ public class IntegralShoppingMallController {
|
|
|
private IntegralRuleService integralRuleService;
|
|
|
@Resource
|
|
|
private IntegralShopPicService integralShopPicService;
|
|
|
+ @Resource
|
|
|
+ private GzhNewsTemplateService gzhNewsTemplateService;
|
|
|
|
|
|
//获取积分商城轮播图片
|
|
|
@RequestMapping(value = "/getIntegralShopPicInfoList", method = RequestMethod.GET)
|
|
@@ -223,10 +225,15 @@ public class IntegralShoppingMallController {
|
|
|
wxMpTemplate.add(new WxMpTemplateData("keyword5", orderSumIntegral));
|
|
|
wxMpTemplate.add(new WxMpTemplateData("remark",
|
|
|
"截止至" + new SimpleDateFormat(" yyyy年MM月dd日HH时mm分").format(new Date())+",您在"+stationName+"的积分值还剩余 "+surplusPoints+" 分"));
|
|
|
- String templateId = "9EWrreI-P8r4xDgoOcczC4jHt1v0HEjKzkgVRDzoNXA"; //积分兑换成功通知模板
|
|
|
- wxPushUtil.push(gzhAppId, gzhAppSecret, templateId, request.getOpenId(), wxMpTemplate);
|
|
|
- resultData=ResultData.success(CodeMsg.SUCCESS);
|
|
|
-
|
|
|
+ //String templateId = "9EWrreI-P8r4xDgoOcczC4jHt1v0HEjKzkgVRDzoNXA"; //积分兑换成功通知模板
|
|
|
+ GzhNewsTemplate gzhNewsTemplate = new GzhNewsTemplate();
|
|
|
+ gzhNewsTemplate.setStationId(request.getStationId());
|
|
|
+ gzhNewsTemplate.setTemplateType("2");
|
|
|
+ GzhNewsTemplate gzhNewsTemplateInfo = gzhNewsTemplateService.getGzhNewsTemplate(gzhNewsTemplate);
|
|
|
+ if(gzhNewsTemplateInfo !=null && gzhNewsTemplateInfo.getTemplateId() !=null){
|
|
|
+ wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), request.getOpenId(), wxMpTemplate);
|
|
|
+ resultData=ResultData.success(CodeMsg.SUCCESS);
|
|
|
+ }
|
|
|
//打印机打印小票
|
|
|
List<Map<String, Object>> stationPrinterList = stationService.getStationPrinterList(request.getStationId());
|
|
|
if(stationPrinterList != null && stationPrinterList.get(0).get("integralPrintFlag").toString().equals("1")){
|
|
@@ -268,6 +275,25 @@ public class IntegralShoppingMallController {
|
|
|
return gson.toJson(resultData);
|
|
|
}
|
|
|
|
|
|
+ //获取公众号消息模板
|
|
|
+// @RequestMapping(value = "/getGzhNewsTemplate", method = RequestMethod.GET)
|
|
|
+// @ResponseBody
|
|
|
+// public String getGzhNewsTemplate(@RequestParam Integer stationId, String templateType){
|
|
|
+// Gson gson =new Gson();
|
|
|
+// //返回结果集
|
|
|
+// ResultData resultData = null;
|
|
|
+// if(stationId !=null){
|
|
|
+// GzhNewsTemplate gzhNewsTemplate = new GzhNewsTemplate();
|
|
|
+// gzhNewsTemplate.setStationId(stationId);
|
|
|
+// gzhNewsTemplate.setTemplateType(templateType);
|
|
|
+// GzhNewsTemplate gzhNewsTemplate1 = gzhNewsTemplateService.getGzhNewsTemplate(gzhNewsTemplate);
|
|
|
+// resultData=ResultData.success(gzhNewsTemplate1);
|
|
|
+// }else {
|
|
|
+// resultData=ResultData.success(CodeMsg.REQUEST_FAIL);
|
|
|
+// }
|
|
|
+// return gson.toJson(resultData);
|
|
|
+// }
|
|
|
+
|
|
|
//获取用户积分订单列表
|
|
|
@RequestMapping(value = "/getUserIntegralOrderList", method = RequestMethod.GET)
|
|
|
@ResponseBody
|