修改

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

@@ -121,6 +121,8 @@ public class CustomerGradeController {
                     }else if(customerGradeInfoByYouHuiList !=null && customerGradeInfoByYouHuiList.size() > 1){
                         //存在多个等级时 查询出结果按优惠的值升序排列取第一个即可
                         resultData = ResultData.success(customerGradeInfoByYouHuiList.get(0));
+                    }else {
+                        resultData = ResultData.success(customerGradeInfoByYouHuiList);
                     }
                 }
             }else{

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

@@ -444,6 +444,21 @@ public class PayController {
             String realRefundAmount = request.get("realRefundAmount").toString();
             reqData.put("realRefundAmount", realRefundAmount);
         }
+        //szltFlag
+        if(request.containsKey("szltFlag") && request.get("szltFlag") !=null){
+            String szltFlag = request.get("szltFlag").toString();
+            reqData.put("szltFlag", szltFlag);
+        }
+        //recFeeAmt
+        if(request.containsKey("recFeeAmt") && request.get("recFeeAmt") !=null){
+            String recFeeAmt = request.get("recFeeAmt").toString();
+            reqData.put("recFeeAmt", recFeeAmt);
+        }
+        //szltRecfeeAmt
+        if(request.containsKey("szltRecfeeAmt") && request.get("szltRecfeeAmt") !=null){
+            String szltRecfeeAmt = request.get("szltRecfeeAmt").toString();
+            reqData.put("szltRecfeeAmt", szltRecfeeAmt);
+        }
 
         reqData.put("sxfUuid",sxfUuid);
         reqData.put("payWay",payWay);
@@ -581,65 +596,96 @@ public class PayController {
                                 }
                                 logger.info("存在客户 更新时手机号参数: " + customerManage.getPhoneNumber());
 
-                                //用户等级设置 说明：每个油站只存在一种优惠方案。 立减满减在另一张表故作次条件判断，如果该油站没有设置优惠方案则不去存会员等级
-                                List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
-                                logger.info("该站直降等级信息："+ customerGradeInfo);
-                                if(customerGradeInfo != null && customerGradeInfo.size() >0){
-                                    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())){
+                                //获取该油站的优惠方式
+                                String discountPlanType = stationService.getStationDiscountWay(infoMap.get("stationId").toString());
+                                logger.info("油站优惠方式："+discountPlanType);
+                                //满减
+                                if(discountPlanType !=null && discountPlanType.equals("2")){
+                                    List<Map> customerMarkertPlanList = customerGradeServices.getCustomerMarkertPlanList(infoMap);
+                                    logger.info("该站满减信息："+ customerMarkertPlanList);
+                                    if(customerMarkertPlanList !=null && customerMarkertPlanList.size() >0){
+                                        for(Map m: customerMarkertPlanList){
+                                            if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("discountAmt").toString())){
+                                                customerManage.setGrade(m.get("grade").toString());     //存入等级名称
+                                                customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
+                                                break;
+                                            }
 
-                                            customerManage.setGrade(m.get("grade").toString());     //存入等级名称
-                                            customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
                                         }
-                                        logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-                                        break;
+                                        logger.info("满减信息是否存入客户表："+ "满减ID："+ customerManage.getMemberGrade()+ "满减名称： "+customerManage.getGrade());
                                     }
-                                }else {
-                                    //立减满减
+                                }else if(discountPlanType !=null && discountPlanType.equals("3")){
+                                    //立减
                                     List<Map> customerMarkertPlanList = customerGradeServices.getCustomerMarkertPlanList(infoMap);
-                                    logger.info("该站优惠等级信息："+ customerMarkertPlanList);
+                                    logger.info("该站满减信息："+ customerMarkertPlanList);
                                     if(customerMarkertPlanList !=null && customerMarkertPlanList.size() >0){
                                         for(Map m: customerMarkertPlanList){
                                             if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("discountAmt").toString())){
                                                 customerManage.setGrade(m.get("grade").toString());     //存入等级名称
                                                 customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
+                                                break;
                                             }
-                                            logger.info("优惠等级信息是否存入客户表："+ "优惠ID："+ customerManage.getMemberGrade()+ "优惠名称： "+customerManage.getGrade());
+                                        }
+                                        logger.info("立减信息是否存入客户表："+ "立减ID："+ customerManage.getMemberGrade()+ "立减名称： "+customerManage.getGrade());
+                                    }
+                                }else if(discountPlanType !=null && discountPlanType.equals("1")){
+                                    //直降
+                                    List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
+                                    logger.info("该站直降等级信息："+ customerGradeInfo);
+                                    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())){
+                                            customerManage.setGrade(m.get("grade").toString());     //存入等级名称
+                                            customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
                                             break;
                                         }
                                     }
-
+                                    logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                                 }
                                 //存在 更新
                                 payOrderService.updateCustomer(customerManage);
-                            }else{          //该客户不存在时插入
-
-                                //用户等级设置 说明：每个油站只存在一种优惠方案。立减满减在另一张表故作此条件判断，如果该油站没有设置优惠方案则不去存会员等级
-                                List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
-                                logger.info("该站直降等级信息："+ customerGradeInfo);
-                                if(customerGradeInfo != null && customerGradeInfo.size() >0){
-                                    for (Map m: customerGradeInfo){
-                                        if(Double.valueOf(infoMap.get("amt").toString()) >= Double.valueOf(m.get("memberConditStart").toString()) && Double.valueOf(infoMap.get("amt").toString()) < Double.valueOf(m.get("memberConditEnd").toString())){
-                                            customerManage.setGrade(m.get("grade").toString());     //存入等级名称
-                                            customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
+                            }else{
+                                //该客户不存在时插入
+                                String discountPlanType = stationService.getStationDiscountWay(infoMap.get("stationId").toString());
+                                //满减
+                                if(discountPlanType !=null && discountPlanType.equals("2")){
+                                    List<Map> customerMarkertPlanList = customerGradeServices.getCustomerMarkertPlanList(infoMap);
+                                    logger.info("该站满减信息："+ customerMarkertPlanList);
+                                    if(customerMarkertPlanList !=null && customerMarkertPlanList.size() >0){
+                                        for(Map m: customerMarkertPlanList){
+                                            if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("discountAmt").toString())){
+                                                customerManage.setGrade(m.get("grade").toString());     //存入等级名称
+                                                customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
+                                                break;
+                                            }
                                         }
-                                        logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
-                                        break;
+                                        logger.info("满减信息是否存入客户表："+ "满减ID："+ customerManage.getMemberGrade()+ "满减名称： "+customerManage.getGrade());
                                     }
-                                }else {
-                                    //立减满减
+                                }else if(discountPlanType !=null && discountPlanType.equals("3")){
+                                    //立减
                                     List<Map> customerMarkertPlanList = customerGradeServices.getCustomerMarkertPlanList(infoMap);
-                                    logger.info("该站优惠等级信息："+ customerMarkertPlanList);
+                                    logger.info("该站立减信息："+ customerMarkertPlanList);
                                     if(customerMarkertPlanList !=null && customerMarkertPlanList.size() >0){
                                         for(Map m: customerMarkertPlanList){
-                                            if(Double.valueOf(infoMap.get("amt").toString()) >= Double.valueOf(m.get("discountAmt").toString())){
+                                            if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("discountAmt").toString())){
                                                 customerManage.setGrade(m.get("grade").toString());     //存入等级名称
                                                 customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
+                                                break;
                                             }
-                                            logger.info("优惠等级信息是否存入客户表："+ "优惠ID："+ customerManage.getMemberGrade()+ "优惠名称： "+customerManage.getGrade());
+                                        }
+                                        logger.info("立减信息是否存入客户表："+ "立减ID："+ customerManage.getMemberGrade()+ "立减名称： "+customerManage.getGrade());
+                                    }
+                                }else if(discountPlanType !=null && discountPlanType.equals("1")){
+                                    //直降
+                                    List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeList(infoMap);  //直降
+                                    logger.info("该站直降等级信息："+ customerGradeInfo);
+                                    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())){
+                                            customerManage.setGrade(m.get("grade").toString());     //存入等级名称
+                                            customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
                                             break;
                                         }
                                     }
+                                    logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                                 }
                                 customerManage.setAmt(BigDecimal.valueOf((Double) infoMap.get("amt")));    //存入金额
                                 customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));    //存入升数

YijiaRestful/src/main/resources/mapper/CustomerGradeMapper.xml

@@ -39,6 +39,7 @@
                 AND oil_name = #{oilName}
             </if>
         </where>
+        ORDER BY discount_amt DESC
     </select>