lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/vo/admin/bill/BillExcelVO.java

@@ -41,10 +41,10 @@ public class BillExcelVO implements Serializable {
 	private String phone;
 
 	/**
-	 * 标准资费
+	 * 账单金额
 	 */
 	@NotBlank(message = "账单金额不能为空")
-	@ExcelProperty("标准资费")
+	@ExcelProperty("账单金额")
 	private String billFee;
 
 	/**
@@ -58,8 +58,8 @@ public class BillExcelVO implements Serializable {
 	 * 下单时间
 	 */
 	@NotNull(message = "账单月份不能为空")
-	@ExcelProperty("下单时间")
-	private LocalDateTime billMonth;
+	@ExcelProperty("账单日期")
+	private Integer billMonth;
 
 	/**
 	 * 套餐名称

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderRechargeServiceImpl.java

@@ -90,7 +90,7 @@ public class LhbOrderRechargeServiceImpl extends MPJBaseServiceImpl<LhbOrderRech
                 first.ifPresent(s -> orderRecharge.setBillFee(NumberUtil.mul(new BigDecimal(s), 100)));
                 orderRecharge.setIfCode(order.getIfCode());
                 orderRecharge.setIsvNo(order.getIsvNo());
-                orderRecharge.setBillMonth(TotalDateUtil.getMonthNumber(billExcelVO.getBillMonth().toLocalDate()));
+                orderRecharge.setBillMonth(billExcelVO.getBillMonth());
                 save(orderRecharge);
 
                 OrderNotify orderNotify = OrderNotify.builder()

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderServiceImpl.java

@@ -84,6 +84,9 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
         }
         QueryOrderReq req = QueryOrderReq.builder().orderId(order.getOutOrderSn()).build();
         QueryLogisticsRes queryLogisticsRes = channelFactory.getChannel(order.getIfCode()).queryLogistics(req);
+        if(queryLogisticsRes == null){
+            throw new GlobalCustomerException("暂未查询到物流信息");
+        }
         if(StrUtil.isNotBlank(queryLogisticsRes.getExpressNo())){
             order.setExpressNo(queryLogisticsRes.getExpressNo());
             order.updateById();