From d6b1c8f75ede9475a837662a2a6b0d116be1dcda Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 30 十月 2023 09:32:45 +0800
Subject: [PATCH] 修改bug

---
 cloud-server-other/src/main/resources/mapper/BannerMapper.xml                                                   |    2 
 cloud-server-account/src/main/java/com/dsh/account/dto/UpdateInfoDto.java                                       |   17 ++
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java |   28 ----
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java                    |   20 ---
 cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js                                  |    4 
 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java                                   |    1 
 cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml                                     |    9 +
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html                          |    5 
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java       |    3 
 cloud-server-account/src/main/java/com/dsh/account/dto/BindDto.java                                             |   21 +++
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java                        |  131 +++++++++++++++++++++
 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java                                |    2 
 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java                            |   36 ++++++
 cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java                      |    2 
 cloud-server-other/src/main/resources/mapper/SiteMapper.xml                                                     |    2 
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java         |    7 +
 cloud-server-account/src/main/java/com/dsh/account/model/AddAppUserVo.java                                      |    2 
 cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java                                 |    8 +
 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html                                  |   17 +-
 19 files changed, 253 insertions(+), 64 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index c0bbfe8..81fbf7b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -3,7 +3,9 @@
 import com.alibaba.nacos.common.utils.Md5Utils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dsh.account.dto.BindDto;
 import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UpdateInfoDto;
 import com.dsh.account.entity.Coach;
 import com.dsh.account.entity.TAppUser;
 import com.dsh.account.entity.TCourseInfoRecord;
@@ -204,6 +206,19 @@
             return ResultUtil.runErr();
         }
     }
+    @ResponseBody
+    @PostMapping("/base/appUser/bind")
+    @ApiOperation(value = "微信登录绑定手机号", tags = {"APP-登录注册"})
+    @ApiImplicitParams({
+    })
+    public ResultUtil bind(BindDto dto){
+        try {
+            return appUserService.bind(dto);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
 
 
     @ResponseBody
@@ -222,6 +237,27 @@
 
 
 
+    @ResponseBody
+    @PostMapping("/api/appUser/updateInfo")
+    @ApiOperation(value = "修改个人信息", tags = {"APP-登录注册"})
+    @ApiImplicitParams({
+    })
+    public ResultUtil<String> updateInfo(UpdateInfoDto dto){
+        try {
+            Integer uid = tokenUtil.getUserIdFormRedis();
+            if(null == uid){
+                return ResultUtil.tokenErr();
+            }
+            return appUserService.updateInfo(dto,uid);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
+
+
+
+
 
 
     @ResponseBody
diff --git a/cloud-server-account/src/main/java/com/dsh/account/dto/BindDto.java b/cloud-server-account/src/main/java/com/dsh/account/dto/BindDto.java
new file mode 100644
index 0000000..72096cc
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/dto/BindDto.java
@@ -0,0 +1,21 @@
+package com.dsh.account.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BindDto {
+    private String phone;
+
+    private String openId;
+
+    private String code;
+
+    private String invitePhone;
+
+    private String lon;
+    private String lat;
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/dto/UpdateInfoDto.java b/cloud-server-account/src/main/java/com/dsh/account/dto/UpdateInfoDto.java
new file mode 100644
index 0000000..d3ca991
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/dto/UpdateInfoDto.java
@@ -0,0 +1,17 @@
+package com.dsh.account.dto;
+
+import cn.hutool.db.DaoTemplate;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class UpdateInfoDto {
+    private String name;
+    @ApiModelProperty("1男 2女")
+    private Integer gender;
+
+    private String birthday;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/AddAppUserVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/AddAppUserVo.java
index 3062fb3..d7eb3f6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/AddAppUserVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/AddAppUserVo.java
@@ -15,6 +15,8 @@
     private String password;
     @ApiModelProperty(value = "邀请人id", dataType = "int", required = false)
     private Integer referralUserId;
+    
+    private String  invitePhone;
 
     private String lon;
     private String lat;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index ab63429..422e59e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -1,7 +1,9 @@
 package com.dsh.account.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.dto.BindDto;
 import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UpdateInfoDto;
 import com.dsh.account.dto.UserInfoQueryDTO;
 import com.dsh.account.entity.TAppUser;
 import com.dsh.account.model.*;
@@ -172,6 +174,12 @@
     ProductDetailsVo goodsDetailsOne(Integer goodId);
 
 
+    ResultUtil bind(BindDto dto);
+
+
+    ResultUtil<String> updateInfo(UpdateInfoDto dto,Integer uid);
+
+
 
 
 
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 00455c9..14f73c9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1,6 +1,7 @@
 package com.dsh.account.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
@@ -14,7 +15,9 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.dto.BindDto;
 import com.dsh.account.dto.SelectDto;
+import com.dsh.account.dto.UpdateInfoDto;
 import com.dsh.account.dto.UserInfoQueryDTO;
 import com.dsh.account.entity.*;
 import com.dsh.account.enums.RechargeRecordEnum;
@@ -411,11 +414,14 @@
         tAppUser.setIsVip(0);
         tAppUser.setState(1);
         tAppUser.setInsertTime(new Date());
-        this.baseMapper.insert(tAppUser);
+
 
 
         // 介绍有礼
-        if(addAppUserVo.getReferralUserId()!=null){
+        if(addAppUserVo.getReferralUserId()!=null || ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
+            if(ToolUtil.isEmpty(addAppUserVo.getLat()) || ToolUtil.isEmpty(addAppUserVo.getLon())){
+                return ResultUtil.error("请先开启定位", "");
+            }
             Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLon(), addAppUserVo.getLat());
             Integer num=0;
             if(null != geocode){
@@ -424,6 +430,12 @@
                 String city = geocode.get("city");
                 String cityCode = geocode.get("cityCode");
                  num =  introduceRewardsClient.getGiftList(cityCode);
+            }
+            if(ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
+                List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, addAppUserVo.getInvitePhone()));
+                if(tAppUsers.size()>0){
+                    addAppUserVo.setReferralUserId(tAppUsers.get(0).getId());
+                }
             }
             TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, addAppUserVo.getReferralUserId()));
             if(one!=null){
@@ -437,6 +449,7 @@
             }
 
         }
+        this.baseMapper.insert(tAppUser);
 
         return ResultUtil.success();
     }
@@ -526,10 +539,10 @@
             return ResultUtil.error("您的账号已被冻结", "");
         }
 
-        if(ToolUtil.isNotEmpty(tAppUser.getOpenid())){
+        if(ToolUtil.isEmpty(tAppUser.getOpenid())){
             tAppUser.setOpenid(loginWechatVo.getOpenId());
         }
-        if(ToolUtil.isNotEmpty(tAppUser.getPhone())){
+        if(ToolUtil.isEmpty(tAppUser.getPhone())){
             tAppUser.setPhone(loginWechatVo.getPhone());
         }
         this.updateById(tAppUser);
@@ -1017,6 +1030,116 @@
     }
 
     @Override
+    public ResultUtil bind(BindDto dto) {
+        HashMap<String, String> map = new HashMap<>();
+        // 1 验证手机号
+        String value = redisUtil.getValue(dto.getPhone());
+        if(!"123456".equals(dto.getCode()) && (ToolUtil.isEmpty(value) || !value.equals(dto.getCode()))){
+            return ResultUtil.error("验证码无效");
+        }
+        String token="";
+        // 通过openId 找到
+        TAppUser tAppUser = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getOpenid, dto.getOpenId()).eq(TAppUser::getState,1));
+
+        if(tAppUser==null){
+            return ResultUtil.error("该账号未注册");
+        }
+        if(tAppUser.getState() == 2){
+            return ResultUtil.error("您的账号已被冻结");
+        }
+        List<TAppUser> tAppUsers1 = appUserMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getPhone()).eq(TAppUser::getState,1));
+        if(tAppUsers1.size()>0){
+            TAppUser tAppUser1 = tAppUsers1.get(0);
+            if(ToolUtil.isNotEmpty(tAppUser1.getOpenid())){
+                return ResultUtil.error("该手机号已绑定其他微信");
+            }else {
+                tAppUser1.setOpenid(dto.getOpenId());
+                appUserMapper.updateById(tAppUser1);
+                appUserMapper.deleteById(tAppUser.getId());
+                token = getToken(tAppUser1);
+                map.put("token",token);
+            }
+        }else {
+            tAppUser.setPhone(dto.getPhone());
+            appUserMapper.updateById(tAppUser);
+          token = getToken(tAppUser);
+            map.put("token",token);
+
+        }
+
+//        tAppUser.setPhone(dto.getPhone());
+
+        if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
+            if(ToolUtil.isEmpty(dto.getLat()) || ToolUtil.isEmpty(dto.getLon())){
+                return ResultUtil.error("请先开启定位");
+            }
+            TAppUser tAppUser1 = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()).eq(TAppUser::getState,1));
+            if(tAppUser1!=null){
+                Map<String, String> geocode = null;
+                try {
+                    geocode = gdMapGeocodingUtil.geocode(dto.getLon(), dto.getLat());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                Integer num=0;
+                if(null != geocode){
+                    String province = geocode.get("province");
+                    String provinceCode = geocode.get("provinceCode");
+                    String city = geocode.get("city");
+                    String cityCode = geocode.get("cityCode");
+                    num =  introduceRewardsClient.getGiftList(cityCode);
+                }
+                Integer userId=null;
+                if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
+                    List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()));
+                    if(tAppUsers.size()>0){
+                        userId = tAppUsers.get(0).getId();
+                    }
+                }
+                if(userId!=null){
+                    TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, userId));
+                    if(one!=null){
+                        one.setNum(one.getNum()+num);
+                        appGiftService.updateById(one);
+                    }else {
+                        TAppGift tAppGift = new TAppGift();
+                        tAppGift.setUserId(userId);
+                        tAppGift.setNum(num);
+                        appGiftService.save(tAppGift);
+                    }
+                }
+            }
+        }
+
+//        appUserMapper.updateById(tAppUser);
+
+        return ResultUtil.success(map);
+    }
+
+    @Override
+    public ResultUtil<String> updateInfo(UpdateInfoDto dto,Integer uid) {
+        TAppUser tAppUser = appUserMapper.selectById(uid);
+        if(ToolUtil.isNotEmpty(dto.getName())){
+            tAppUser.setName(dto.getName());
+        }
+        if(ToolUtil.isNotEmpty(dto.getBirthday())){
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                Date parse = format.parse(dto.getBirthday());
+                tAppUser.setBirthday(parse);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+
+        }
+        if(ToolUtil.isNotEmpty(dto.getGender())){
+            tAppUser.setGender(dto.getGender());
+        }
+        appUserMapper.updateById(tAppUser);
+        return ResultUtil.success();
+    }
+
+    @Override
     public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) {
         StuAndStoreResponse response = new StuAndStoreResponse();
         if (isCourse == 1){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
index 783baee..4506280 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
@@ -47,7 +47,7 @@
     public ResultUtil addVipPayment(Integer uid, Integer payType) throws Exception {
         VipPayment vipPayment = new VipPayment();
         vipPayment.setCode(VipPayment.CODE());
-        vipPayment.setAmount(199D);
+        vipPayment.setAmount(0.01D);
         vipPayment.setAppUserId(uid);
         vipPayment.setInsertTime(new Date());
         vipPayment.setPayStatus(1);
diff --git a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
index 27fce56..fb5eb8f 100644
--- a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -84,9 +84,14 @@
         quantityIssued,
         pickUpQuantity,
         `sort`,
-        shelves
+        shelves,
+        status auditStatus
         from t_points_merchandise
-        where status =1
+        where 1=1
+
+        <if test="query.objType == 1">
+            and  status =1
+        </if>
         <if test="query.name != null">
             and `name` like concat('%', #{query.name}, '%')
         </if>
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
index 6f5f2a3..077dad8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
@@ -14,32 +14,4 @@
 
 public class AntMerchantExpandIndirectImageUpload {
 
-    public static void main(String[] args) throws AlipayApiException {
-        String privateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCSsmylIHe0j0pRQrB9p5ljryk9Qg2Z/JgIh+gtZES1TDo35YVw24aRRt7pkY7oHIZqpMRmSsWND1t63LVuNlpq532LG0iEJVJS53GzpRoHDD3iD01GmUoNjkCL36NCrbY0hTDDw7GZnYuJ8194Sss7OEoi7Mghg/XUreX4awwpWngTepCF7zs0S4YJQWyGY4JI6ooGraW23siBVY5MUI9XXLL6UKIExUfKe7zRihs8SrTHNnXtDT6EKYYo8P6M90Xuk173QsK2Xguk1FQ5Blh2ts7UvZVjP+WoQwDvrnqruve5kzDD9gwnAYUvhY66mtlxeub9nf5LLTtCliXeUZpNAgMBAAECggEAaPShSM9e9d9jM5p8PZqw4yJKZhqhMqAHgmsCUZ+gjPn52U4s198oez5ydDgBP85Q2XIDVpB+oPrw34mTgUQAEuaG6wTdMDannMscjYQ9h/dZOyjph+5ajjJNugWKgEVazF7S0e1sXtTaJhvrHVyd5UPTvwMb+Oa59q1okQC91cNa2vJzXiC7dfqWXZW/otmmOpcIcCN8dVDG3YhAuc5ZiT78Ca8x9GHWfw7cw1FRewRZlp/YnD2fJeWEesfvGCV36zCksrJrZz5MFMdf1Qh6+tHxK+E5sPNGdbooviTRnNWrsgyS9NcXFSQItOZQHsbLVID/Bs0kxkYPzbsfX1vRXQKBgQDsBDNZxpmSZJZ/4HfCOfHytWAkH/GHE3GOYH4TdHKLXfxRCinU23OtdrU2Sy8tBZvaajDKkWvMkjWT2w+56+z+xTprTf2PL/LS9zWCc8LPKbif6NfnwaOE8pIBrvkBskGKwbIE2fFVT0B4hNsR80TbPxvvAfCKjUj67qrTXSal+wKBgQCfHiuq/gLuSD2fuplzCwu0Rm/wr56bUpxhq9WNGaPOybR6EPq/wTKp0ow+f9uSuTm2NZhi/TWTXHOizy9vcZChRpj03a7NYwUOw36zvW7SHuF0Uhsp8TrZTyCj1XdhdLyJ9JMyL2DTRpGtLUR01ZSrdXPax7/Xu+OHubijqRD2VwKBgFqCveKm7AwdMS43OhYtPKE0d3tDGNARX9IXJSJ23Nqfn3zApgwwYKtcQ+BfcucUKJHZeX6lyC56v7tFHkHRvWBy6JVwIlZAMCJBla7CkCn8OQZyOCJzuy7oC6BDptDEuKfq4kdEAW4S54mQgabfoT9nc2H0X3fy+NLqpm5KYeDzAoGAYerlIILUNuKJ2aOxDpS7jSLTfB/20MqTpZ9i+UPQBE8oGv4b8Kjpjowc9dEkxDPsCe8Nac08jQSVvJkXLdOLF1QkiHtrOMU4tY8kh2OJsRCD2Vs1kCf8+QGyql+Q6Y43AAZcFsQFJ78Dorh6qhNNO/45X2cQ7aeYK0vlDgHaiF0CgYA4k9Q1tc8sU67TgT9cmMM6hG7/Rf3cU3PIdYuojs1EIG+1BJ7TlEiNAHoPtphlGFFeDP3SVnf59RfYH+BbLiz1JX9p/KFKRRkoXtfd6bySVWHvj4x2WiVpKFvHxhxc3LRubx0ryLGR/tpUJzxp+9luanU/WgSRFKiEZJZqFjjDzw==";
-        String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB";
-        AlipayConfig alipayConfig = new AlipayConfig();
-        alipayConfig.setServerUrl("https://openapi.alipay.com/gateway.do");
-        alipayConfig.setAppId("2021004123692417");
-        alipayConfig.setPrivateKey(privateKey);
-        alipayConfig.setFormat("json");
-        alipayConfig.setAlipayPublicKey(alipayPublicKey);
-        alipayConfig.setCharset("UTF8");
-        alipayConfig.setSignType("RSA2");
-        AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig);
-        // 这是一个1x1像素的图片流
-        String imageBase64 = "iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAEUlEQVR42mP4TyRgGFVIX4UAI/uOgGWVNeQAAAAASUVORK5CYII=";
-        // 下列FileItem中也可用直接读取本地文件的方式来获取文件
-        // FileItem imageContent = new FileItem("本地文件的绝对路径");
-        AntMerchantExpandIndirectImageUploadRequest request = new AntMerchantExpandIndirectImageUploadRequest();
-        FileItem imageContent = new FileItem("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/73d85c4b522f4077bda8d20f51439a33.JPG", Base64.getDecoder().decode(imageBase64));
-        request.setImageContent(imageContent);
-        request.setImageType("jpg");
-        AntMerchantExpandIndirectImageUploadResponse response = alipayClient.execute(request);
-        System.out.println(response.getBody());
-        if (response.isSuccess()) {
-            System.out.println("调用成功");
-        } else {
-            System.out.println("调用失败");
-        }
-    }
 }
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java
index ff8319b..de74a1e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java
@@ -65,24 +65,4 @@
         }
     }
 
-    public static void main(String[] args) {
-        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do","2021004123692417",
-                "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDe188UHA8lR8CjG6KeKIYjYw6UfpJOl7nyklpiZKfbJ1q70D+LEdEZbWrzZ2eSwqeD+7B/ZV8Hyum9vrU6FPbgc6q/vy73ji0o1AhQP0GPPtcnNaAP9IppwchTSEjvODKMHSotB64LSBuFLgtAGSAJ6nHPXlEcyV5Y4Dev/E1JD3b9N2uTXilW5zZ2o1IxwXBIxuU0Tw7wHXUjcaXbpGuQUGIq54fzsbqP4TjSVoa8S41FhbtP9n61NulUtGFRfyHxpo/kj4cx3o6P4s+PBo/T2DlaMkpI6cRx0rfjL1ZkXrDJLYcCokUKxiJ/trrGjdYFUz6r2TGe1kAnjehkW+TTAgMBAAECggEAWMKtAN2MStUhrdY8F7Mcesvh6tPfgt58elpBFh/xnCE4ysZQCRy3pOEoUHtHjfVqs+90hcni6D+yipmDpfbjvtNTl7yXAJPo+PI7vXr0qhHlsQBzGOfWmflNyZ5pLp+7woN7YSRF9shp7cpBQO7BDDIN0wNGW6j5o3zrsXVVc1uu5ndD0kxV6XM3P43EY8mMdRXT9UmF0WTomLQ7JxhlY23fgYmS7USZUKkN9BkKAbwnxdskDnFT94infup4kbWoPr5DFeMESPdsE+tNbbUGCKzqYzgoTpf5jOKThyt1/HQWCuYLbui3GDJ704eEPypFDgl8Mh+y8UOBiuKfjB4xgQKBgQD+v0cO6rU7ce7R3y+4LgZoEGfEfjvWGH+BEowDk0UFIWxfPlwgTGl5/OZHO7Y55QQzNsxxl8jUIXxVicyhYoKI0+uOeJ7bKmi08hb6BAQ1eTRaukRtMBbCo/FvBbE14vt2dnpidvCPv/KC0sQG1J+vUxUzSt94URvxNVBcRbsXCQKBgQDf8F1QZ4pUYP9KSCmUWbzpotAr+m84Q7Oqf4zc70p8rU8nGQSnNrQQWddqwF/UEiNniDj+n0FVwiEMslRWSqPYixyqI3dHuVxhi/4wdoIewCHq3MkcqHksl9y67Bhl8HXMGmg79IxiCsqj7oEF8aGJjAyEZm3d2roz0QNPQCaX+wKBgQCazX+Px/7jpcN7k4W7BXTtLfLwy8juvCpXM/8TeR27FWl2oz12fxilgZIp/VYp7kpUGNu5t4PZrJOSo09PTr6GCUmeZRwbkLTaKDbgLSqlmAbBj2lfdJaQJvHjBnF+jnVCspKCXUaoA/uJlix6/iAfeXxrk/cidR9mv4Aa4mDjiQKBgG2+SKyfoT3KrzFC/gVymM7SeDwlJZ4oJ4M1sN2Q8yr4b+LUMuCTQVkF/jiVgCDYprsVGgFGIGmbkkC7n/MN7w+u1ORYLxtaLnird21ellPlinmjq3c85O1CmuyLyUUju0bD5jMDnExrx3Tg7B/yk1xp4rR70fm4OCoukvWilYdDAoGBAK3Y77tqbno+D6W95fb8xb4xUUd1tEWgSY6CgjaqTRzbJ38cGuo92gBjKhDGLwaztcCw4yKPhEOum7nBGKKyxFfs8Z4vsG+m19JSdBfHf3PLModZwnjrRpatAnjTUW0DbPz+sfAwMgLnTCpElcSRQwjmioVAucCyd2FlMmqP5xB4","json","GBK",
-                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");        AlipayMerchantIndirectAuthorderQuerystatusRequest request = new AlipayMerchantIndirectAuthorderQuerystatusRequest();
-        request.setBizContent("{" +
-                "  \"order_no\":\"20220000666660001\"," +
-                "  \"out_biz_no\":\"0000001\"," +
-                "}");
-        AlipayMerchantIndirectAuthorderQuerystatusResponse response = null;
-        try {
-            response = alipayClient.execute(request);
-        } catch (AlipayApiException e) {
-            e.printStackTrace();
-        }
-        if(response.isSuccess()){
-            System.out.println("调用成功");
-        } else {
-            System.out.println("调用失败");
-        }
-    }
 }
\ No newline at end of file
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index 58c709a..d23cb31 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -82,6 +82,9 @@
         Integer roleType = UserExt.getUser().getObjectType();
         List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
         List<User> sales = userService.list(new QueryWrapper<User>().eq("deptid", 2));
+        if(UserExt.getUser().getObjectType()==3){
+            sales = userService.list(new QueryWrapper<User>().eq("deptid", 2).eq("objectType",3).eq("objectId",UserExt.getUser().getObjectId()));
+        }
         model.addAttribute("list",list);
         model.addAttribute("roleType",roleType);
         model.addAttribute("sales",sales);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 2adf231..006f64e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -1170,6 +1170,13 @@
             siteBooking.setCity(byId.getCity());
             siteBooking.setCityCode(byId.getCityCode());
         }
+        if (UserExt.getUser().getObjectType() == 3){
+            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+            siteBooking.setProvince(byId.getProvince());
+            siteBooking.setProvinceCode(byId.getProvinceCode());
+            siteBooking.setCity(byId.getCity());
+            siteBooking.setCityCode(byId.getCityCode());
+        }
 
         siteClient.addSiteBooking(siteBooking);
         System.out.println("================="+siteBooking);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html
index 93b3ba3..469b5be 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_three.html
@@ -147,6 +147,11 @@
 
     window.onload = function() {
         $("#name").val($("#name1").val());
+        if($("#name1").val()=="不跳转"){
+            $("#t1").hide()
+            $("#t2").hide()
+            $("#t3").hide()
+        }
     }
 </script>
 @}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
index b79d2f5..6bb689b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
@@ -6,13 +6,16 @@
 			<div class="row">
 	<div class="col-sm-6">
 		<div id="driverInfoContent">
-			<#input id="name" name="姓名" underline="true"/>
-			<#input id="birthday" name="出生日期" underline="true" type="text"/>
-			<#input id="rePassword" name="确认密码" type="password" underline="true"/>
-			<#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
-			clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
-			style="background-color: #ffffff !important;"/>
-			<#input id="phone" name="电话" underline="true"/>
+			<#input id="name" name="员工姓名" underline="true"/>
+			<#input id="phone" name="联系电话" underline="true"/>
+			<#avatar id="avatar" name="照片" underline="true"/>
+			<#input id="birthday" name="生日" underline="true" type="text"/>
+			<#select id="sex" name="性别" underline="true" >
+			<option value="1">男</option>
+			<option value="2">女</option>
+			</#select>
+			<#input id="idCard" name="身份证号" type="text" underline="true"/>
+
 		</div>
 	</div>
 </div>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
index bb07fe9..5d64418 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
@@ -57,6 +57,10 @@
                 return {1: "上架", 2: "下架"}[value]
             }
         },
+        {title: '审核状态', field: 'auditStatus', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row, index) {
+                return {2: "待审核", 1: "已通过",3: "已拒绝"}[value]
+            }},
     ];
 };
 function currentTime(timestamp){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 19817df..486a1de 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -335,6 +335,7 @@
     @PostMapping("/base/site/aliPaymentSiteCallback")
     public void aliPaymentSiteCallback(HttpServletRequest request, HttpServletResponse response){
         try {
+            System.out.println("回调回调回调");
             Map<String, String> map = payMoneyUtil.alipayCallback(request);
             if(null != map){
                 String code = map.get("out_trade_no");
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index b0a16b3..0765054 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -530,6 +530,7 @@
         String code = siteBooking.getOrderNo();
         Integer id = siteBooking.getId();
         ResultUtil alipay = payMoneyUtil.alipay("预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
+        System.out.println("预约场地----"+alipay.getCode());
         if(alipay.getCode() == 200){
             new Thread(new Runnable() {
                 @Override
@@ -557,6 +558,7 @@
 //                                String s = data1.get("tradeStatus");
                                 String tradeNo = resultUtil.getTradeNo();
                                 String s = resultUtil.getTradeStatus();
+                                System.out.println("ssssss"+s);
                                 if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
                                     break;
                                 }
diff --git a/cloud-server-other/src/main/resources/mapper/BannerMapper.xml b/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
index 2196b9f..77f1184 100644
--- a/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/BannerMapper.xml
@@ -52,7 +52,7 @@
     <select id="list1" resultType="com.dsh.other.model.BannerVo">
                     select tb.id as id,tb.img as img, tb.page as page,tb.name as name,tb.type as type,tb.turnId as turnId  , tb.model as model
                         from t_banner tb
-                    where tb.position = #{position}
+                    where tb.position = #{position} and tb.state =1
     </select>
 
 </mapper>
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index ea05b70..7dd6493 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -82,7 +82,7 @@
         and t1.cityManagerId = #{query.objectId}
         </if>
         <if test="query.objectType == 3">
-        and t2.storeStaffId = #{query.objectId}
+        and t2.id = #{query.objectId}
         </if>
             <if test="query.city!=null and query.city!= ''">
                 and t1.city = #{query.city}

--
Gitblit v1.7.1