会员信息增加区分-是扫码还是商户自行添加的区分

src/main/java/com/charging/chargingparking/entity/ParkingMember.java

@@ -121,6 +121,8 @@ public class ParkingMember implements Serializable {
     private Integer memberType;
 
     private Integer gunType;
+    private Integer subMerberType;
     @TableField(exist = false)
     private String memberOperator;
+
 }

src/main/java/com/charging/chargingparking/modules/backController/ParkingMemberInfoController.java

@@ -360,33 +360,44 @@ public class ParkingMemberInfoController {
             List<ParkingMember> parkingMemberList = page.getRecords();
             if (parkingMemberList.size() > 0) {
                 for (ParkingMember parkingMember : parkingMemberList) {
-                    ParkingInfo parkingInfo = parkingInfoService.getById(parkingMember.getParkId());
-                    ParkingShop parkingShop1 = parkingShopService.getById(parkingMember.getMerchantId());
-                    parkingMember.setParkName(parkingInfo.getParkingName());
-                    if (parkingShop1 != null) {
-                        parkingMember.setShopName(parkingShop1.getMerchantName());
-                    }
                     String opName="";
-                    QueryWrapper queryWrapperLog = new QueryWrapper();
-                    queryWrapperLog.eq("parking_member_id", parkingMember.getId());
-                    queryWrapperLog.orderByDesc("create_time");
-                    List<ParkingMemberLog> parkingMemberLogList = parkingMemberLogService.list(queryWrapperLog);
-                    if(parkingMemberLogList!=null&&parkingMemberLogList.size()>0){
-                        ParkingMemberLog pmLog=parkingMemberLogList.get(0);
-                        if(pmLog!=null){
-                            String oPerator= pmLog.getCreateBy();
-                            if(StringUtils.isNotEmpty(oPerator)){
-                                User user= userService.get(oPerator);
-                                if(user!=null){
-                                    opName ="商户("+user.getRealName()+")";
-                                }
-                            }
+                    if(parkingMember.getSubMerberType()!=null){
+                        if(1==parkingMember.getSubMerberType()){
+                            opName ="商户添加";
+                        }if(2==parkingMember.getSubMerberType()){
+                            opName ="客户(扫码)";
                         }
                     }
-                    if(StringUtils.isEmpty(opName)){
-                        opName ="客户(扫码)";
-                    }
+
                     parkingMember.setMemberOperator(opName);
+
+//                    ParkingInfo parkingInfo = parkingInfoService.getById(parkingMember.getParkId());
+//                    ParkingShop parkingShop1 = parkingShopService.getById(parkingMember.getMerchantId());
+//                    parkingMember.setParkName(parkingInfo.getParkingName());
+//                    if (parkingShop1 != null) {
+//                        parkingMember.setShopName(parkingShop1.getMerchantName());
+//                    }
+//                    String opName="";
+//                    QueryWrapper queryWrapperLog = new QueryWrapper();
+//                    queryWrapperLog.eq("parking_member_id", parkingMember.getId());
+//                    queryWrapperLog.orderByDesc("create_time");
+//                    List<ParkingMemberLog> parkingMemberLogList = parkingMemberLogService.list(queryWrapperLog);
+//                    if(parkingMemberLogList!=null&&parkingMemberLogList.size()>0){
+//                        ParkingMemberLog pmLog=parkingMemberLogList.get(0);
+//                        if(pmLog!=null){
+//                            String oPerator= pmLog.getCreateBy();
+//                            if(StringUtils.isNotEmpty(oPerator)){
+//                                User user= userService.get(oPerator);
+//                                if(user!=null){
+//                                    opName ="商户("+user.getRealName()+")";
+//                                }
+//                            }
+//                        }
+//                    }
+//                    if(StringUtils.isEmpty(opName)){
+//                        opName ="客户(扫码)";
+//                    }
+//                    parkingMember.setMemberOperator(opName);
                 }
             }
             page.setRecords(parkingMemberList);
@@ -592,7 +603,7 @@ public class ParkingMemberInfoController {
             }
 
 
-            String id = parkingMemberService.giveParkingMember(memberCarNum.toUpperCase(), days, memberName, memberPhone, parkingShop, endTime, startTime);
+            String id = parkingMemberService.giveParkingMemberNew(memberCarNum.toUpperCase(), days, memberName, memberPhone, parkingShop, endTime, startTime,1);
             Map<String, Object> dataMap = new HashMap<>();
             dataMap.put("id", id);
             dataMap.put("days", days);
@@ -778,7 +789,7 @@ public class ParkingMemberInfoController {
                 String inTime = parkingShopService.getInTime(carNumber, parkingShop);
                 String memberTime = DateUtil.format(DateUtil.offsetDay(new Date(), 1), "yyyy-MM-dd") + " " + parkingShop.getMemberLeaveTime() + ":00";
                 String days = String.valueOf(DateUtil.betweenDay(DateUtil.parse(inTime, "yyyy-MM-dd"), DateUtil.parse(memberTime, "yyyy-MM-dd"), false));
-                String id = parkingMemberService.giveParkingMember(carNumber.toUpperCase(), days, memberName, null, parkingShop, memberTime, inTime);
+                String id = parkingMemberService.giveParkingMemberNew(carNumber.toUpperCase(), days, memberName, null, parkingShop, memberTime, inTime,2);
                 dataMap.put("id", id);
                 dataMap.put("inTime",inTime);
                 dataMap.put("days", days);

src/main/java/com/charging/chargingparking/service/ParkingMemberService.java

@@ -34,7 +34,7 @@ public interface ParkingMemberService extends IService<ParkingMember> {
     ParkingMember findByCarNum(String carNum);
 
     String giveParkingMember(String carNum, String days, String memberName, String memberPhone, ParkingShop parkingShop, String endTime, String startTime) throws Exception;
-
+    String giveParkingMemberNew(String carNum, String days, String memberName, String memberPhone, ParkingShop parkingShop, String endTime, String startTime,Integer subMerberType) throws Exception;
     void editParkingMember(String id, String memberCarNum, String memberName, String memberPhone, ParkingShop parkingShop, String days) throws Exception;
 
     String getMemberType(String parkId, String carNum);

src/main/java/com/charging/chargingparking/service/impl/ParkingMemberServiceImpl.java

@@ -630,7 +630,89 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
 
         return id;
     }
+    @Override
+    public String giveParkingMemberNew(String carNum, String days, String memberName, String memberPhone, ParkingShop parkingShop, String endTime, String startTime,Integer subMerberType) throws Exception {
+
+        Date endTimeDate = DateUtil.parse(endTime);
+        Date startTimeDate = DateUtil.parse(startTime);
+        String id = null;
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("park_id", parkingShop.getParkId());
+        queryWrapper.eq("member_car_num", carNum);
+        queryWrapper.eq("cloud_del_flag", false);
+        List<ParkingMember> parkingMemberList = parkingMemberMapper.selectList(queryWrapper);
+        if (parkingMemberList.size() > 0) {
+
+            ParkingMember parkingMember = parkingMemberList.get(0);
+
+            if (parkingMember.getMemberType() == 1 || StrUtil.isNotBlank(parkingMember.getMerchantId())) {
+                throw new Exception("会员已添加");
+            } else {
+                parkingMember.setMemberStartTime(startTimeDate);
+                parkingMember.setMemberEndTime(endTimeDate);
+                parkingMember.setMerchantId(parkingShop.getId());
+                parkingMember.setMemberName(memberName);
+                parkingMember.setMemberType(1);
+                parkingMember.setMemberPhone(memberPhone);
+                parkingMember.setUpdateTime(new Date());
+                parkingMember.setDays(Convert.toInt(days));
+                parkingMember.setSubMerberType(subMerberType);
+                updateById(parkingMember);
 
+                //保存会员新增日志
+                ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
+                parkingMemberLog.setParkingMemberId(parkingMember.getId());
+                parkingMemberLog.setCreateTime(new Date());
+                parkingMemberLog.setCreateBy(parkingShop.getSysUserId());
+                parkingMemberLog.setContent(StrUtil.format("新增会员{}，会员天数{}", parkingMember.getMemberCarNum(), days));
+                parkingMemberLogService.save(parkingMemberLog);
+            }
+            id = parkingMember.getId();
+        } else {
+            QueryWrapper queryWrapper2 = new QueryWrapper();
+            queryWrapper2.eq("park_id", parkingShop.getParkId());
+            queryWrapper2.eq("member_car_num", carNum);
+            queryWrapper2.le("member_end_time", DateUtil.parse(startTime));
+            queryWrapper2.eq("cloud_del_flag", false);
+            List<ParkingMember> parkingMemberList2 = parkingMemberMapper.selectList(queryWrapper2);
+            if (parkingMemberList2.size() > 0) {
+                for (ParkingMember parkingMember : parkingMemberList2) {
+                    parkingMember.setCloudDelFlag(true);
+                    parkingMember.setUpdateTime(new Date());
+                    parkingMemberMapper.updateById(parkingMember);
+                }
+            }
+
+
+            ParkingMember parkingMember = new ParkingMember();
+            parkingMember.setParkId(parkingShop.getParkId());
+            parkingMember.setMerchantId(parkingShop.getId());
+            parkingMember.setMemberName(memberName);
+            parkingMember.setMemberStartTime(startTimeDate);
+            parkingMember.setMemberCarNum(carNum);
+            parkingMember.setMemberEndTime(endTimeDate);
+            parkingMember.setMemberType(1);
+            parkingMember.setMemberPhone(memberPhone);
+            parkingMember.setCreateTime(new Date());
+            parkingMember.setCreateBy(parkingShop.getSysUserId());
+            parkingMember.setDays(Convert.toInt(days));
+            parkingMember.setSubMerberType(subMerberType);
+            save(parkingMember);
+
+            //保存会员新增日志
+            ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
+            parkingMemberLog.setParkingMemberId(parkingMember.getId());
+            parkingMemberLog.setCreateTime(new Date());
+            parkingMemberLog.setCreateBy(parkingShop.getSysUserId());
+            parkingMemberLog.setContent(StrUtil.format("新增会员{}，会员天数{}", parkingMember.getMemberCarNum(), days));
+            parkingMemberLogService.save(parkingMemberLog);
+
+            id = parkingMember.getId();
+        }
+
+
+        return id;
+    }
     @Override
     public void editParkingMember(String id, String memberCarNum, String memberName, String memberPhone, ParkingShop parkingShop, String days) throws Exception {
         ParkingMember parkingMember = getById(id);