活动排序

src/main/java/com/izouma/awesomeadmin/dao/ActivityInfoMapper.xml

@@ -656,7 +656,7 @@
             </if>
 
         </where>
-        ORDER BY id DESC
+        ORDER BY CONVERT(max_value,DECIMAL) , id DESC
     </select>
     <update id="delete">
         UPDATE activity_info SET del_flag = 'Y'

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -44,6 +44,7 @@
         <result column="album_status" property="albumStatus" jdbcType="INTEGER"/>
         <result column="client_flag" property="clientFlag" jdbcType="CHAR"/>
         <result column="tailor_flag" property="tailorFlag" jdbcType="CHAR"/>
+        <result column="activity_id" property="activityId" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -113,6 +114,7 @@
             album_status,
             client_flag,
             tailor_flag,
+            activity_id,
 
         </trim>
     </sql>
@@ -238,6 +240,9 @@
             <if test="tailorFlag!= null">
                 tailor_flag,
             </if>
+            <if test="activityId!= null">
+                activity_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -348,6 +353,9 @@
             <if test="tailorFlag != null">
                 #{tailorFlag},
             </if>
+            <if test="activityId != null">
+                #{activityId},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserOrder">
@@ -479,6 +487,9 @@
             <if test="tailorFlag != null">
                 tailor_flag = #{tailorFlag},
             </if>
+            <if test="activityId != null">
+                activity_id = #{activityId},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>

src/main/java/com/izouma/awesomeadmin/model/UserOrder.java

@@ -147,6 +147,11 @@ public class UserOrder {
      */
     private String tailorFlag;
 
+    /**
+     * 活动Id
+     */
+    private Integer activityId;
+
 
     private List<UserOrderDetail> userOrderDetailList;
 
@@ -622,5 +627,13 @@ public class UserOrder {
     public void setTailorFlag(String tailorFlag) {
         this.tailorFlag = tailorFlag;
     }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/ActivityInfoService.java

@@ -65,7 +65,7 @@ public interface ActivityInfoService {
      */
     boolean zhongchouSongMoney(ActivityInfo record);
 
-    BigDecimal manjianActivity(BigDecimal orderMoney);
+    BigDecimal manjianActivity(UserOrder record,BigDecimal orderMoney);
 
     boolean manjianActivityLog(UserOrder record);
 

src/main/java/com/izouma/awesomeadmin/service/impl/ActivityInfoServiceImpl.java

@@ -273,25 +273,14 @@ public class ActivityInfoServiceImpl implements ActivityInfoService {
 
         try {
 
-            ActivityInfo activityInfo = new ActivityInfo();
-            activityInfo.setTypeId(6);
-            List<ActivityInfo> activityInfoList = activityInfoMapper.queryUsedManJianActivityInfo(activityInfo);
-
-            if (activityInfoList != null) {
-
-                ActivityInfo manjian = new ActivityInfo();
+            ActivityInfo activityInfo = activityInfoMapper.selectByPrimaryKey(userOrder.getActivityId());
 
-                for (ActivityInfo temp : activityInfoList) {
-                    BigDecimal tempMax = BigDecimal.valueOf(Double.valueOf(activityInfo.getMaxValue()));
-                    if (userOrder.getTotlePrice().compareTo(tempMax) > 0) {
-                        manjian = temp;
-                    }
-                }
+            if (activityInfo != null) {
 
 
                 ActivityLog activityLog = new ActivityLog();
-                activityLog.setActivityId(String.valueOf(manjian.getId()));
-                activityLog.setTypeId(String.valueOf(manjian.getTypeId()));
+                activityLog.setActivityId(String.valueOf(activityInfo.getId()));
+                activityLog.setTypeId(String.valueOf(activityInfo.getTypeId()));
                 activityLog.setUserId(String.valueOf(userOrder.getUserId()));
                 activityLog.setTotalPrice(String.valueOf(userOrder.getTotlePrice()));
                 activityLog.setOrderId(String.valueOf(userOrder.getId()));
@@ -312,7 +301,7 @@ public class ActivityInfoServiceImpl implements ActivityInfoService {
     }
 
     @Override
-    public BigDecimal manjianActivity(BigDecimal orderMoney) {
+    public BigDecimal manjianActivity(UserOrder record, BigDecimal orderMoney) {
 
         logger.info("manjianActivity");
 
@@ -340,6 +329,7 @@ public class ActivityInfoServiceImpl implements ActivityInfoService {
 
                 if (orderMoney.compareTo(maxValue) > 0) {//如果消费金额大于要求，可用减免
 
+                    record.setActivityId(manjian.getId());
                     return orderMoney.subtract(minValue);
 
                 }

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderDetailServiceImpl.java

@@ -329,8 +329,6 @@ public class UserOrderDetailServiceImpl implements UserOrderDetailService {
                 }
 
                 int updates = userOrderDetailMapper.updateByPrimaryKeySelective(record);
-
-
                 if (updates > 0) {
                     return true;
                 }

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -456,7 +456,7 @@ public class UserOrderServiceImpl implements UserOrderService {
                 }
 
                 BigDecimal baseDealPrice = dealPrice;
-                dealPrice = activityInfoService.manjianActivity(dealPrice);
+                dealPrice = activityInfoService.manjianActivity(record,dealPrice);
 
                 record.setDealPrice(dealPrice);
                 record.setTotlePrice(totlePrice);

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.661cd1bd57d7b522fd0f1d007b3649f0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.06836a91edb226fb1387.js></script><script type=text/javascript src=/static/js/vendor.03cd89e1e6e0c15adc7f.js></script><script type=text/javascript src=/static/js/admin.b525bd55f77ae3701059.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.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>

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.06836a91edb226fb1387.js></script><script type=text/javascript src=/static/js/vendor.03cd89e1e6e0c15adc7f.js></script><script type=text/javascript src=/static/js/loginAdmin.cb0c5c84b89fb3e047c9.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.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>