Merge remote-tracking branch 'origin/master'

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -15,7 +15,6 @@ import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxJsOrderService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -80,7 +79,9 @@ public class PcOrderInfoController extends BaseController{
     public ResponsePageInfo<QuerySchoolOrderListVo> list(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO) {
         startPage();
         List<QuerySchoolOrderListVo> list = orderInfoService.selectSchoolOrderInfoList(schoolOrderListDTO);
-        return toResponsePageInfo(list);
+        ResponsePageInfo<QuerySchoolOrderListVo> orderInfoResponsePageInfo = toResponsePageInfo(list);
+        orderInfoResponsePageInfo.setData(orderInfoService.getTotalMoney(schoolOrderListDTO));
+        return orderInfoResponsePageInfo;
 
 
     }

jsjp-common/src/main/java/com/miaxis/common/core/page/ResponsePageInfo.java

@@ -2,6 +2,7 @@ package com.miaxis.common.core.page;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author JuniorRay
  * @date 2020-11-12
  */
+@Data
 @ApiModel(description = "表格分页数据对象ResponsePageInfo")
 public class ResponsePageInfo<T> implements Serializable
 {
@@ -33,6 +35,10 @@ public class ResponsePageInfo<T> implements Serializable
     @ApiModelProperty(value = "消息内容")
     private String msg;
 
+    /** 消息内容 */
+    @ApiModelProperty(value = "其他数据")
+    private Object data;
+
     /**
      * 表格数据对象
      */

jsjp-service/src/main/java/com/miaxis/order/mapper/OrderInfoMapper.java

@@ -27,4 +27,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     List<QuerySchoolOrderListVo> selectSchoolOrderInfoList(QuerySchoolOrderListDTO schoolOrderListDTO);
 
     List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
+
+    Object getTotalMoney(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -1,13 +1,13 @@
 package com.miaxis.order.service;
 
-import java.util.List;
-
-import com.miaxis.order.domain.OrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.vo.QuerySchoolOrderListVo;
 import com.miaxis.wx.domain.WxJsOrder;
 
+import java.util.List;
+
 /**
  * 订单信息Service接口
  *
@@ -34,4 +34,6 @@ public interface IOrderInfoService extends IService<OrderInfo> {
     public void refundOrder(WxJsOrder order);
 
     List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
+
+    Object getTotalMoney(QuerySchoolOrderListDTO orderInfo);
 }

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -1316,6 +1316,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return orderInfoMapper.selectSchoolOrderDetailed(schoolOrderListDTO);
     }
 
+    @Override
+    public Object getTotalMoney(QuerySchoolOrderListDTO orderInfo) {
+        return orderInfoMapper.getTotalMoney(orderInfo);
+    }
+
     /**
      * 退款方法
      * @param order

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -87,6 +87,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <select id="getTotalMoney"  resultType="string">
+        select
+        sum(total) as orderTotal
+        from order_info
+        <where>
+            <if test="isShare != null">
+                and is_share = #{isShare }
+            </if>
+            <if test="tradeType != null">
+                and trade_type = #{tradeType }
+            </if>
+            <if test="dqbh != null  and dqbh != ''">
+                and dqbh = #{dqbh}
+            </if>
+            <if test="schoolName != null  and schoolName != ''">
+                and school_name like concat('%', #{schoolName}, '%')
+            </if>
+            <if test="startTime != null">
+                and DATE_FORMAT(create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                and DATE_FORMAT(create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
+            </if>
+        </where>
+
+    </select>
+
 
     <select id="selectSchoolOrderDetailed"  resultType="com.miaxis.order.domain.OrderInfo">
         select * from order_info
@@ -110,5 +137,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by success_time desc
     </select>
 
+    <select id="getByOutTradeNo" parameterType="string" resultType="com.miaxis.order.domain.OrderInfo">
+        select * from order_info where out_trade_no =#{outTradeNo}
+    </select>
+
+    <select id="getByOutTradeNo" parameterType="string" resultType="com.miaxis.order.domain.OrderInfo">
+        select * from order_info where out_trade_no =#{outTradeNo}
+    </select>
+
 
 </mapper>