Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/SupervisorController.java

+package com.winsun.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.winsun.auth.core.annotion.Permission;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.bean.Order;
+import com.winsun.bean.Package;
+import com.winsun.mapper.OrderMapper;
+import com.winsun.mapper.PackageMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 移动端订单查询
+ * @author chengfengluo
+ * @date 2021-03-17 11:30
+ */
+@RestController
+@RequestMapping("/supervisor")
+public class SupervisorController {
+
+    @Autowired
+    private OrderMapper orderMapper;
+
+    @Autowired
+    private PackageMapper packageMapper;
+
+    /**
+     * 督导订单详情查询
+     *
+     * @param orderId
+     * @return
+     */
+    @PostMapping("selectOrderInfo")
+    public ResponseData<Map<String, Object>> selectOrderInfo(@RequestParam("orderId") String orderId) {
+       /* ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
+
+        if (StringUtils.isNotBlank(orderId)) {
+            ResponseData<String> verification = verification(orderId);
+            if (!verification.isSuccess()) {
+                return ResponseData.error("订单不存在或异常！");
+            }
+        } else {
+            return ResponseData.error("页面已失效，请重新登录！");
+        }
+        Wrapper<Order> wrapper = new EntityWrapper<>();
+        wrapper.eq("id", orderId);
+        List<Map<String, Object>> list = orderMapper.selectMaps(wrapper);
+        Map<String, Object> map = list.get(0);
+        if (map.size() == 0) {
+            return ResponseData.error("当前订单不存在！");
+        }
+        if (map.get("packageId") != null) {
+            Package aPackage = packageMapper.selectById(Integer.parseInt(map.get("packageId").toString()));
+            map.put("packageName", aPackage.getPackageName());
+            map.put("advImg", aPackage.getAdvImg());
+            map.put("explains", aPackage.getExplains());
+        }
+
+        //测试用
+        if (StringUtils.isBlank(map.get("idCard").toString())) {
+            map.put("idCard", "000000000000000000".substring(0, 14) + "****");
+        } else {
+            if (map.get("idCard").toString().length() == 18) {
+                map.put("idCard", map.get("idCard").toString().substring(0, 14) + "****");
+            } else {
+                map.put("idCard", map.get("idCard").toString().substring(0, 11) + "****");
+            }
+        }
+
+        //查询历史状态
+        List<Map<String, Object>> orderHis = orderMapper.selectOrderHis(orderId);
+        map.put("orderHis", orderHis);
+        return ResponseData.success(map);
+    }
+
+    /**
+     * 验证订单
+     *
+     * @param orderId
+     * @return
+     */
+    public ResponseData<String> verification(String orderId) {
+        Wrapper wrapper = new EntityWrapper<>();
+        wrapper.eq("id", orderId);
+        List list = orderMapper.selectList(wrapper);
+        if (list.size() == 1) {
+            return ResponseData.success("ok");
+        } else if (list.size() == 0) {
+            return ResponseData.error("订单不存在！");
+        } else {
+            return ResponseData.error("订单异常！");
+        }
+    }
+}

common/src/main/java/com/winsun/bean/activity/HhrActivityRecord.java

@@ -28,7 +28,7 @@ public class HhrActivityRecord implements Serializable{
     /**
      * 活动积分
      */
-    private int recordIntegral;
+    private Integer recordIntegral;
     
     /**
      * 活动记录审核状态

common/src/main/java/com/winsun/mapper/activity/ActivityMapper.java

 package com.winsun.mapper.activity;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.Page;
+import com.winsun.bean.activity.HhrActivity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Component;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.winsun.bean.activity.HhrActivity;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 合伙人用户表的Mapper
@@ -12,4 +17,14 @@ import com.winsun.bean.activity.HhrActivity;
 @Mapper
 @Component
 public interface ActivityMapper extends BaseMapper<HhrActivity> {
+
+    /**
+     * 移动端查询活动列表
+     * @param subName
+     * @param subClass
+     * @param activityType
+     * @return
+     */
+    List<Map<String, Object>> mobileSelectActivityList(RowBounds rowBounds, @Param("subName") String subName,
+                                                       @Param("subClass") String subClass, @Param("activityType") String activityType);
 }

common/src/main/resources/com/winsun/mapper/mapping/ActivityMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.winsun.mapper.activity.ActivityMapper">
+
+    <select id="mobileSelectActivityList" resultType="HashMap" parameterType="String">
+        SELECT
+            id AS id,
+            title,
+            `desc`,
+            integral,
+            image_url AS imageUrl,
+            activity_type AS activityType,
+            subclass,
+            sub_name AS subName,
+            sub_school AS subSchool,
+            `range`,
+            `status`,
+            sort,
+            is_sub_name AS isSubName,
+            create_time AS createTime,
+            creator,
+            update_time AS updateTime,
+            del_flag AS delFlag
+              FROM
+              hhr_activity
+              WHERE
+              (del_flag = 0 AND status = 1
+                <if test="activityType != null and activityType != ''">
+                    AND activity_type = #{activityType}
+                </if>
+              )
+              AND (`range` = '全市' OR `range` = #{subName})
+              AND (is_sub_name = 0 OR (is_sub_name = 1 AND sub_name = #{subName}))
+              <if test="subClass != null and subClass != ''">
+                  AND (subclass = #{subClass})
+              </if>
+
+
+    </select>
+
+
+</mapper>
\ No newline at end of file

service-manager/src/main/java/com/winsun/controller/ActivityController.java

@@ -5,7 +5,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.winsun.bean.School;
 import com.winsun.mapper.HhrUserMapper;
+import com.winsun.mapper.SchoolMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,6 +48,9 @@ public class ActivityController extends BaseController {
 	@Autowired
 	private HhrUserMapper hhrUserMapper;
 
+	@Autowired
+	private SchoolMapper schoolMapper;
+
 	@Permission(menuname = "查询活动信息", value = "list", method = RequestMethod.POST)
 	public ResponseData<Page<HhrActivity>> list(@RequestParam("title") String title,
 			@RequestParam("activityType") String activityType, @RequestParam("subclass") String subclass,
@@ -213,20 +218,63 @@ public class ActivityController extends BaseController {
      */
 	@Permission(menuname = "获取活动列表", value = "getActivityList", method = RequestMethod.POST)
     public ResponseData<Map<String, Object>> getActivityList(Integer pageNo, Integer pageSize, String activityType,  String subclass, String status) {
+		try{
+			Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>();
+			wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
+			wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
+			wrapper.eq(StringUtils.isNotBlank(status), "status", status);
+			wrapper.eq("del_flag", 0);
 
-        Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>();
-		wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
-		wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
-		wrapper.eq(StringUtils.isNotBlank(status), "status", status);
-		wrapper.eq("del_flag", 0);
-		
-		Page<HhrActivity> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize);
-		List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
-		page.setRecords(list);
-		resultMap.put("activityList", list);
+			Page<HhrActivity> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize);
+			List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
+			page.setRecords(list);
+			resultMap.put("activityList", list);
 
-        return ResponseData.success(resultMap, "查询成功");
+			return ResponseData.success(resultMap, "查询成功");
+		}catch(Exception e){
+			e.printStackTrace();
+			return ResponseData.error("查询失败！");
+		}
     }
+
+	/**
+	 * 移动端获取活动列表
+	 * @return
+	 */
+	@Permission(menuname = "获取活动列表", value = "mobileGetActivityList", method = RequestMethod.POST)
+	public ResponseData<Map<String, Object>> mobileGetActivityList(Integer pageNo,
+		   Integer pageSize, String activityType, String subclass,
+		   String status) {
+
+		ShiroUser shiroUser = getShiroUser();
+
+		String s = schoolMapper.selectSchoolIdByUserId(shiroUser.getId() + "");
+
+		if (StringUtils.isBlank(s)) {
+			return ResponseData.error("请先设置所在学校");
+		}
+
+		if (shiroUser == null || shiroUser.getId() == null) {
+			return ResponseData.error("查询列表失败！");
+		}
+
+		School school = schoolMapper.selectById(s);
+		if (school == null) {
+				return ResponseData.error("学校信息有误");
+		}
+
+		try {
+
+			Page<HhrActivity> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize);
+			List<Map<String, Object>> maps = activityMapper.mobileSelectActivityList(page, school.getSubName(), subclass, activityType);
+			resultMap.put("activityList", maps);
+			return ResponseData.success(resultMap, "查询成功！");
+
+		}catch (Exception e) {
+			e.printStackTrace();
+			return ResponseData.error("查询失败！");
+		}
+	}
     
 	/**
      * 获取活动信息

service-manager/src/main/java/com/winsun/controller/ActivityRecordController.java

 package com.winsun.controller;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
-import com.winsun.bean.StudentCard;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,49 +130,25 @@ public class ActivityRecordController extends BaseController {
 		return ResponseData.success(page, "查询完毕！");
 	}
 	
-	@Permission(menuname = "审核活动参与记录(旧)", value = "auditActivityRecord", method = RequestMethod.POST)
-	public ResponseData<String> auditActivityRecord(@RequestParam("id") String id,
-			@RequestParam("status") String status, @RequestParam("integral") String integral,
+	@Permission(menuname = "审核活动参与记录", value = "auditActivityRecord", method = RequestMethod.POST)
+	public ResponseData<String> auditActivityRecord(@RequestParam("id") String id, 
+			@RequestParam("status") String status, @RequestParam("integral") Integer integral,
 			@RequestParam("remark") String remark){
 
 		HhrActivityRecord activityRecord = new HhrActivityRecord();
 		activityRecord.setId(id);
 		activityRecord.setStatus(status);
-		activityRecord.setRecordIntegral(Integer.parseInt(integral));
+		activityRecord.setRecordIntegral(integral);
 		activityRecord.setRemark(remark);
 		activityRecord.setUpdateTime(new Date());
 		int num = activityRecordMapper.updateById(activityRecord);
+		
 		if (num > 0) {
 			return ResponseData.success("审核完毕！");
 		}
 
 		return ResponseData.error("审核失败");
 	}
-
-	@Permission(menuname = "审核活动参与记录(旧)", value = "auditActivityRecords", method = RequestMethod.POST)
-	public ResponseData<String> auditActivityRecords(@RequestParam("ids") String ids,
-													@RequestParam("status") String status, @RequestParam("integral") String integral,
-													@RequestParam("remark") String remark){
-
-		List<String> list1 = Arrays.asList(ids.split(",")); //[a, b, c]
-		List<Integer> list = new ArrayList<>();
-		for (String s : list1) {
-			list.add(Integer.valueOf(s));
-		}
-		Wrapper<HhrActivityRecord> wrapper = new EntityWrapper<>();
-		wrapper.in("id",list);
-		HhrActivityRecord activityRecord = new HhrActivityRecord();
-		activityRecord.setStatus(status);
-		activityRecord.setRecordIntegral(Integer.parseInt(integral));
-		activityRecord.setRemark(remark);
-		activityRecord.setUpdateTime(new Date());
-		int num = activityRecordMapper.update(activityRecord,wrapper);
-		if (num > 0) {
-			return ResponseData.success("审核完毕！");
-		}
-		return ResponseData.error("审核失败");
-	}
-
 	
 	@Permission(menuname = "查询积分记录信息", value = "getIntegralList", method = RequestMethod.POST)
 	public ResponseData<Page<Map<String, Object>>> getIntegralList(@RequestParam("title") String title,