二维码提交

b479009d · 黄森林 · 52c84058 · b479009d · b479009d · b479009d
Commit b479009d authored Mar 18, 2020 by 黄森林
5 changed files
--- a/common/src/main/java/com/winsun/bean/QRCode.java
+++ b/common/src/main/java/com/winsun/bean/QRCode.java
@@ -23,4 +23,6 @@ public class QRCode {
    private Date createTime;
    private String enable = "1";
+    private String createName;
 }
--- a/common/src/main/java/com/winsun/utils/XbkUtil.java
+++ b/common/src/main/java/com/winsun/utils/XbkUtil.java
@@ -47,11 +47,9 @@ public class XbkUtil {
     * @param contactNumber 联系电话
     * @param idCard        用户身份证
     * @param businessNumber 办理号码
-     * @param cardId         套餐ID
-     * @param partner        用户ID
     * @return
     */
-    public static JSONObject xbkOrderJT0002(String cardId, String partner,String businessNumber, String idCard,
+    public static JSONObject xbkOrderJT0002(String businessNumber, String idCard,
                                          String customerName,String contactNumber,String xbId ,String netId) throws Exception {
        Map<String, Object> map = new HashMap<>();
        map.put("prodId", xbId);

--- a/new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
+++ b/new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
@@ -166,7 +166,7 @@ public class PackageNewClothes {
        instance.add(Calendar.DATE, -94);
        Date time = instance.getTime();
        Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("hehuoren_id", partner);
+        wrapper.eq("social_id",idCard);
        wrapper.gt("create_time", time);
        wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
@@ -268,7 +268,7 @@ public class PackageNewClothes {
        instance.add(Calendar.DATE, -94);
        Date time = instance.getTime();
        Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("hehuoren_id", partner);
+        wrapper.eq("social_id",idCard);
        wrapper.gt("create_time", time);
        wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
@@ -370,7 +370,7 @@ public class PackageNewClothes {
         */
        JSONObject jsonObject = null;
        try {
-            jsonObject = XbkUtil.xbkOrderJT0002(cardId, partner, businessNumber, idCard,
+            jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
                    customerName, contactNumber, xbId, netId);
        } catch (Exception e) {
            log.info("小白卡下单接口调用异常", e.getMessage());
@@ -386,7 +386,7 @@ public class PackageNewClothes {
        instance.add(Calendar.DATE, -94);
        Date time = instance.getTime();
        Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("hehuoren_id", partner);
+        wrapper.eq("social_id",idCard);
        wrapper.gt("create_time", time);
        wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName());
        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
@@ -488,13 +488,13 @@ public class PackageNewClothes {
    public ResponseData<String> packageVerification(String partner,String packageID) {
        String schoolId = appMapper.selectSchoolId(partner);
        if(schoolId == null){
-            return ResponseData.error("当前用户无效！");
+            return ResponseData.error("当前二维码已失效，如有疑问请联系客服！");
        }
        List<String> packageIds = appMapper.selectPackageId(schoolId);
        if(packageIds.contains(packageID)){
          return  ResponseData.success("ok");
        }
-        return ResponseData.error("当前用户没有此套餐！");
+        return ResponseData.error("当前二维码无法办理此套餐，如有疑问请联系客服！");
    }
 }
--- a/old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
+++ b/old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
@@ -223,7 +223,7 @@ public class PackageUpgradeController extends BaseController {
        PackageUpgrade packageUpgrade = appMapper.selectById(servId);
        SysUser sysUser = userMapper.selectById(partner);
        if(sysUser == null){
-            return ResponseData.error("当前用户不存在，如有疑问请联系客服！！");
+            return ResponseData.error("当前二维码已失效，如有疑问请联系客服！");
        }
        Order order = new Order();
        String uuid = UUID.randomUUID().toString();

--- a/service-manager/src/main/java/com/winsun/controller/QRCodeController.java
+++ b/service-manager/src/main/java/com/winsun/controller/QRCodeController.java
@@ -12,6 +12,7 @@ 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.mapper.SysUserMapper;
 import com.winsun.utils.MyBatisPlusUpdateUtils;
 import com.winsun.utils.PicturesUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -35,9 +36,12 @@ public class QRCodeController extends BaseController {
    private static QRCodeMapper qrCodeMapper;
+    private static SysUserMapper sysUserMapper;
    @Autowired
-    public QRCodeController(QRCodeMapper qrCodeMapper){
+    public QRCodeController(QRCodeMapper qrCodeMapper, SysUserMapper sysUserMapper){
        QRCodeController.qrCodeMapper=qrCodeMapper;
+        QRCodeController.sysUserMapper=sysUserMapper;
    }
    @Permission(menuname = "二维码上传图片",value = "picture", method = RequestMethod.POST)
@@ -50,6 +54,7 @@ public class QRCodeController extends BaseController {
        qrCode.setCreateTime(new Date());
        qrCode.setPicture(path);
        qrCode.setUserId(userId);
+        qrCode.setCreateName(user.getName());
        Integer insert = qrCodeMapper.insert(qrCode);
        if(insert == 1){
            return ResponseData.success("上传图片成功！");
@@ -66,24 +71,28 @@ public class QRCodeController extends BaseController {
    @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();
+        Wrapper<QRCode> wrapper = new EntityWrapper();
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
+            wrapper.eq("user_id",user.getId());
        }
-        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);
+        if(qrCodes.size()==0){
+            return ResponseData.error("无可查询数据或无数据权限！");
+        }
        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) {
+    public ResponseData<String> deletePicture(@PathVariable("id") String id) {
    /*    ShiroUser user = getShiroUser();
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
            return ResponseData.error("无数据权限");
@@ -98,7 +107,7 @@ public class QRCodeController extends BaseController {
     * @return
     */
    @Permission(menuname = "是否禁用二维码图片", value = "updateEnable/{id}", method = RequestMethod.POST)
-    public ResponseData<String> updateEnable(@PathVariable("id") Integer id,@RequestParam(name = "enable") String enable) {
+    public ResponseData<String> updateEnable(@PathVariable("id") String id,@RequestParam(name = "enable") String enable) {
      /*  ShiroUser user = getShiroUser();
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
            return ResponseData.error("无数据权限");