Selaa lähdekoodia

fix(app): 修复课程优惠计算逻辑

- 将 sellingPrice 和 originalPrice 搞反了,本次修改已修正
- 修正了 discountPrice 和 totalDiscount 的计算逻辑
- 更新了 subtotal 和 totalPrice 的计算方式
- 注释掉了微信支付相关代码
SheepHy 4 viikkoa sitten
vanhempi
commit
5f20176ee6

+ 5 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -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延迟队列