小程序桩接口调试完成

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

@@ -3,12 +3,9 @@ package com.xhpc.common.api;
 import com.xhpc.common.api.factory.PileOrderFallbackFactory;
 import com.xhpc.common.core.constant.ServiceNameConstants;
 import com.xhpc.common.core.domain.R;
-import com.xhpc.common.dto.PileEndOrder;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**

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

@@ -132,6 +132,8 @@ public class HxpcPileOrderController extends BaseController {
     @GetMapping("/chargeOrder/pileRimeOrder")
     public R pileRealtime(@RequestParam(value = "orderNo")String orderNo) {
 
+        logger.info("桩实时数据回调接口>>>>>orderNo："+orderNo);
+
         Date date = new Date();
         Map<String, Object> map = new HashMap<>();
         //获取实时订单
@@ -265,7 +267,7 @@ public class HxpcPileOrderController extends BaseController {
     @Transactional
     @PostMapping("/chargeOrder/pileEndOrder")
     public R pileEndOrder(@RequestParam(value = "orderNo") String orderNo) {
-
+        logger.info("桩订单结束回调>>>>>orderNo："+orderNo);
         try{
             //获取实时订单
             Map<String, Object> cacheMap = redisService.getCacheMap("order:"+orderNo);
@@ -395,9 +397,9 @@ public class HxpcPileOrderController extends BaseController {
                 if(operatorMessage.get("maintenanceCommissionRate") !=null && operatorMessage.get("commissionType") !=null && operatorMessage.get("platformCommissionRate") !=null){
                     Integer commissionType = (Integer) operatorMessage.get("commissionType");
                     //运维提成
-                    BigDecimal maintenanceCommissionRate = new BigDecimal(userMessage.get("maintenanceCommissionRate").toString()).divide(new BigDecimal(100));
+                    BigDecimal maintenanceCommissionRate = new BigDecimal(operatorMessage.get("maintenanceCommissionRate").toString()).divide(new BigDecimal(100));
                     //平台提成
-                    BigDecimal platformCommissionRate = new BigDecimal(userMessage.get("platformCommissionRate").toString()).divide(new BigDecimal(100));
+                    BigDecimal platformCommissionRate = new BigDecimal(operatorMessage.get("platformCommissionRate").toString()).divide(new BigDecimal(100));
                     //提成类型（0总金额提成 1服务费提成）
                     if(commissionType==0){
                         BigDecimal multiply1 = surplusPowerPrice.multiply(platformCommissionRate);
@@ -428,7 +430,7 @@ public class HxpcPileOrderController extends BaseController {
                     //订单异常
                     hxpcChargeOrder.setStatus(2);
                     //异常原因
-                    hxpcChargeOrder.setErroRemark("桩异常："+stopReason+">>>>用户id:"+userId+"为空"+">>>>运营商提出为空");
+                    hxpcChargeOrder.setErroRemark("桩异常："+stopReason+">>>>用户id:"+userId+"为空"+">>>>运营商数据为空");
 
                 }
             }
@@ -466,6 +468,12 @@ public class HxpcPileOrderController extends BaseController {
             //hxpcChargeOrderService.deleteRealTimeOrder(hxpcChargeOrder.getChargeOrderId());
 
             //添加新的实时数据
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("code", 500);
+            map.put("userId", userId);
+            JSONObject json = new JSONObject(map);
+            rabbimt(userId + "##" + json);
         }catch (Exception e){
             e.printStackTrace();
             return R.fail(500,"添加订单回调失败");
@@ -485,7 +493,6 @@ public class HxpcPileOrderController extends BaseController {
         HxpcChargeOrder hxpcChargeOrder = hxpcChargeOrderService.getSerialNumberMessage(serialNumber);
         if(status==0){
             hxpcChargeOrder.setStatus(0);
-            hxpcChargeOrder.setDelFlag(0);
         }else{
             hxpcChargeOrder.setStatus(-1);
             hxpcChargeOrder.setDelFlag(1);

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/HxpcChargeOrderMapper.java

@@ -66,7 +66,7 @@ public interface HxpcChargeOrderMapper {
      * @param hxpcChargeOrder
      * @return
      */
-    int updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder);
+    void updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder);
 
     /**
      * 获取充电订单数据

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

@@ -71,7 +71,7 @@ public interface IHxpcChargeOrderService {
      * @param hxpcChargeOrder
      * @return
      */
-    int updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder);
+    void updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder);
 
 
     /**

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

@@ -205,8 +205,8 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService {
     }
 
     @Override
-    public int updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder) {
+    public void updateXhpcChargeOrder(HxpcChargeOrder hxpcChargeOrder) {
-        return hxpcChargeOrderMapper.updateXhpcChargeOrder(hxpcChargeOrder);
+         hxpcChargeOrderMapper.updateXhpcChargeOrder(hxpcChargeOrder);
     }
 
     @Override

xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml

@@ -23,3 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#logging:
+#  level:
+#    com.xhpc.order.mapper: debug

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml

@@ -233,10 +233,10 @@
 
     <update id="updateXhpcChargeOrder" parameterType="com.xhpc.order.domain.HxpcChargeOrder">
         update xhpc_charge_order
-        <trim prefix="SET" suffixOverrides=",">
+        <set>
             <if test="startSoc != null">start_soc = #{startSoc},</if>
             <if test="endSoc != null">end_soc = #{endSoc},</if>
-            <if test="status != null">status = #{status},</if>
+            <if test="status != null">status=#{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
             <if test="chargingTime != null">charging_time = #{chargingTime},</if>
@@ -244,9 +244,9 @@
             <if test="type != null">type = #{type},</if>
             <if test="power != null">power = #{power},</if>
             <if test="erroRemark != null">erro_remark = #{erroRemark},</if>
-            <if test="amountCharged != null">amount_charged = #{amountCharged},</if>
+            <if test="amountCharged != null">amount_charged = #{amountCharged}</if>
-        </trim>
+        </set>
-        where charge_order_id = #{chargingStationId}
+        where charge_order_id = #{chargeOrderId}
     </update>
 
     <select id="getHistotyChargeOrderStatusList" resultType="map">