12/19

src/main/java/com/yxt/yyth/api/empcard/EmpCardVo.java

@@ -25,5 +25,7 @@ public class EmpCardVo implements Vo {
     private String grantDate;
     private String customerSid;
     private String customerMobile;
+    private double goodsNumber;
+    private String goodsSid;
 
 }

src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java

@@ -50,106 +50,110 @@ public class EmpGiftAppletVo {
     private List<EmpReserveOrderCardVo> orderCardVoList;
     private String value;
     private String serialNumber;
+    private String isEnable;
 
 
     public String getStart() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         LocalDate today = LocalDate.now(); // 获取今天的日期
-        LocalTime timeOfDay = LocalTime.of(16, 0); // 设置下午4点的小时数为16，分钟数为0
+        LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
         LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
 
         ZoneId zoneId = ZoneId.systemDefault();
         Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
 //        System.out.println(date);
         //1>2 1 、1<2 -1 、1=2 0
-        int k = DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
+        int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
-        if (String.valueOf(k).equals("1")) {
+        if(String.valueOf(k).equals("1")){
-            start = sdf.format(DateUtil.offsetDay(new Date(), +2));
+            start=sdf.format(DateUtil.offsetDay(new Date(),+2));
-        } else {
+        }else{
-            start = sdf.format(DateUtil.offsetDay(new Date(), +1));
+            start=sdf.format(DateUtil.offsetDay(new Date(),+1));
         }
 
-        if (StringUtils.isNotBlank(dateEnd)) {
+        if(StringUtils.isNotBlank(dateEnd)){
-            int i = DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
+            int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
-            if (String.valueOf(i).equals("-1")) {
+            if(String.valueOf(i).equals("-1")){
-                long o = DateUtil.between(DateUtil.parse(start), DateUtil.parse(dateEnd), DateUnit.DAY);
+                long o=DateUtil.between(DateUtil.parse(start),DateUtil.parse(dateEnd), DateUnit.DAY);
-                if (o < 10) {
+                if(o<10){
-                    end = sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd), 10));
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),10));
-                } else {
+                }else{
-                    end = sdf.format(DateUtil.parse(dateEnd));
+//                    end=sdf.format(DateUtil.parse(dateEnd));
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),4));
                 }
-            } else {
+            }else{
-                if (String.valueOf(k).equals("1")) {
+                if(String.valueOf(k).equals("1")){
-                    end = sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd), 2));
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),2));
-                } else {
+                }else{
-                    end = sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd), 1));
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),1));
                 }
             }
         }
-        reserveDate = start;
+        reserveDate=start;
         return start;
     }
 
     public String getName() {
-        name = name + code;
+        name=name+code;
         return name;
     }
 
     public String getTime() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy.MM.dd");
-        if (StringUtils.isNotBlank(dateStart)) {
+        if(StringUtils.isNotBlank(dateStart)){
-            if (StringUtils.isNotBlank(dateEnd)) {
+            if(StringUtils.isNotBlank(dateEnd)){
-                time = sdf.format(DateUtil.parse(dateStart)) + "~" + sdf.format(DateUtil.parse(dateEnd));
+                time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd));
             }
         }
         return time;
     }
 
     public boolean isShowBtn() {
-        if (states.equals("5")) {
+        if(states.equals("5")){
-            if (isReservation.equals("1")) {
+            if(isReservation.equals("1")){
-                this.state = "已完成";
+                this.state="已完成";
-                showBtn = false;
+                showBtn=false;
             }
         }
         return showBtn;
     }
 
     public String getState() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
-        if (StringUtils.isNotBlank(dateEnd)) {
+        if(StringUtils.isNotBlank(dateEnd)){
-            int i = DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
+            int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date())));
-            if (String.valueOf(i).equals("-1")) {
+            if( String.valueOf(i).equals("-1")){
-                state = "已过期";
+                state="已过期";
-                showBtn = false;
+                showBtn=false;
-            } else {
+            }else if(isEnable.equals("2")){
-                state = "待提货";
+                state="已作废";
-                if (states.equals("5")) {
+                showBtn=false;
-//                    System.out.println("isReservation"+isReservation);
+            }else{
-                    if (isReservation.equals("0")) {
+                state="待提货";
-                        this.state = "已预约";
+                if(states.equals("5")){
-                        this.notRese = false;
+                    if(isReservation.equals("0")){
-                    } else {
+                        this.state="已预约";
-                        this.state = "已完成";
+                        this.notRese=false;
-                        showBtn = false;
+                    }else{
-                    }
+                        this.state="已完成";
-                } else if (states.equals("4")) {
+                        showBtn=false;
-                    if (isReservation.equals("0")) {
+                    }
-                        this.state = "已预约";
+                }else if(states.equals("4")){
-                    } else {
+                    if(isReservation.equals("0")){
-                        this.state = "待提货";
+                        this.state="已预约";
-                    }
+                    }else{
-                }
+                        this.state="待提货";
-            }
+                    }
-        } else {
+                }
-            state = "待提货";
+            }
-            if (states.equals("5")) {
+        }else{
-                if (isReservation.equals("0")) {
+            state="待提货";
-                    this.state = "已预约";
+            if(states.equals("5")){
-                } else {
+                if(isReservation.equals("0")){
-                    this.state = "已完成";
+                    this.state="已预约";
-                    showBtn = false;
+                }else{
+                    this.state="已完成";
+                    showBtn=false;
                 }
             }
         }

src/main/java/com/yxt/yyth/api/empcardgrantlog/EmpCardGrantLogVo.java

@@ -23,6 +23,7 @@ public class EmpCardGrantLogVo implements Vo {
     private String cardSid;
     private String goods;
     private double goodsNumber;
+    private String goodsSid;
     private String code;
     private String codeKey;
     private String remarks;

src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomer.java

@@ -32,4 +32,6 @@ public class LpkCustomer {
     private String realName;
     private String nick;
     private String photo;
+    @TableField(exist = false)
+    private String token;
 }

src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java

@@ -34,6 +34,7 @@ public class LpkReserveOrderCardVo implements Vo {
     private List<GoodsVo> goodsVos;
     private String goods;
     private String serialNumber;
+    private String type;
 
     public String getBagName() {
         if(StringUtils.isBlank(bagName)){

src/main/java/com/yxt/yyth/api/sysuser/SysUserVo.java

@@ -89,4 +89,5 @@ public class SysUserVo implements Vo {
     private Boolean needResetPsd;
     @ApiModelProperty("工号")
     private String jobNumber;
+    private String password;
 }

src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java

@@ -33,4 +33,5 @@ public interface EmpCardMapper extends BaseMapper<EmpCard> {
     Integer cardGrantCount(@Param("recordSid") String recordSid);
 
     IPage<EmpAppletVo> getEmpCardByCustomerSid(IPage<EmpCard> page, @Param(Constants.WRAPPER) QueryWrapper<EmpCard> qw);
+    List<EmpCardVo> selEmpCardSid(@Param("empCardSid")String empCardSid);
 }

src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml

@@ -120,4 +120,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selEmpCardSid" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
+        SELECT
+        card.*,
+        s.name as goodsNmae,
+        s.sid as goodsSid
+        FROM
+        emp_card card
+        LEFT JOIN lpk_giftbag bag on card.giftbagSid=bag.sid
+        left join lpk_giftbag_goods s on card.sid=s.giftbagSid
+        where card.sid=#{empCardSid}
+    </select>
 </mapper>

src/main/java/com/yxt/yyth/biz/empcard/EmpCardRest.java

@@ -31,7 +31,7 @@ public class EmpCardRest {
 
     @PostMapping("/bindCard")
     @ApiOperation(value = "客户绑定企业卡")
-    public ResultBean wxBindMobile(@RequestBody EmpCardDto dto) {
+    public ResultBean bindCard(@RequestBody EmpCardDto dto) {
         return empCardService.bindCard(dto);
     }
     @PostMapping("/generateCard")
@@ -40,6 +40,11 @@ public class EmpCardRest {
         return empCardService.generateCard(dto);
     }
 
+//    @PostMapping("/updateEmpCardState")
+//    @ApiOperation(value = "生成企业卡信息")
+//    public ResultBean generateCard(@RequestBody EmpCardDto dto) {
+//        return empCardService.generateCard(dto);
+//    }
     @PostMapping("/cardList")
     @ApiOperation(value = "企业卡信息列表")
     public ResultBean<PagerVo<EmpCardVo>> cardList(@RequestBody PagerQuery<EmpCardQuery> pq) {

src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java

@@ -80,6 +80,24 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
         return rb.success().setMsg("绑定成功");
     }
 
+
+    public ResultBean updateEmpCardState(String empCardSid) {
+        ResultBean rb = new ResultBean().fail();
+        List<EmpCardVo> vos=baseMapper.selEmpCardSid(empCardSid);
+        int i=0;
+        for(EmpCardVo vo:vos){
+            EmpCardGrantLogVo empCardGrantLogVo=empCardGrantLogService.recordGoodsSid(empCardSid,vo.getGoodsSid()).getData();
+            if(vo.getGoodsNumber()==empCardGrantLogVo.getGoodsNumber()){
+                i++;
+            }
+            if(i==vos.size()){
+                EmpCard empCard=baseMapper.selectOne(new QueryWrapper<EmpCard>().eq("sid",empCardSid));
+                empCard.setState("3");
+                baseMapper.updateById(empCard);
+            }
+        }
+        return rb.success().setMsg("绑定成功");
+    }
     @Transactional(rollbackFor = Exception.class)
     public ResultBean generateCard(EmpCardDto dto) {
         ResultBean rb = ResultBean.fireFail();

src/main/java/com/yxt/yyth/biz/empcardgrantlog/EmpCardGrantLogMapper.java

@@ -19,5 +19,6 @@ import java.util.List;
 public interface EmpCardGrantLogMapper extends BaseMapper<EmpCardGrantLog> {
     IPage<EmpCardGrantLogVo> recordListPage(IPage<EmpCardGrantLog> page, @Param(Constants.WRAPPER) QueryWrapper<EmpCardGrantLog> qw);
     List<EmpCardGrantLogVo> recordList(@Param("empCardSid")String empCardSid);
+    EmpCardGrantLogVo recordGoodsSid(@Param("empCardSid")String empCardSid,@Param("goodsSid")String goodsSid);
     EmpCardGrantLogVo recordListGoods(@Param("empCardSid")String empCardSid,@Param("goodsSid")String goodsSid);
 }

src/main/java/com/yxt/yyth/biz/empcardgrantlog/EmpCardGrantLogMapper.xml

@@ -32,6 +32,22 @@
         where log.empCardSid=#{empCardSid}
 
     </select>
+    <select id="recordGoodsSid" resultType="com.yxt.yyth.api.empcardgrantlog.EmpCardGrantLogVo">
+        SELECT
+            log.*,
+            gi.sid as cardSid,
+            gi.code as code,
+            gi.codeKey as codeKey,
+            gi.remarks as remakrs,
+            sum(goods.goodsNumber) as goodsNumber,
+            goods.goodsSid as goodsSid
+        FROM
+            emp_card_grant_log log
+                LEFT JOIN emp_card_gift gi ON gi.CODE = log.CODE
+                left join emp_card_gift_goods goods on goods.goodsSid=gi.sid
+        where log.empCardSid=#{empCardSid} and goods.goodsSid=#{goodsSid}
+        group goodsSid
+    </select>
     <select id="recordListGoods" resultType="com.yxt.yyth.api.empcardgrantlog.EmpCardGrantLogVo">
         SELECT
             log.sid,

src/main/java/com/yxt/yyth/biz/empcardgrantlog/EmpCardGrantLogService.java

@@ -59,4 +59,9 @@ public class EmpCardGrantLogService extends MybatisBaseService<EmpCardGrantLogMa
         EmpCardGrantLogVo pagging = baseMapper.recordListGoods(empCardSid,goodsSid);
         return rb.success().setData(pagging);
     }
+    public ResultBean<EmpCardGrantLogVo> recordGoodsSid(String empCardSid,String goodsSid) {
+        ResultBean rb = ResultBean.fireFail();
+        EmpCardGrantLogVo pagging = baseMapper.recordGoodsSid(empCardSid,goodsSid);
+        return rb.success().setData(pagging);
+    }
 }

src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java

@@ -1,5 +1,7 @@
 package com.yxt.yyth.biz.lpkcustomer;
 
+import cn.dev33.satoken.stp.SaTokenInfo;
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -96,6 +98,9 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
 //        if(StringUtils.isBlank(lpkCustomer.getMobile())){
 //            return rb.setData(lpkCustomer).setCode("110");
 //        }
+        StpUtil.login(lpkCustomer.getId());
+        SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
+        lpkCustomer.setToken(tokenInfo.getTokenValue());
         return rb.success().setData(lpkCustomer);
     }
     public ResultBean wxBindMobile(WxBindMobileDto wxBindMobileDto) {

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -121,6 +121,10 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         if (null == lpkGiftCard) {
             return rb.setMsg("请核对卡号和密钥");
         }
+        if (!lpkGiftCard.getIsEnable().equals("1")) {
+            return rb.setMsg("此卡已作废");
+        }
+
         AppletVo vo = baseMapper.getGifCardBySid(lpkGiftCard.getSid());
         if (vo.getState().equals("已过期")) {
             return rb.setMsg("该卡已过期");

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml

@@ -113,6 +113,9 @@
     <select id="orderListByUserSid" resultType="com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo">
         SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
         c.`code`,
+        case
+        when o.reserveDate IS NOT NULL then 1
+        end as  type,
         s.`name` as store,
         b.`name` as bagName,
         o.cardSid as cardSid,
@@ -130,6 +133,9 @@
         UNION
         SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
         c.`code`,
+        case
+        when o.reserveDate IS NOT NULL then 2
+        end as  type,
         s.`name` as store,
         b.`name` as bagName,
         o.cardSid as cardSid,

src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java

@@ -29,7 +29,7 @@ public class LpkStoreService extends MybatisBaseService<LpkStoreMapper, LpkStore
         QueryWrapper<LpkStore> qw = new QueryWrapper<>();
         qw.eq("1","1");
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("name", query.getName());
+            qw.like("st.name", query.getName());
         }
         qw.orderByDesc("createTime");
         IPage<LpkStore> page = PagerUtil.queryToPage(pq);

src/main/java/com/yxt/yyth/biz/sysuser/SysUserMapper.java

@@ -21,7 +21,7 @@ import java.util.Map;
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    @Select("select count(userName) as userName from sys_user where userName=#{userName} and password=#{password}")
+    @Select("select *  from sys_user where userName=#{userName} ")
-    SysUserVo getUser(@Param("userName")String userName, @Param("password")String password);
+    SysUserVo getUser(@Param("userName")String userName );
 
 }

src/main/java/com/yxt/yyth/biz/sysuser/SysUserRest.java

@@ -3,6 +3,7 @@ package com.yxt.yyth.biz.sysuser;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
 import com.yxt.common.base.config.RedisUtil;
+import com.yxt.common.base.utils.Encodes;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.yyth.api.sysuser.*;
 import io.swagger.annotations.Api;
@@ -26,12 +27,20 @@ public class SysUserRest {
 
     @ApiOperation("登录")
     @PostMapping("/doLogin")
-    public ResultBean doLogin(@RequestBody SysUser user) {
+    public ResultBean doLogin(@RequestBody SysUser user ) {
         ResultBean rb = new ResultBean();
-        SysUserVo sysUserVo = sysUserService.getUser(user.getUserName(), user.getPassword());
+        SysUserVo sysUserVo = sysUserService.getUser(user.getUserName());
-        if (sysUserVo.getUserName().equals("1")) {
+        boolean isTrue=false;
-            SysUser sysUser = sysUserService.getSysUser(user.getUserName(), user.getPassword());
+        if(null==sysUserVo){
-            StpUtil.login(sysUser.getId());
+            return rb.setMsg("账户不存在或者密码不正确");
+        }
+        String md5 = Encodes.md5(user.getPassword());
+        if (sysUserVo.getPassword().equals(md5)) {
+            isTrue = true;
+        }
+        if (isTrue) {
+//            SysUser sysUser = sysUserService.getSysUser(user.getUserName(), user.getPassword());
+            StpUtil.login(sysUserVo.getId());
             SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
             System.out.println(StpUtil.getTokenName());
             System.out.println(StpUtil.getTokenValue());

src/main/java/com/yxt/yyth/biz/sysuser/SysUserService.java

@@ -36,9 +36,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
 
 
-    public SysUserVo getUser(String userName, String password) {
+    public SysUserVo getUser(String userName) {
         ResultBean rb = new ResultBean();
-        SysUserVo sysUserVo = baseMapper.getUser(userName, password);
+        SysUserVo sysUserVo = baseMapper.getUser(userName);
         return sysUserVo;
     }
 

src/main/java/com/yxt/yyth/config/SaTokenConfigure.java

@@ -0,0 +1,44 @@
+package com.yxt.yyth.config;
+
+import cn.dev33.satoken.interceptor.SaInterceptor;
+import cn.dev33.satoken.stp.StpUtil;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/16 14:43
+ */
+@Configuration
+public class SaTokenConfigure implements WebMvcConfigurer {
+
+//     注册 Sa-Token 拦截器
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
+        registry.addInterceptor(new SaInterceptor(handler  -> StpUtil.checkLogin()))
+                .addPathPatterns("/**")
+                .excludePathPatterns("/sysuser/doLogin")
+                .excludePathPatterns("/lpkgiftcard/gifCardByCustomerSid")
+                .excludePathPatterns("/empcardgift/gifCardByCustomerSid")
+                .excludePathPatterns("/empcard/getEmpCardByCustomerSid")
+                .excludePathPatterns("/lpkgiftcard/getGifCardBySid/**")
+                .excludePathPatterns("/empcardgift/getGifCardBySid/**")
+                .excludePathPatterns("/empcard/getEmpCardBySid/**")
+                .excludePathPatterns("/lpkgiftcard/isSaturAndSun/**")
+                .excludePathPatterns("/empcardgift/isSaturAndSun/**")
+                .excludePathPatterns("/lpkgiftcard/getReservationBySid/**")
+                .excludePathPatterns("/lpksreservoorder/submission")
+                .excludePathPatterns("/empsreservoorder/submission")
+                .excludePathPatterns("/empcardgift/generateCard")
+                .excludePathPatterns("/lpkgiftcard/bindCard")
+                .excludePathPatterns("/empcard/bindCard")
+                .excludePathPatterns("/lpksreservoorder/orderByCardSid/**")
+                .excludePathPatterns("/lpksreservoorder/orderListByUserSid/**")
+                .excludePathPatterns("/lpksreservoorder/orderDetails/**")
+                .excludePathPatterns("/lpkgoods/goodsDetails/**")
+                .excludePathPatterns("/lpkstore/getAllStoreByQuery")
+                .excludePathPatterns("/lpkcustomer/wxSilentLogin");
+    }
+}