Althars123 3 rokov pred
rodič
commit
ac2a0a1c4c

+ 7 - 1
twzd-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java

@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  */
@@ -84,7 +86,11 @@ class PcWxController extends BaseController {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         dto.setSchoolName(user.getUserId()==1l? dto.getSchoolName(): user.getNickName());
         List<WxSchoolOrder> list = wxOrderService.QuerySchoolOrderList(dto);
-        return toResponsePageInfo(list);
+        ResponsePageInfo<WxSchoolOrder> pageData = toResponsePageInfo(list);
+        Map mapData = new HashMap<>();
+        mapData.put("totalPay",wxOrderService.getTotalPay(dto));
+        pageData.setOtherData(mapData);
+        return pageData;
     }
 
 

+ 12 - 0
twzd-common/src/main/java/com/miaxis/common/core/page/ResponsePageInfo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 表格分页数据对象  加入泛型
@@ -33,6 +34,9 @@ public class ResponsePageInfo<T> implements Serializable
     @ApiModelProperty(value = "消息内容")
     private String msg;
 
+    @ApiModelProperty(value = "其他数据")
+    private Map<String,Object> otherData;
+
     /**
      * 表格数据对象
      */
@@ -91,4 +95,12 @@ public class ResponsePageInfo<T> implements Serializable
     {
         this.msg = msg;
     }
+
+    public Map<String, Object> getOtherData() {
+        return otherData;
+    }
+
+    public void setOtherData(Map<String, Object> otherData) {
+        this.otherData = otherData;
+    }
 }

+ 2 - 0
twzd-service/src/main/java/com/miaxis/wx/mapper/WxOrderMapper.java

@@ -31,4 +31,6 @@ public interface WxOrderMapper extends BaseMapper<WxOrder> {
     List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO);
 
     List<WxSchoolOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
+
+    Integer getTotalPay(QuerySchoolOrderListDTO dto);
 }

+ 2 - 0
twzd-service/src/main/java/com/miaxis/wx/service/IWxOrderService.java

@@ -27,4 +27,6 @@ public interface IWxOrderService extends IService<WxOrder>{
     String wxwithbankdrawal(WxExtractBankDTO amount) throws Exception;
 
     void writeNotifyDataToDb(JSONObject jsonObject);
+
+    Object getTotalPay(QuerySchoolOrderListDTO dto);
 }

+ 5 - 0
twzd-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -291,6 +291,11 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
 
     }
 
+    @Override
+    public Integer getTotalPay(QuerySchoolOrderListDTO dto) {
+        return wxOrderMapper.getTotalPay(dto);
+    }
+
     /**
      * 发送模板信息
      * @param userInfo 用户信息

+ 14 - 0
twzd-service/src/main/resources/mapper/wx/WxOrderMapper.xml

@@ -126,5 +126,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by t1.create_time desc
     </select>
+    <select id="getTotalPay" resultType="int">
+        select sum(total) as totalPay from wx_order t1
+        where trade_state ='SUCCESS'
+        <if test="schoolName != null  and schoolName != ''">
+            and  t1.openid in (select openid from user_info where school_name = #{schoolName})
+        </if>
+        <if test="startTime != null">
+            and DATE_FORMAT(t1.create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null">
+            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+        </if>
+        order by t1.create_time desc
+    </select>
 
 </mapper>