xwh完成线上订单导出，解决线下订单下一页报错问题

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -785,7 +785,7 @@ public class OrderController {
         ExcelExport ee = new ExcelExport("订单信息");
 
         String[] header = new String[]{"订单编号","商户订单编号", "所属门店", "供应商", "供应商第三方商户代码", "订单状态", "SKU", "商品名称", "数量", "销售价", "实际支付金额", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "支付流水号","身份证号"
-                ,"原产国","规格型号","品牌","单位","毛重(kg)","净重"};
+                ,"原产国","规格型号","品牌","单位","毛重(kg)","净重","零售价","促销价","成交价"};
 
         List<Map<String, Object>> list = new ArrayList<>();
         if (orderList != null && orderList.size() != 0) {
@@ -827,12 +827,18 @@ public class OrderController {
                 map.put("GrossWeight", orderEntity.getGrossWeight());
                 map.put("NetWeight", orderEntity.getNetWeight());
 
+                // 零售价\促销价\成交价
+                map.put("SellPrice",orderEntity.getRetailPrice());
+                map.put("TopicPrice",orderEntity.getTopicPrice());
+                map.put("FinalPrice",orderEntity.getActualPrice());
+
                 list.add(map);
             }
         }
 
         ee.addSheetByMap("订单信息", list, header);
         ee.export(response);
+
         return R.ok();
     }
 

kmall-admin/src/main/java/com/kmall/admin/dao/OrderDao.java

@@ -10,6 +10,7 @@ import com.kmall.common.utils.Query;
 import org.apache.ibatis.annotations.Param;
 import com.kmall.manager.dao.BaseDao;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -116,4 +117,6 @@ public interface OrderDao extends BaseDao<OrderEntity> {
     List<PurchaseSalesInStockDetail> purchaseSalesInStockDetailList(Query query);
 
     int purchaseSalesInStockDetailTotal(Query query);
+
+    BigDecimal queryTopicPriceByOrderSnAndSku(@Param("orderSn") String orderSn,@Param("sku") String sku);
 }

kmall-admin/src/main/java/com/kmall/admin/dao/OrderGoodsDao.java

@@ -6,6 +6,7 @@ import com.kmall.api.entity.OrderVo;
 import com.kmall.manager.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -29,4 +30,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsEntity> {
     List<OrderGoodsEntity> queryHistoryPrice(Map map);
 
     Integer queryHistoryPriceTotal(Map<String, Object> map);
+
 }

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

@@ -194,12 +194,23 @@ public class OrderEntity implements Serializable {
 
     private String campName;
 
+    // 活动价
+    private BigDecimal topicPrice;
+
     //供应商第三方商户
     private String supplierThirdPartyMerchName;
 
     //供应商第三方商户
     private String supplierThirdPartyMerchCode;
 
+    public BigDecimal getTopicPrice() {
+        return topicPrice;
+    }
+
+    public void setTopicPrice(BigDecimal topicPrice) {
+        this.topicPrice = topicPrice;
+    }
+
     public String getSupplierThirdPartyMerchCode() {
         return supplierThirdPartyMerchCode;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -1412,6 +1412,9 @@ public class OrderServiceImpl implements OrderService {
         for (OrderEntity order : list) {
             OrderProcessRecordEntity orderProcessRecord = orderProcessRecordDao.queryObjectByOrderSn(order.getOrderSn());
             order.setOrderProcessRecord(orderProcessRecord);
+            // 查询活动价
+            BigDecimal topicPrice = orderDao.queryTopicPriceByOrderSnAndSku(order.getOrderSn(),order.getSku());
+            order.setTopicPrice(topicPrice);
         }
         return list;
     }

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

@@ -536,17 +536,6 @@
         <if test="ids != null and ids.trim() != ''">
             AND o.id in (${ids})
         </if>
-        <choose>
-            <when test="sidx != null and sidx.trim() != ''">
-                order by ${sidx} ${order}
-            </when>
-            <otherwise>
-                order by o.id desc
-            </otherwise>
-        </choose>
-        <if test="offset != null and limit != null">
-            limit #{offset}, #{limit}
-        </if>
     </select>
 
     <insert id="save" parameterType="com.kmall.api.entity.OrderVo" useGeneratedKeys="true" keyProperty="id">
@@ -1770,5 +1759,11 @@
         group by substr(msmc.create_time,1,10)
         ) b
     </select>
+    <select id="queryTopicPriceByOrderSnAndSku" resultType="java.math.BigDecimal">
+        SELECT mst.topic_price FROM mall_order mo
+		LEFT JOIN mall_order_goods mog ON mo.id = mog.order_id
+		LEFT JOIN mall_store_topic mst ON mog.store_topic_id=mst.id
+		WHERE mo.order_sn=#{orderSn} AND mog.sku=#{sku};
+    </select>
 
 </mapper>

kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html

@@ -81,14 +81,14 @@
                     #if($shiro.hasPermission("order:getLogistics"))
                     <i-button type="warning" @click="getLogistics">查看快递信息</i-button>
                     #end
-                    #if($shiro.hasPermission("order:confirm"))
-                    <i-button type="error" @click="confirm">确认收货</i-button>
+                    #if($shiro.hasPermission("order:updateExpressInfo"))
+                    <i-button type="warning" @click="getExpressInfo">修改快递信息</i-button>
                     #end
                     #if($shiro.hasPermission("shop:comment"))
-                    <i-button type="info" @click="openComment">评价</i-button>
+                    <i-button type="warning" @click="openComment">评价</i-button>
                     #end
-                    #if($shiro.hasPermission("order:updateExpressInfo"))
-                    <i-button type="info" @click="getExpressInfo">修改快递信息</i-button>
+                    #if($shiro.hasPermission("order:confirm"))
+                    <i-button type="error" @click="confirm">确认收货</i-button>
                     #end
                     #if($shiro.hasPermission("order:expressUpload"))
                     <i-col style="display: inline-grid;">