Главная Обзор Помощь
Регистрация Вход
suochencheng
/
tutuxiang_mimiback
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

活动排序

suochencheng 6 лет назад
Родитель
0fded654ac
Сommit
cf7e065221
3 измененных файлов с 8 добавлено и 5 удалено
Разделённый вид Показать статистику Diff
  1. 6 3
      src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java
  2. 1 1
      src/main/webapp/WEB-INF/html/admin.html
  3. 1 1
      src/main/webapp/WEB-INF/html/loginAdmin.html

+ 6 - 3
src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java
Просмотреть файл 

@@ -419,6 +419,11 @@ public class UserOrderServiceImpl implements UserOrderService {
 
 
                 BigDecimal dealPrice = totlePrice;
 
 
+                BigDecimal baseDealPrice = dealPrice;
 
+                BigDecimal activityDealPrice = dealPrice;
 
+                dealPrice = activityInfoService.manjianActivity(record, dealPrice);
 
+                activityDealPrice = dealPrice;
 
+
 
 
                 /**
 
                  * 优惠券
 
@@ -455,8 +460,6 @@ public class UserOrderServiceImpl implements UserOrderService {
 
 
                 }
 
 
-                BigDecimal baseDealPrice = dealPrice;
 
-                dealPrice = activityInfoService.manjianActivity(record,dealPrice);
 
 
                 record.setDealPrice(dealPrice);
 
                 record.setTotlePrice(totlePrice);
 
@@ -467,7 +470,7 @@ public class UserOrderServiceImpl implements UserOrderService {
 
 
                 if (updates > 0) {
 
 
-                    if (dealPrice.compareTo(baseDealPrice) < 0) {//如果满减了，保存记录。
 
+                    if (activityDealPrice.compareTo(baseDealPrice) < 0) {//如果满减了，保存记录。
 
                         activityInfoService.manjianActivityLog(record);
 
                     }

+ 1 - 1
src/main/webapp/WEB-INF/html/admin.html
Просмотреть файл 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.492ed0e902fa269a8dff7abbe16054d1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.897940e0c87539e48d48.js></script><script type=text/javascript src=/static/js/vendor.b7e28fcad649bc59c427.js></script><script type=text/javascript src=/static/js/admin.d41e7266cc8d9607c90d.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.5e3c38c3e5bd65f4c8b3718c1d810a5b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a8eebb5a68753a9a1062.js></script><script type=text/javascript src=/static/js/vendor.b7e28fcad649bc59c427.js></script><script type=text/javascript src=/static/js/admin.b1aa5241f06e3e4bd352.js></script></body></html>

+ 1 - 1
src/main/webapp/WEB-INF/html/loginAdmin.html
Просмотреть файл 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.3c1c8ab2212aab036253e14af8891636.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.897940e0c87539e48d48.js></script><script type=text/javascript src=/static/js/vendor.b7e28fcad649bc59c427.js></script><script type=text/javascript src=/static/js/loginAdmin.3f5f0e145c1cd8094282.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.3c1c8ab2212aab036253e14af8891636.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a8eebb5a68753a9a1062.js></script><script type=text/javascript src=/static/js/vendor.b7e28fcad649bc59c427.js></script><script type=text/javascript src=/static/js/loginAdmin.3f5f0e145c1cd8094282.js></script></body></html>