修改刷卡启动

ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/constant/Constants.java

@@ -192,4 +192,9 @@ public class Constants
 
     //请插好充电枪
     public static final String INSERT_THE_GUN = "insert the gun";
+
+    /**
+     * 模板id为null
+     */
+    public static final String LNVALID_RATE_MODE = "lnvalid rateModelId";
 }

xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java

@@ -29,11 +29,10 @@ public class XhpcCardController extends BaseController {
      * @return
      */
     @GetMapping("/cardStartup")
-    public R cardStartup(@RequestParam(value = "cardno") String cardno, @RequestParam(value = "serialNumber") String serialNumber) {
+    public R cardStartup(@RequestParam(value = "cardno") String cardno, @RequestParam(value = "serialNumber") String serialNumber ,@RequestParam(value = "rateModelId") String rateModelId){
-
         logger.info("<<<<<<<<<<<<<<<<<<<<<<<<卡启动充电判断>>>>>>>>>>>>>>>>>");
         logger.info("<<<<<<<<<<<<<<<<<<<<<<<<卡启动充电判断>>>>>>>>>>>>>>>>>");
-        return xhpcCardService.cardStartup(cardno, serialNumber);
+        return xhpcCardService.cardStartup(cardno, serialNumber,rateModelId);
     }
 
     @GetMapping("/devices")

xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java

@@ -16,7 +16,7 @@ public interface IXhpcCardService {
      * @param serialNumber 终端卡号
      * @return
      */
-    R cardStartup(String cardno, String serialNumber);
+    R cardStartup(String cardno, String serialNumber,String rateModelId);
 
     /**
      * 查询卡授权设备列表

xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java

@@ -88,9 +88,42 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
     //}
 
     @Override
-    public R cardStartup(String cardno, String serialNumber) {
+    public R cardStartup(String cardno, String serialNumber,String rateModelId) {
 
-        return null;
+        IccardInfo iccardInfo = xhpcCardMapper.getIccardInfoCardno(cardno);
+        if(iccardInfo !=null){
+            if(iccardInfo.getCardtype()==0){
+                return R.fail(Constants.OFFLINE_CARD);
+            }
+            if(iccardInfo.getStatus()==0){
+                return R.fail(Constants.ZERO_CARD);
+            }
+            if(iccardInfo.getStatus()==2){
+                return R.fail(Constants.TWO_CARD);
+            }
+            if(iccardInfo.getStatus()==3){
+                return R.fail(Constants.THREE_CARD);
+            }
+            if(iccardInfo.getStatus()==4){
+                return R.fail(Constants.FOUR_CARD);
+            }
+        }else{
+            return R.fail(Constants.LNVALID_CARD);
+        }
+        if("".equals(rateModelId) || rateModelId==null){
+            return R.fail(Constants.LNVALID_RATE_MODE);
+        }
+        //查询卡号对应的用户
+        XhpcIcCardInfo xhpcIcCardInfo = xhpcCardMapper.getXhpcIcCardInfo(iccardInfo.getId().toString());
+        if(xhpcIcCardInfo ==null){
+            return R.fail(Constants.LNVALID_USER);
+        }
+        Long userId=xhpcIcCardInfo.getUserId();
+        Integer userType=xhpcIcCardInfo.getUserType();
+        String tenantId=xhpcIcCardInfo.getTenantId();
+        Integer type =1;
+        String grantOperator=xhpcIcCardInfo.getGrantOperatorId();
+        return cardHistoryOrderService.cardStartup(userId, serialNumber, userType,tenantId,type,grantOperator,rateModelId);
     }
 
     @Override

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/CardHistoryOrderService.java

@@ -25,5 +25,5 @@ public interface CardHistoryOrderService {
      * @return
      */
     @GetMapping("/api/chargeOrder/cardStartup")
-    R cardStartup(@RequestParam(value = "userId") Long userId, @RequestParam(value = "serialNumber") String serialNumber, @RequestParam(value = "userType") Integer userType, @RequestParam(value = "tenantId") String tenantId, @RequestParam(value = "type") Integer type, @RequestParam(value = "grantOperator") String grantOperator);
+    R cardStartup(@RequestParam(value = "userId") Long userId, @RequestParam(value = "serialNumber") String serialNumber, @RequestParam(value = "userType") Integer userType, @RequestParam(value = "tenantId") String tenantId, @RequestParam(value = "type") Integer type, @RequestParam(value = "grantOperator") String grantOperator, @RequestParam(value = "rateModelId") String rateModelId);
 }

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/CardService.java

@@ -22,5 +22,5 @@ public interface CardService {
      * @return
      */
     @GetMapping("/card/cardStartup")
-    R cardStartup(@RequestParam(value = "cardno") String cardno, @RequestParam(value = "serialNumber") String serialNumber);
+    R cardStartup(@RequestParam(value = "cardno") String cardno, @RequestParam(value = "serialNumber") String serialNumber, @RequestParam(value = "rateModelId") String rateModelId);
 }

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardFallbackFactory.java

@@ -16,7 +16,7 @@ public class CardFallbackFactory implements FallbackFactory<CardService> {
     public CardService create(Throwable cause) {
         return new CardService() {
             @Override
-            public R cardStartup(String cardno, String serialNumber) {
+            public R cardStartup(String cardno, String serialNumber,String rateModelId) {
                 return R.fail("卡启动判断接口失败:" + cause.getMessage());
             }
         };

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/CardHistoryOrderFactory.java

@@ -16,7 +16,7 @@ public class CardHistoryOrderFactory implements FallbackFactory<CardHistoryOrder
 
         return new CardHistoryOrderService() {
             @Override
-            public R cardStartup(Long userId,String serialNumber,Integer userType,String tenantId,Integer type,String grantOperator) {
+            public R cardStartup(Long userId,String serialNumber,Integer userType,String tenantId,Integer type,String grantOperator,String rateModelId) {
                 return R.fail("卡启动前判断启动失败:" + cause.getMessage());
             }
         };

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java

@@ -172,9 +172,9 @@ public class XhpcChargeOrderController extends BaseController {
      * @return
      */
     @GetMapping("/cardStartup")
-    public R cardStartup(Long userId, String serialNumber, Integer userType, String tenantId, Integer type, String grantOperator)
+    public R cardStartup(Long userId, String serialNumber, Integer userType, String tenantId, Integer type, String grantOperator,String rateModelId)
     {
-        return iXhpcChargeOrderService.cardStartup(userId,serialNumber,userType,tenantId,type,grantOperator);
+        return iXhpcChargeOrderService.cardStartup(userId,serialNumber,userType,tenantId,type,grantOperator,rateModelId);
     }
 
 

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcChargeOrderService.java

@@ -167,6 +167,6 @@ public interface IXhpcChargeOrderService {
     Map<String,Object> getXhpcChargingPileById(Long chargingPileId);
 
 
-    R cardStartup(Long userId,String serialNumber,Integer userType,String tenantId, Integer type, String grantOperator);
+    R cardStartup(Long userId,String serialNumber,Integer userType,String tenantId, Integer type, String grantOperator,String rateModelId);
 
 }

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

@@ -628,7 +628,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
     }
 
     @Override
-    public R cardStartup(Long userId, String serialNumber, Integer userType,String tenantId, Integer type, String grantOperator) {
+    public R cardStartup(Long userId, String serialNumber, Integer userType,String tenantId, Integer type, String grantOperator,String rateModelId) {
 
         R user = userTypeService.getUser(null, userId, userType, null,tenantId);
         if(user ==null || user.getData() ==null){
@@ -706,7 +706,36 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
                 }
             }
         }
-        return R.ok();
+
+        //创建订单
+        //订单流水号 终端号+年月日时分秒+自增4位 共32位
+        String orderNo = genOrder(serialNumber);
+        XhpcChargeOrder xhpcChargeOrder = new XhpcChargeOrder();
+        xhpcChargeOrder.setChargingStationId(xhpcTerminal.getChargingStationId());
+        xhpcChargeOrder.setUserId(userId);
+        xhpcChargeOrder.setTerminalId(xhpcTerminal.getTerminalId());
+        xhpcChargeOrder.setGunId(xhpcTerminal.getSerialNumber());
+        xhpcChargeOrder.setSerialNumber(orderNo);
+        xhpcChargeOrder.setSource(userType);
+        xhpcChargeOrder.setStatus(-1);
+        xhpcChargeOrder.setTenantId(tenantId);
+        //获取桩信息
+        Map<String, Object> xhpcChargingPileById =xhpcChargeOrderMapper.getXhpcChargingPileById(xhpcTerminal.getChargingPileId(),tenantId);
+        if (xhpcChargingPileById != null && xhpcChargingPileById.get("power") != null) {
+            xhpcChargeOrder.setPower(xhpcChargingPileById.get("power").toString());
+        }
+        xhpcChargeOrder.setRateModelId(Long.valueOf(rateModelId));
+        xhpcChargeOrder.setChargingMode("刷卡");
+
+        xhpcChargeOrder.setCreateTime(Calendar.getInstance().getTime());
+        xhpcChargeOrder.setType(40);
+        xhpcChargeOrderMapper.addXhpcChargeOrder(xhpcChargeOrder);
+
+        Map<String,Object> map =new HashMap<>();
+        map.put("balance",userMessage.get("balance"));
+        map.put("serialNumber",orderNo);
+
+        return R.ok(map);
     }
 
     public static boolean isValidDate(String str) {

xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml

@@ -187,7 +187,7 @@
         select xro.refund_order_id refundOrderId ,xro.refund_order_number refundOrderNumber,
         xro.alipay_id alipayId ,xro.open_id openId,xro.user_id userId,xro.amount,
         xro.type,xro.examine_status examineStatus,xro.`status`,xro.source source,xro.create_time createTime,
-        xau.phone,sdd.dict_label statusName,sdds.dict_label examineStatusName
+        xau.phone,sdd.dict_label statusName,sdds.dict_label examineStatusName,cop.account communityAccount,cup.account customersAccount
         from xhpc_refund_order xro
         LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id and xro.source =0
         LEFT JOIN xhpc_community_personnel cop on cop.community_personnel_id = xro.user_id and xro.source =2