|
@@ -256,14 +256,14 @@ public class OrderServiceImpl implements IOrderService {
|
|
|
previousOrderCourse.setId(appCourses.getId())
|
|
|
.setCover(list.get(0).split(",")[0])
|
|
|
.setName(appCourses.getName())
|
|
|
- .setSellingPrice(appCourses.getSellingPrice())
|
|
|
+ .setSellingPrice(appCourses.getOriginalPrice())
|
|
|
.setReminder(appCourses.getReminder())
|
|
|
.setHasDiscount(checkCourseDiscount);
|
|
|
if (checkCourseDiscount) {
|
|
|
- previousOrderCourse.setDiscountPrice(appCourses.getSellingPrice());
|
|
|
- previousOrderCourse.setTotalDiscount(appCourses.getSellingPrice());
|
|
|
+ previousOrderCourse.setDiscountPrice(appCourses.getOriginalPrice());
|
|
|
+ previousOrderCourse.setTotalDiscount(appCourses.getOriginalPrice());
|
|
|
previousOrderCourse.setSubtotal(appCourses.getSellingPrice().subtract(appCourses.getSellingPrice()));
|
|
|
- previousOrderCourse.setTotalPrice(appCourses.getSellingPrice().subtract(appCourses.getSellingPrice()));
|
|
|
+ previousOrderCourse.setTotalPrice(appCourses.getSellingPrice());
|
|
|
} else {
|
|
|
previousOrderCourse.setDiscountPrice(BigDecimal.ZERO);
|
|
|
previousOrderCourse.setTotalDiscount(BigDecimal.ZERO);
|
|
@@ -1027,7 +1027,7 @@ public class OrderServiceImpl implements IOrderService {
|
|
|
params.put("payer", payer);
|
|
|
|
|
|
//拉起支付-返回JSAPI参数
|
|
|
- Map<String, String> result = weChatPayService.wechatPay(params);
|
|
|
+// Map<String, String> result = weChatPayService.wechatPay(params);
|
|
|
// payForm.setParams(result);
|
|
|
|
|
|
//发布任务到redission延迟队列
|