修改

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

@@ -490,22 +490,22 @@ public class ElectronicMembershipCardController {
 
     }
 
-    //插入集团客户信息
-    public CustomerGroup insertCustomerGroup(Map infoMap){
-        CustomerGroup customerGroup = new CustomerGroup();
-        customerGroup.setGroupId(Integer.valueOf(infoMap.get("groupId").toString()));
-        customerGroup.setUnionId(infoMap.get("unionId").toString());
-        CustomerGroup customerGroupInfo = customerManagerService.selectCustomerGroup(customerGroup);
-        if(customerGroupInfo ==null){
-            customerGroup.setPhoneNumber(infoMap.get("mobilePhone").toString());
-            //客户ID格式：集团+油站+时间戳
-            String customerId=infoMap.get("groupId").toString()+infoMap.get("stationId").toString()+System.nanoTime();
-            customerGroup.setCustomerId(customerId);
-            logger.info("集团客户会员ID: " +customerId);
-            customerManagerService.insertCustomerGroup(customerGroup);
-        }
-        return customerGroup;
-    }
+//    //插入集团客户信息
+//    public CustomerGroup insertCustomerGroup(Map infoMap){
+//        CustomerGroup customerGroup = new CustomerGroup();
+//        customerGroup.setGroupId(Integer.valueOf(infoMap.get("groupId").toString()));
+//        customerGroup.setUnionId(infoMap.get("unionId").toString());
+//        CustomerGroup customerGroupInfo = customerManagerService.selectCustomerGroup(customerGroup);
+//        if(customerGroupInfo ==null){
+//            customerGroup.setPhoneNumber(infoMap.get("mobilePhone").toString());
+//            //客户ID格式：集团+油站+时间戳
+//            String customerId=infoMap.get("groupId").toString()+infoMap.get("stationId").toString()+System.nanoTime();
+//            customerGroup.setCustomerId(customerId);
+//            logger.info("集团客户会员ID: " +customerId);
+//            customerManagerService.insertCustomerGroup(customerGroup);
+//        }
+//        return customerGroup;
+//    }
 
     /**
      * 打印小票

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

@@ -561,7 +561,7 @@ public class PayController {
                         //手机号必须有
                         if(infoMap != null && infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null ){
                             //插入客户积分返回要插入客户的信息
-                            insertCustomerGroup(infoMap);
+                            //insertCustomerGroup(infoMap);
                             CustomerManage customerManage = insertCustomerManage(infoMap);
                             StationPayManage stationPayManage = new StationPayManage();
                             stationPayManage.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
@@ -614,20 +614,20 @@ public class PayController {
     }
 
     //插入集团客户信息
-    public CustomerGroup insertCustomerGroup(Map infoMap){
-        CustomerGroup customerGroup = new CustomerGroup();
-        customerGroup.setGroupId(Integer.valueOf(infoMap.get("groupId").toString()));
-        customerGroup.setUnionId(infoMap.get("unionId").toString());
-        CustomerGroup customerGroupInfo = customerManagerService.selectCustomerGroup(customerGroup);
-        if(customerGroupInfo ==null){
-            customerGroup.setPhoneNumber(infoMap.get("mobilePhone").toString());
-            //客户ID格式：集团+油站+时间戳
-            String customerId=infoMap.get("groupId").toString()+infoMap.get("stationId").toString()+System.nanoTime();
-            customerGroup.setCustomerId(customerId);
-            customerManagerService.insertCustomerGroup(customerGroup);
-        }
-        return customerGroup;
-    }
+//    public CustomerGroup insertCustomerGroup(Map infoMap){
+//        CustomerGroup customerGroup = new CustomerGroup();
+//        customerGroup.setGroupId(Integer.valueOf(infoMap.get("groupId").toString()));
+//        customerGroup.setUnionId(infoMap.get("unionId").toString());
+//        CustomerGroup customerGroupInfo = customerManagerService.selectCustomerGroup(customerGroup);
+//        if(customerGroupInfo ==null){
+//            customerGroup.setPhoneNumber(infoMap.get("mobilePhone").toString());
+//            //客户ID格式：集团+油站+时间戳
+//            String customerId=infoMap.get("groupId").toString()+infoMap.get("stationId").toString()+System.nanoTime();
+//            customerGroup.setCustomerId(customerId);
+//            customerManagerService.insertCustomerGroup(customerGroup);
+//        }
+//        return customerGroup;
+//    }
 
     /***
      * 插入客户信息

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

@@ -277,7 +277,7 @@
         B.status                AS status,
         B.discount_coupon_amt   AS discountCouponAmt
     FROM
-        app_user_info AS A  LEFT JOIN pay_order AS B ON A.user_id = B.consumer_id
+        app_user_info           AS A  LEFT JOIN pay_order AS B ON A.user_id = B.consumer_id
     <where>
       <if test="userType != null and userType !=''">
         A.user_type = #{userType}