jk-GitHub-coder 4 роки тому
батько
коміт
ebc7a3b8d4

+ 16 - 17
YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -698,16 +698,16 @@ public class PayController {
                                 customerPointsRecord.setStationName(infoMap.get("stationName").toString());
                                 customerPointsRecord.setCreateTime(new Date());
 
-                                if(infoMap.containsKey("userType") && infoMap.get("userType") !=null){
-                                    switch (infoMap.get("userType").toString()){
-                                        case "1":
-                                            customerPoints.setBlogOpenId(infoMap.get("blogOpenid").toString());
-                                            break;
-                                        case "2":
-                                            customerPoints.setMinaOpenId(infoMap.get("minaOpenid").toString());
-                                            break;
-                                    }
-                                }
+//                                if(infoMap.containsKey("userType") && infoMap.get("userType") !=null){
+//                                    switch (infoMap.get("userType").toString()){
+//                                        case "1":
+//                                            customerPoints.setBlogOpenId(infoMap.get("blogOpenid").toString());
+//                                            break;
+//                                        case "2":
+//                                            customerPoints.setMinaOpenId(infoMap.get("minaOpenid").toString());
+//                                            break;
+//                                    }
+//                                }
 
                                 //获取该用户积分信息
                                 CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfo(customerPoints);
@@ -804,14 +804,13 @@ public class PayController {
                                     //客户公众号积分增加通知
                                     //customerPoints.getBlogOpenId()
                                     //weiXinPushIntegralInfo(infoMap.get("stationId").toString(), infoMap.get("consumer").toString(), customerPointsRecord.getIntegral().toString(), customerPoints.getPoints().toString(), customerPoints.getBlogOpenId());
-                                   if(customerPoints.getBlogOpenId() !=null){
-                                       this.weiXinPushIntegralInfo(infoMap.get("stationId").toString()
-                                               , infoMap.get("consumer").toString()
-                                               , customerPointsRecord.getIntegral().toString()
-                                               , customerPoints.getPoints().toString()
-                                               , customerPoints.getBlogOpenId());
+                                   CustomerPoints m = new CustomerPoints();
+                                   m.setUnionId(customerPoints.getUnionId());
+                                   CustomerPoints cus = customerPointsService.getCustomerPointsInfo(m);
+                                   if(cus.getBlogOpenId() !=null){
+                                       //公众号积分消息推送
+                                     this.weiXinPushIntegralInfo(cus.getStationId().toString(), cus.getCustomerName(), customerPointsRecord.getIntegral().toString(), cus.getPoints().toString(), cus.getBlogOpenId());
                                    }
-
                                 }
                             }