修改审核退款订单逻辑，修改终端状态逻辑

xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java

@@ -570,7 +570,9 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
     @Override
     public List<Map<String, Object>> getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude) {
 
-        if(null==longitude||"".equals(longitude)||null==latitude||"".equals(latitude)) longitude="104.065861"; latitude="30.657401";
+        if(null==longitude||"".equals(longitude)||null==latitude||"".equals(latitude)){
+            longitude="104.065861"; latitude="30.657401";
+        }
 
         List<String> stringList = new ArrayList<>();
         if (serviceFacilities != null && serviceFacilities != "") {
@@ -596,6 +598,9 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
     @Override
     public Map<String, Object> getWXXhpcChargingStationMessage(Long chargingStationId, String longitude, String latitude) {
 
+        if(null==longitude||"".equals(longitude)||null==latitude||"".equals(latitude)){
+            longitude="104.065861"; latitude="30.657401";
+        }
         //获取基本信息
         Map<String, Object> map = xhpcChargingStationMapper.getWXXhpcChargingStationMessage(chargingStationId, longitude, latitude);
 
@@ -645,17 +650,21 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
                 if(map.get("serialNumber") !=null){
                     Map<String, Object> cacheMap =redisService.getCacheMap("gun:"+map.get("serialNumber").toString());
                     if(!cacheMap.isEmpty()){
-                        if("空闲".equals(cacheMap.get("status"))){
+                        if ("离线".equals(cacheMap.get("status").toString())){
-                            map.put("status", 2);
-                        }else if ("离线".equals(cacheMap.get("status"))){
                             map.put("status", 0);
-                        }else if("故障".equals(cacheMap.get("status"))){
+                        }else if("故障".equals(cacheMap.get("status").toString())){
                             map.put("status", 1);
                             if(cacheMap.get("hf")!=null){
                                 map.put("cause", cacheMap.get("hf").toString());
                             }else{
                                 map.put("cause", "--");
                             }
+                        }else if("空闲".equals(cacheMap.get("status").toString())){
+                             if("是".equals(cacheMap.get("vehicleGunStatus").toString())){
+                                 map.put("status", 4);
+                                 continue;
+                             }
+                             map.put("status", 2);
                         }else{
                             //充电桩
                             map.put("status", 3);
@@ -1012,12 +1021,22 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi
 
     public static void main(String[] args) {
         //时间差
-        String startTime="01:00:00";
+//        String startTime="01:00:00";
-        String split = startTime.split(":")[0];
+//        String split = startTime.split(":")[0];
-        System.out.println("split:"+split);
+//        System.out.println("split:"+split);
-        int num= Integer.valueOf(split);
+//        int num= Integer.valueOf(split);
+//
+//        System.out.println(num);
+
+
+        for (int i = 0; i <10 ; i++) {
+
+            if(i==5){
+                continue;
+            }
+            System.out.println("i:"+i);
+        }
 
-        System.out.println(num);
 
     }
 

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java

@@ -130,7 +130,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
             }else{
                 String vehicleGunStatus = cacheMap.get("vehicleGunStatus").toString();
                 if(!"是".equals(vehicleGunStatus)){
-                    return AjaxResult.error(1109, "请插枪");
+                    return AjaxResult.error(1109, "请插好充电枪");
                 }
             }
         }

xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java

@@ -356,7 +356,7 @@ public class XhpcRefundAuditController extends BaseController {
                     BigDecimal surplus =new BigDecimal(balance).subtract(amount);
                     xhpcAppUser.setBalance(surplus);
                     xhpcUserAccountStatementMapper.updateAppUserBalance(xhpcAppUser);
-                    updateXhpcRefundOrder(id,2);
+                    updateXhpcRefundOrder(id,1);
                 }
                 return AjaxResult.success("退款成功");
             }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java

@@ -13,6 +13,7 @@ import com.xhpc.user.domain.XhpcInternetUser;
 import com.xhpc.user.service.IXhpcInternetUserService;
 import com.xhpc.user.service.IXhpcUserService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,7 +40,7 @@ public class XhpcInternetUserController extends BaseController {
      * 新增流量用户
      */
     @ApiOperation("新增流量用户")
-    //@PreAuthorize(hasPermi = "user:internet:add")
+    @RequiresRoles("admin")
     @PostMapping("/add")
     public AjaxResult add(@Valid @RequestBody XhpcInternetUser xhpcInternetUser) {
         SysUser sysUser = new SysUser();
@@ -69,7 +70,7 @@ public class XhpcInternetUserController extends BaseController {
      * 修改流量用户
      */
     @ApiOperation("修改流量用户")
-    @PreAuthorize(hasPermi = "user:internet:edit")
+    @RequiresRoles("admin")
     @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody XhpcInternetUser xhpcInternetUser) {
         if (null == xhpcInternetUser.getInternetUserId()) {
@@ -87,7 +88,7 @@ public class XhpcInternetUserController extends BaseController {
      * 删除流量用户
      */
     @ApiOperation("删除流量用户")
-    //@PreAuthorize(hasPermi = "user:internet:remove")
+    @RequiresRoles("admin")
     @PostMapping("/remove")
     public AjaxResult remove(@RequestBody Map<String, Object> map) {
         String ids = StringUtils.valueOf(map.get("ids"));
@@ -123,7 +124,7 @@ public class XhpcInternetUserController extends BaseController {
      * 禁用/启用流量用户
      */
     @ApiOperation("禁用/启用流量用户")
-    //@PreAuthorize(hasPermi = "user:internet:status")
+    @RequiresRoles("admin")
     @PostMapping("/status")
     public AjaxResult status(@RequestBody Map<String, Object> map) {
         String internetUserId = StringUtils.valueOf(map.get("internetUserId"));

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java

@@ -13,10 +13,12 @@ import com.xhpc.user.domain.XhpcOperator;
 import com.xhpc.user.service.IXhpcOperatorService;
 import com.xhpc.user.service.IXhpcUserService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -39,10 +41,38 @@ public class XhpcOperatorController extends BaseController {
      * 新增运营商
      */
     @ApiOperation("新增运营商")
-    //@PreAuthorize(hasPermi = "user:operator:add")
+    @RequiresRoles("admin")
     @PostMapping("/add")
     public AjaxResult add(@Valid @RequestBody XhpcOperator xhpcOperator) {
         SysUser sysUser = new SysUser();
+        BigDecimal t3 =new BigDecimal(100);
+        BigDecimal t4 =new BigDecimal(0);
+        if(xhpcOperator.getPlatformCommissionRate() !=null && xhpcOperator.getMaintenanceCommissionRate() !=null){
+            BigDecimal t1 =new BigDecimal(xhpcOperator.getPlatformCommissionRate());
+            BigDecimal t2 =new BigDecimal(xhpcOperator.getMaintenanceCommissionRate());
+
+            if (t3.compareTo(t1.add(t2)) < 0) {
+                return AjaxResult.error("平台提成和运维提成之和不能大于100");
+            }
+            if (t1.compareTo(t4) < 0) {
+                return AjaxResult.error("平台提成不能小于0");
+            }
+            if (t2.compareTo(t4) < 0) {
+                return AjaxResult.error("运维提成不能小于0");
+            }
+        }
+        if("".equals(xhpcOperator.getSoc()) || xhpcOperator.getSoc() ==null){
+            return AjaxResult.error("请填写充电终止的soc");
+        }else{
+            BigDecimal t2 =new BigDecimal(xhpcOperator.getSoc());
+            if (t3.compareTo(t2) < 0) {
+                return AjaxResult.error("充电终止的soc不能大于100");
+            }
+            if (t2.compareTo(t4) < 0) {
+                return AjaxResult.error("充电终止的soc不能小于0");
+            }
+        }
+
         sysUser.setUserName(xhpcOperator.getPhone());
         sysUser.setNickName(xhpcOperator.getName());
         sysUser.setEmail(xhpcOperator.getEmail());
@@ -52,9 +82,9 @@ public class XhpcOperatorController extends BaseController {
         sysUser.setUserType(StatusConstants.OPERATION_USER_TYPE);
         sysUser.setDataPowerType(1);
         sysUser.setCreateBy(SecurityUtils.getUsername());
-        sysUser.setPassword(xhpcOperator.getPhone());
+        sysUser.setPassword("123456");
         Long[] roleIds = new Long[1];
-        roleIds[0] = 3l;
+        roleIds[0] = 3L;
         sysUser.setRoleIds(roleIds);
         if (iXhpcUserService.checkUserNameUnique(sysUser.getUserName()) > 0) {
             return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在");
@@ -71,6 +101,7 @@ public class XhpcOperatorController extends BaseController {
      */
     @ApiOperation("修改运营商")
     @PreAuthorize(hasPermi = "user:operator:edit")
+    @RequiresRoles("admin")
     @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody XhpcOperator xhpcOperator) {
         if (null == xhpcOperator.getOperatorId()) {
@@ -88,7 +119,7 @@ public class XhpcOperatorController extends BaseController {
      * 删除运营商
      */
     @ApiOperation("删除运营商")
-    //@PreAuthorize(hasPermi = "user:operator:remove")
+    @RequiresRoles("admin")
     @PostMapping("/remove")
     public AjaxResult remove(@RequestBody Map<String, Object> map) {
         String ids = StringUtils.valueOf(map.get("ids"));
@@ -124,7 +155,7 @@ public class XhpcOperatorController extends BaseController {
      * 禁用/启用运营商
      */
     @ApiOperation("禁用/启用运营商")
-    //@PreAuthorize(hasPermi = "user:operator:status")
+    @RequiresRoles("admin")
     @PostMapping("/status")
     public AjaxResult status(@RequestBody Map<String, Object> map) {
         String operatorId = StringUtils.valueOf(map.get("operatorId"));
@@ -144,4 +175,25 @@ public class XhpcOperatorController extends BaseController {
         List<Map<String, Object>> list = iXhpcOperatorService.selectOperatorList(name, contactName, contactPhone, createTimeStart, createTimeEnd);
         return AjaxResult.success(list);
     }
+
+
+    public static void main(String[] args) {
+        BigDecimal t1 =new BigDecimal(-1);
+        BigDecimal t2 =new BigDecimal(13);
+        BigDecimal t3 =new BigDecimal(100);
+        BigDecimal t4 =new BigDecimal(0);
+
+        if (t1.compareTo(t4) < 0) {
+            System.out.println("333");
+        }
+
+
+        if (t3.compareTo(t1.add(t2)) < 0) {
+            System.out.println("2222222");
+        }else{
+            System.out.println("111");
+        }
+
+    }
+
 }

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java

@@ -14,6 +14,7 @@ import com.xhpc.user.service.IXhpcOperatorService;
 import com.xhpc.user.service.IXhpcUserService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,7 +51,7 @@ public class XhpcUserController extends BaseController {
      * 新增平台用户
      */
     @ApiOperation("新增平台用户")
-    @PreAuthorize(hasPermi = "user:pc:add")
+    @RequiresRoles("admin")
     @PostMapping("/pc/add")
     public AjaxResult pcAdd(@RequestBody SysUser sysUser) {
         if (iXhpcUserService.checkUserNameUnique(sysUser.getUserName()) > 0) {
@@ -78,7 +79,7 @@ public class XhpcUserController extends BaseController {
      * 修改平台用户
      */
     @ApiOperation("修改平台用户")
-    @PreAuthorize(hasPermi = "user:pc:edit")
+    @RequiresRoles("admin")
     @PostMapping("/pc/edit")
     public AjaxResult pcEdit(@RequestBody SysUser sysUser) {
         if (null == sysUser.getUserId()) {