lubo месяцев назад: 3
Родитель
Сommit
ca4786fe44

+ 1 - 1
ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/impl/BusinessDayBillServiceImpl.java

@@ -249,7 +249,7 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
             case USER_SHOP_ORDER:
                 businessDayBill.setActualReceivePayment(businessDayBill.getActualReceivePayment().add(bo.getActualReceivePayment()));
                 businessDayBill.setActualCredited(businessDayBill.getActualCredited().add(bo.getActualCredited()));
-                businessDayBill.setShopOrderNum(businessDayBill.getOnlineOrderNum() + 1);
+                businessDayBill.setShopOrderNum(businessDayBill.getShopOrderNum() + 1);
                 businessDayBill.setShopOrderAmount(businessDayBill.getShopOrderAmount().add(bo.getShopOrderAmount()));
                 businessDayBill.setPlatformServiceFee(businessDayBill.getPlatformServiceFee().add(bo.getPlatformServiceFee()));
                 businessDayBill.setPlatformIncome(businessDayBill.getPlatformIncome().add(bo.getPlatformIncome()));

+ 1 - 1
ruoyi-line/src/main/java/com/ruoyi/subsidy/domain/bo/SubsidyQueueBo.java

@@ -150,7 +150,7 @@ public class SubsidyQueueBo extends BaseTimeEntity {
     @NotNull(message = "补贴状态(0:排队中,1:补贴完成)不能为空", groups = { AddGroup.class, EditGroup.class })
     private SubsidyStatus subsidyStatus;
 
-    @ApiModelProperty("订单退款状态(0:未退款,1:退款中,2:已退款)")
+    @ApiModelProperty("订单退款状态(0:未退款,1:退款中,2退款失败,10:已退款)")
     private OnlineOrderRefundStatus refundStatus;
 
     /**

+ 1 - 1
ruoyi-line/src/main/java/com/ruoyi/subsidy/domain/vo/SubsidyQueueVo.java

@@ -233,7 +233,7 @@ public class SubsidyQueueVo {
 
     @ExcelProperty(value = "订单退款状态", converter = ExcelEnumConvert.class)
     @ExcelDictFormat(readConverterExp = "0=未退款,1=退款中,2=退款失败,10=已退款")
-    @ApiModelProperty("订单退款状态(0:未退款,1:退款中,2:退款失败,10=已退款)")
+    @ApiModelProperty("订单退款状态(0:未退款,1:退款中,2:退款失败,10:已退款)")
     private OnlineOrderRefundStatus refundStatus;
 
     /**