活动统计管理后台逻辑修改

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -184,6 +184,16 @@ public class OrderEntity implements Serializable {
 
     private Integer storeTopicId;
 
+    private String couponName;
+
+    public String getCouponName() {
+        return couponName;
+    }
+
+    public void setCouponName(String couponName) {
+        this.couponName = couponName;
+    }
+
     public String getStoreTopicName() {
         return storeTopicName;
     }

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -676,6 +676,7 @@
         u.userName userName,
         o.buyer_pay_check,
         o.order_price,
+        o.coupon_name couponName,
         o.add_time,
         o.shipping_status,
         (select count(1) from mall_order_goods where order_id = o.id) orderDetailCount,
@@ -920,6 +921,7 @@
         o.activity_id,
         o.order_status,
         o.pay_status,
+        o.coupon_name,
         u.userName userName,
         o.order_price,
         o.add_time,

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkstoreticketdiscount.html

@@ -438,8 +438,7 @@
                             </Form-item>
                         </i-col>
                     </Row>
-
-                    <Form-item label="是否展示在广告栏" prop="isStoreShow">
+                    <Form-item label="图片是否展示在广告栏" prop="isStoreShow">
                         <Radio-group v-model="mkStoreTicketDiscount.isStoreShow">
                             <Radio label="0">
                                 <span>否</span>

kmall-admin/src/main/webapp/js/statis/mkstorepromstat.js

@@ -77,9 +77,9 @@ $(function () {
             {label: '订单号', name: 'orderSn', index: 'order_sn', width: 100, align: 'center'},
             {label: '会员', name: 'userName', index: 'user_name', width: 80, align: 'center'},
             {label: '商户订单号', name: 'merchOrderSn', index: 'merchOrderSn', width: 100, align: 'center'},
-            {label: '优惠券使用', name: 'activityId', index: 'activity_id', width: 70, align: 'center',
+            {label: '优惠券使用', name: 'couponName', index: 'couponName', width: 70, align: 'center',
                 formatter: function (value) {
-                    if (value == null) {
+                    if (value == null || value == '') {
                         return '<span style="color: red">未使用</span>';
                     }
                     return value;

kmall-admin/src/main/webapp/js/statis/mkstoretopicstat.js

@@ -78,10 +78,12 @@ $(function () {
             {label: '订单号', name: 'orderSn', index: 'order_sn', width: 100, align: 'center'},
             {label: '会员', name: 'userName', index: 'user_name', width: 80, align: 'center'},
             {label: '商户订单号', name: 'merchOrderSn', index: 'merchOrderSn', width: 100, align: 'center'},
-            {label: '优惠券使用', name: 'activityId', index: 'activity_id', width: 70, align: 'center',
+            {label: '优惠券使用', name: 'couponName', index: 'couponName', width: 70, align: 'center',
                 formatter: function (value) {
-                    if (value == null) {
+                    if (value == null || value == '') {
                         return '<span style="color: red">未使用</span>';
+                    }else{
+                        return '<span style="color: red">'+value+'</span>';
                     }
                     return value;
                 }},