二维码提交

common/src/main/java/com/winsun/bean/QRCode.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: chancy
+ * @Date: 2020/3/17 11:07
+ */
+@Data
+@TableName("hhr_QR_code")
+public class QRCode {
+
+
+    private String id;
+
+    private int userId;
+
+    private String picture;
+
+    private Date createTime;
+
+    private String enable = "1";
+}

common/src/main/java/com/winsun/mapper/QRCodeMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.Package;
+import com.winsun.bean.QRCode;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Component
+public interface QRCodeMapper extends BaseMapper<QRCode> {
+
+}

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -246,6 +246,7 @@ public class PackageNewClothes {
             , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
             , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "studentNumber") String studentNumber
             , @RequestParam(value = "userSchool") String userSchool) {
+
         if (contactNumber.length() != 11) {
             return ResponseData.error("联系号码有误，请重新输入");
         }
@@ -486,6 +487,9 @@ public class PackageNewClothes {
      */
     public ResponseData<String> packageVerification(String partner,String packageID) {
         String schoolId = appMapper.selectSchoolId(partner);
+        if(schoolId == null){
+            return ResponseData.error("当前用户无效！");
+        }
         List<String> packageIds = appMapper.selectPackageId(schoolId);
         if(packageIds.contains(packageID)){
           return  ResponseData.success("ok");

old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java

@@ -222,6 +222,9 @@ public class PackageUpgradeController extends BaseController {
         }
         PackageUpgrade packageUpgrade = appMapper.selectById(servId);
         SysUser sysUser = userMapper.selectById(partner);
+        if(sysUser == null){
+            return ResponseData.error("当前用户不存在，如有疑问请联系客服！！");
+        }
         Order order = new Order();
         String uuid = UUID.randomUUID().toString();
         String id=uuid.split("-")[0]+uuid.split("-")[1];

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

@@ -219,10 +219,6 @@ public class OrderController extends BaseController {
             createTimeStart = null;
             createTimeEnd = null;
         }
-        String state = null;
-        if (StringUtils.isNotBlank(orderStatus)) {
-            state = OrderStatus.findById(orderStatus).getId();
-        }
         Wrapper<Order> wrapper = new EntityWrapper();
         wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
         wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
@@ -230,12 +226,13 @@ public class OrderController extends BaseController {
         wrapper.le(StringUtils.isNotBlank(successTimeEnd), "success_time", successTimeEnd);
         wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
         wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
-        wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
+        //wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
+        wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
         wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
         wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
         wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
         wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
-        wrapper.eq(StringUtils.isNotBlank(orderStatus), "status", orderStatus);
+        wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
 
         List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper);
         List<String> tops = new ArrayList<>();

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

+package com.winsun.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.enums.SqlLike;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.winsun.auth.core.annotion.Permission;
+import com.winsun.auth.core.base.controller.BaseController;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.auth.core.shiro.ShiroUser;
+import com.winsun.bean.QRCode;
+import com.winsun.bean.SysUser;
+import com.winsun.mapper.QRCodeMapper;
+import com.winsun.utils.MyBatisPlusUpdateUtils;
+import com.winsun.utils.PicturesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * 二维码
+ * @Author: chancy
+ * @Date: 2020/3/17 11:14
+ */
+@Slf4j
+@RestController
+@RequestMapping("QRCpde")
+public class QRCodeController extends BaseController {
+
+    private static QRCodeMapper qrCodeMapper;
+
+    @Autowired
+    public QRCodeController(QRCodeMapper qrCodeMapper){
+        QRCodeController.qrCodeMapper=qrCodeMapper;
+    }
+
+    @Permission(menuname = "二维码上传图片",value = "picture", method = RequestMethod.POST)
+    public ResponseData<String> uploadPicture(@RequestParam("picture") String picture){
+        ShiroUser user = getShiroUser();
+        Integer userId=user.getId();
+        String path = PicturesUtil.uploadPictures(picture, userId.toString());
+        QRCode qrCode = new QRCode();
+        qrCode.setId(UUID.randomUUID().toString());
+        qrCode.setCreateTime(new Date());
+        qrCode.setPicture(path);
+        qrCode.setUserId(userId);
+        Integer insert = qrCodeMapper.insert(qrCode);
+        if(insert == 1){
+            return ResponseData.success("上传图片成功！");
+        }
+        return ResponseData.error("上传图片失败！");
+    }
+
+    /**
+     *查询二维码图片列表
+     * @param pageIndex
+     * @param pageSize
+     * @return
+     */
+    @Permission(menuname = "查询二维码图片列表", value = "list", method = RequestMethod.POST)
+    public ResponseData<Page<QRCode>> listPicture(@RequestParam(name = "enable",required = false) String enable,@RequestParam(name = "pageNo") int pageIndex, @RequestParam(name = "pageSize") int pageSize) {
+        ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }
+        Wrapper<QRCode> wrapper = new EntityWrapper();
+        wrapper.eq(StringUtils.isNotBlank(enable),"enable",enable);
+        Page<QRCode> page = new Page<>(pageIndex, pageSize);
+        List<QRCode> qrCodes = qrCodeMapper.selectPage(page, wrapper);
+        page.setRecords(qrCodes);
+        return ResponseData.success(page, "查询成功！");
+    }
+
+    /**
+     * 删除二维码图片
+     * @param id  需要删除的id
+     * @return
+     */
+    @Permission(menuname = "删除二维码图片", value = "deletePicture/{id}", method = RequestMethod.POST)
+    public ResponseData<String> deletePicture(@PathVariable("id") Integer id) {
+    /*    ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
+        qrCodeMapper.deleteById(id);
+        return ResponseData.success("删除成功！");
+    }
+
+
+    /**
+     * 是否禁用二维码图片
+     * @return
+     */
+    @Permission(menuname = "是否禁用二维码图片", value = "updateEnable/{id}", method = RequestMethod.POST)
+    public ResponseData<String> updateEnable(@PathVariable("id") Integer id,@RequestParam(name = "enable") String enable) {
+      /*  ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
+            return ResponseData.error("无数据权限");
+        }*/
+        Wrapper wrapper = new EntityWrapper<>();
+        wrapper.eq("id", id);
+        Map<String, Object> dataMapping = new HashMap<>();
+        dataMapping.put("enable", enable);
+        qrCodeMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
+        return ResponseData.success("修改成功！");
+    }
+
+
+}