修改结束订单为null问题

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

@@ -242,12 +242,18 @@ public class XhpcPileOrderController extends BaseController {
         try{
             //获取实时订单
             Map<String, Object> cacheMap = redisService.getCacheMap("order:"+orderNo);
+            if(cacheMap==null || cacheMap.get("orderData")==null ){
+                return R.fail(500,"无效订单号："+orderNo);
+            }
             CacheOrderData cacheOrderData = (CacheOrderData)cacheMap.get("orderData");
             //获取充电订单
             XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
             if(xhpcChargeOrder == null ){
                 return R.fail(500,"无效订单号："+orderNo);
             }
+            if(cacheOrderData==null || cacheOrderData.getT1PowerQuantity()==null ){
+                return R.fail(500,"无效订单号："+orderNo);
+            }
             if(xhpcChargeOrder.getStatus()==1 || xhpcChargeOrder.getStatus()==3){
                 logger.info("订单已结束不能重复结算>>>>>orderNo："+orderNo+">>>chargeOrderId:"+xhpcChargeOrder.getChargeOrderId());
                 return R.ok();
@@ -265,7 +271,6 @@ public class XhpcPileOrderController extends BaseController {
             //费率计费模型
             List<XhpcRate> rateModelList = xhpcChargeOrderService.getRateModelId(xhpcChargeOrder.getRateModelId());
             for (XhpcRate xhpcRate:rateModelList) {
-                System.out.println(">>>>>>"+xhpcRate.getRateValue());
                 if("00".equals(xhpcRate.getRateValue())){
                     t1powerFee = xhpcRate.getPowerFee();
                 }

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

@@ -73,7 +73,6 @@ public class AlipayPaymentController {
     @Autowired
     private UserTypeService userTypeService;
 
-
     private static final Logger logger = LoggerFactory.getLogger(AlipayPaymentController.class);
 
     @Log(title = "支付宝-支付", businessType = BusinessType.INSERT)

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

@@ -67,8 +67,6 @@ public class WxPaymentController {
     @Autowired
     private IXhpcRefundOrderService iXhpcRefundOrderService;
     @Autowired
-    private Environment environment;
-    @Autowired
     private PowerPileService powerPileService;
     @Autowired
     private TokenService tokenService;

xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcCustomersServiceImpl.java

@@ -20,10 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author yuyang
@@ -176,6 +173,7 @@ public class XhpcCustomersServiceImpl extends BaseService implements IXhpcCustom
         }else{
             return AjaxResult.error("请重新登录");
         }
+        xhpcCustomersPersonnel.setCreateTime(new Date());
         xhpcCustomersMapper.addCustomersPersonnel(xhpcCustomersPersonnel);
         if(rechargeMoney !=null){
             //增加一条充值记录