diff --git a/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java b/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java index fb981da..c0ce752 100644 --- a/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java +++ b/Cpop-Core/src/main/java/com/cpop/core/base/enums/OrderSource.java @@ -14,7 +14,7 @@ public enum OrderSource { MALL("Mall",0.002), /** - * 一次性支付 + * 放心学 */ EASY_LEARN("EasyLearn",0.002), diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java index 979089c..bf5a687 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnUnionPayBo.java @@ -65,7 +65,7 @@ public class EasyLearnUnionPayBo { * 订单类型 */ @NotBlank(message = "联合支付类型不能为空") - @ApiModelProperty(value = "联合支付类型(WX_PAY:微信支付;PREPAYMENT:预付;REPAYMENT:还款;MEMBER:会员)",required = true) + @ApiModelProperty(value = "联合支付类型(WX_PAY:微信支付;PREPAYMENT:预付;REPAYMENT:还款;MEMBER:会员;GROUP_BOOKING:拼团)",required = true) private String easyLearnUnionPay; /** diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java index f076506..b9d4a87 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java @@ -615,7 +615,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl= ?", "2024-04-08 19:00:00") + .where("create_time >= ?", "2024-04-16 00:00:00") //.between("create_time", "2023-04-23 00:00:00","2023-11-13 22:00:00") .list(); List insertList = new ArrayList<>();