年月日时分秒

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

@@ -17,7 +17,9 @@ import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 
@@ -80,7 +82,13 @@ public class PcOrderInfoController extends BaseController{
         startPage();
         List<QuerySchoolOrderListVo> list = orderInfoService.selectSchoolOrderInfoList(schoolOrderListDTO);
         ResponsePageInfo<QuerySchoolOrderListVo> orderInfoResponsePageInfo = toResponsePageInfo(list);
-        orderInfoResponsePageInfo.setData(orderInfoService.getTotalMoney(schoolOrderListDTO));
+        Integer total = orderInfoService.getTotalMoney(schoolOrderListDTO);
+        Integer commission = orderInfoService.getCommissionMoney(schoolOrderListDTO);
+
+        Map<String,Integer> map = new HashMap<String,Integer>();
+        map.put("total",total);
+        map.put("commission",commission);
+        orderInfoResponsePageInfo.setData(map);
         return orderInfoResponsePageInfo;
 
 

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

@@ -28,5 +28,7 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
 
     List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
 
-    Object getTotalMoney(QuerySchoolOrderListDTO schoolOrderListDTO);
+    Integer getTotalMoney(QuerySchoolOrderListDTO schoolOrderListDTO);
+
+    Integer getCommissionMoney(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

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

@@ -35,5 +35,7 @@ public interface IOrderInfoService extends IService<OrderInfo> {
 
     List<OrderInfo> selectSchoolOrderDetailed(QuerySchoolOrderListDTO schoolOrderListDTO);
 
-    Object getTotalMoney(QuerySchoolOrderListDTO orderInfo);
+    Integer getTotalMoney(QuerySchoolOrderListDTO orderInfo);
+
+    Integer getCommissionMoney(QuerySchoolOrderListDTO orderInfo);
 }

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

@@ -1319,10 +1319,16 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public Object getTotalMoney(QuerySchoolOrderListDTO orderInfo) {
+    public Integer getTotalMoney(QuerySchoolOrderListDTO orderInfo) {
         return orderInfoMapper.getTotalMoney(orderInfo);
     }
 
+
+    @Override
+    public Integer getCommissionMoney(QuerySchoolOrderListDTO orderInfo) {
+        return orderInfoMapper.getCommissionMoney(orderInfo);
+    }
+
     /**
      * 退款方法
      * @param order

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

@@ -77,19 +77,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and school_name like concat('%', #{schoolName}, '%')
             </if>
             <if test="startTime != null">
-                and DATE_FORMAT(create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S')<![CDATA[ >= ]]> #{startTime}
             </if>
             <if test="endTime != null">
-                and DATE_FORMAT(create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S') <![CDATA[ <= ]]> #{endTime}
             </if>
         </where>
         group by school,school_name
 
     </select>
 
-    <select id="getTotalMoney"  resultType="string">
+    <select id="getTotalMoney"  resultType="java.lang.Integer">
         select
-        sum(total) as orderTotal
+        IFNULL(sum(total),0) as orderTotal
         from order_info
         <where>
             <if test="isShare != null">
@@ -105,10 +105,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and school_name like concat('%', #{schoolName}, '%')
             </if>
             <if test="startTime != null">
-                and DATE_FORMAT(create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S')<![CDATA[ >= ]]> #{startTime}
             </if>
             <if test="endTime != null">
-                and DATE_FORMAT(create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S') <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="getCommissionMoney"  resultType="java.lang.Integer">
+        select
+        IFNULL(sum(school_commission),0) as commission
+        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%H%i%S')<![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S') <![CDATA[ <= ]]> #{endTime}
             </if>
         </where>
 
@@ -128,10 +155,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and school_name like concat('%', #{schoolName}, '%')
             </if>
             <if test="startTime != null">
-                and DATE_FORMAT(create_time,'%Y%m%d')<![CDATA[ >= ]]> #{startTime}
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S')<![CDATA[ >= ]]> #{startTime}
             </if>
             <if test="endTime != null">
-                and DATE_FORMAT(create_time,'%Y%m%d') <![CDATA[ < ]]> #{endTime}
+                and DATE_FORMAT(create_time,'%Y%m%d%H%i%S') <![CDATA[ <= ]]> #{endTime}
             </if>
         </where>
         order by success_time desc
@@ -141,9 +168,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>