Perfecting the start charge.

evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java

@@ -8,6 +8,7 @@ import com.xhpc.evcs.dto.CommonRequest;
 import com.xhpc.evcs.dto.CommonResponse;
 import com.xhpc.evcs.dto.StartChargeRequest;
 import com.xhpc.evcs.dto.StartChargeResponse;
+import com.xhpc.evcs.encryption.EvcsConst;
 import com.xhpc.evcs.jpa.AuthSecretTokenRepository;
 import com.xhpc.evcs.jpa.OrderMappingRepository;
 import com.xhpc.evcs.utils.JSONUtil;
@@ -50,7 +51,7 @@ public class QueryStartChargeController {
             startChargeResponse.setStartChargeSeqStat(5);
             resp.setMsg("This 3rd has no token");
         } else {
-            // invoke a order making interface(finished);
+            // invoke an order making interface(finished);
             String plateNum = startChargeRequest.getPlateNum();
             plateNum = plateNum == null ? startChargeRequest.getPlateNum2() : plateNum;
             R res = pileOrderService.pileStartUpBy3rd(startChargeSeq, startChargeRequest.getDriverId(),
@@ -58,8 +59,12 @@ public class QueryStartChargeController {
             startChargeResponse.setStartChargeSeq(startChargeSeq);
             startChargeResponse.setConnectorID(connectorID);
             if (res.getCode() != 200) {
+                if (res.getCode() != 500) {
+                    startChargeResponse.setFailReason(res.getCode());
+                } else {
+                    startChargeResponse.setFailReason(3);
+                }
                 startChargeResponse.setSuccStat(1);
-                startChargeResponse.setFailReason(0);
                 startChargeResponse.setStartChargeSeqStat(4);
             } else {
                 Map<String, Object> etOrderData = (Map<String, Object>) res.getData();
@@ -84,8 +89,12 @@ public class QueryStartChargeController {
                 pushOrder.put("chargeOrderInfoNotificationStat", 0);
                 REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder);
             }
+            if (res.getCode() != 200) {
+                resp.setRet(EvcsConst.RET_FAIL);
+            } else {
+                resp.setRet(EvcsConst.RET_SUCC);
+            }
             resp.setMsg(res.getMsg());
-            resp.setRet(String.valueOf(res.getCode()));
         }
         resp.setData(JSONUtil.toJSONString(startChargeResponse));
         return resp;

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

@@ -366,12 +366,13 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
         int resTime = xhpcInternetUserMapper.selectByOperatorIdEvcs(internetSerialNumber.substring(0, 9));
         if (resTime == 0) {
             r.setCode(500);
+            r.setMsg("运营商无权限对此桩进行操作");
             return r;
         }
 
         StartChargingData startChargingData = new StartChargingData();
         //500000 equals 500 yuan
-        startChargingData.setBalance(500000); //todo @Chen use param amt
+        startChargingData.setBalance(chargingAmt * 1000);
 
         startChargingData.setGunId(connectorId);
 
@@ -389,26 +390,35 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
 
         if (cacheMap == null) {
             r.setCode(500);
+            r.setMsg("未注册的终端,请选择其他终端充电");
             return r;
         } else {
             if (cacheMap.get("status") == null) {
                 r.setCode(500);
+                r.setMsg("未知的终端状态,请选择其他终端充电");
                 return r;
             } else {
                 String statusCache = cacheMap.get("status").toString();
                 //不同的状态
-                if (!"空闲".equals(statusCache) || "故障".equals(statusCache) || "充电".equals(statusCache)) {
+                if ("离线".equals(statusCache) || "故障".equals(statusCache) || "充电".equals(statusCache)) {
-                    r.setCode(500);
+                    if ("离线".equals(statusCache)) {
+                        r.setCode(2);
+                    } else {
+                        r.setCode(500);
+                    }
+                    r.setMsg("此终端" + statusCache + "中,请选择其他终端充电");
                     return r;
                 }
             }
             if (cacheMap.get("vehicleGunStatus") == null) {
                 r.setCode(500);
+                r.setMsg("未知的枪状态,请选择其他终端充电");
                 return r;
             } else {
                 String vehicleGunStatus = cacheMap.get("vehicleGunStatus").toString();
                 if (!"是".equals(vehicleGunStatus)) {
                     r.setCode(500);
+                    r.setMsg("请插好充电枪");
                     return r;
                 }
             }
@@ -417,7 +427,8 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
         //终端信息
         XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(connectorId);
         if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) {
-            r.setCode(500);
+            r.setCode(1);
+            r.setMsg("无效的终端编号");
             return r;
         }
 
@@ -456,6 +467,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
         logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getMsg() + ">>>>>>>>>>>>>>>>>");
         if (r1.getCode() != 200) {
             r.setCode(500);
+            r.setMsg(r1.getMsg());
             return r;
         }
         String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss");
@@ -466,9 +478,11 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
             r.setCode(200);
             data.put("orderNo", orderNo);
             data.put("startTime", startTime);
+            r.setMsg("成功");
             r.setData(data);
         } else {
             r.setCode(500);
+            r.setMsg("基础设施服务器内部错误");
         }
         return r;