修改

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

@@ -422,7 +422,11 @@ public class ElectronicMembershipCardController {
                     params_1.put("stationId", stationId);
                     params_1.put("oilName", oilName);
                     //获取客户会员信息
-                    CustomerManage customerManageInfo = customerManagerService.getCustomerManageInfo(customerManage);
+                    CustomerManage cc = new CustomerManage();   //存放客户信息
+                    cc.setUnionId(unionId);
+                    cc.setStationId(Integer.valueOf(stationId));    //油站ID
+                    cc.setOilName(oilName);    //油品名称
+                    CustomerManage customerManageInfo = customerManagerService.getCustomerManageInfo(cc);
                     customerManage.setGroupId(Integer.valueOf(groupId));
                     if(customerManageInfo !=null){
                         //此处用于更新没有会员ID的用户
@@ -432,7 +436,7 @@ public class ElectronicMembershipCardController {
                         }
                         customerManage.setGroupId(Integer.valueOf(groupId));
                         customerManage.setPhoneNumber(mobilePhone);
-                        customerManage.setAmt(customerManageInfo.getAmt().add(new BigDecimal(amt)));
+                        customerManage.setAmt(customerManageInfo.getAmt().add(new BigDecimal(dzkAmt)));
                         customerManage.setLiters(customerManageInfo.getLiters().add(new BigDecimal(oilLiters)));
                         logger.info("存在客户 更新时手机号参数: " + customerManage.getPhoneNumber());
                         List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeListOrderByDesc(params_1);  //直降

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

@@ -691,7 +691,11 @@ public class PayController {
         customerManage.setRegtime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(infoMap.get("registeDate").toString()));
         customerManage.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));    //油站ID
         customerManage.setOilName(infoMap.get("oilName").toString());    //油品名称
-        CustomerManage existCustomer = customerManagerService.getCustomerManageInfo(customerManage);         //已存在用户信息 existCustomer
+        CustomerManage c = new CustomerManage();   //存放客户信息
+        c.setUnionId(infoMap.get("unionId").toString());
+        c.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));    //油站ID
+        c.setOilName(infoMap.get("oilName").toString());    //油品名称
+        CustomerManage existCustomer = customerManagerService.getCustomerManageInfo(c);         //已存在用户信息 existCustomer
         //判断该用户是否已存在
         if(existCustomer != null){  //存在该用户时更新
             if(existCustomer.getAmt() !=null){

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

@@ -766,7 +766,8 @@ public class PayOrderController {
         }
         //当前客户是否已存在当前油站客户信息中
         CustomerManage customerManage = new CustomerManage();
-        customerManage.setPhoneNumber(params.get("mobilePhone").toString());
+        //customerManage.setPhoneNumber(params.get("mobilePhone").toString());
+        customerManage.setUnionId(params.get("unionId").toString());
         customerManage.setOilName(oilName);
         customerManage.setStationId(Integer.valueOf(stationId));
         CustomerManage customerManageInfo = customerManagerService.getCustomerManageInfo(customerManage);