公众号消息推送

YijiaRestful/pom.xml

@@ -21,6 +21,18 @@
 
     <dependencies>
 
+        <!-- WxJava公众号 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-common</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+
         <!-- BouncyCastle是一个开源的加解密解决方案，主页在http://www.bouncycastle.org/-->
         <dependency>
             <groupId>org.bouncycastle</groupId>

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -41,7 +41,7 @@ public class AppUserInfoController {
     /*
      * 微信小程序根据code获取用户openId和sessionKey
      * @param code
-     * , @RequestParam("stationId") String stationId
+     * @param stationId
      * @return
      */
     @ResponseBody

YijiaRestful/src/main/java/com/platform/yijia/controller/CustomerGradeController.java

@@ -140,6 +140,19 @@ public class CustomerGradeController {
                     params.put("grade", memberGrade);
                 }
                 if(discountPlanType.equals("1")){
+                    //此处判断用于当该站由其他优惠改为等级直降时 （先使用其他优惠不存在等级时再改为直降方式）
+                    if(memberGrade == null){
+                        Map map = new HashMap();
+                        map.put("stationId", existCustomer.getStationId());
+                        map.put("oilName", existCustomer.getOilName());
+                        List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(map);  //直降
+                        for (Map m: customerGradeInfo){
+                            if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("memberConditStart").toString()) && Double.valueOf(customerManage.getAmt().toString()) < Double.valueOf(m.get("memberConditEnd").toString())){
+                                params.put("grade", m.get("id").toString());
+                                break;
+                            }
+                        }
+                    }
                     //如果该油站使用是直降
                     List<Map<String, Object>> customerGradeInfoList = customerGradeServices.getCustomerGradeInfo(params);
                     resultData = ResultData.success(customerGradeInfoList);