product_platform/yxt-yythmall-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.yxtsoft.com/lipinka/yxt-yythmall-biz

Browse Source
This commit is contained in:
liupopo
2024-01-23 16:02:37 +08:00
parent 00042ecd70 4d1c05a219
commit 32d7835669
40 changed files with 1122 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java
View File

@@ -31,7 +31,7 @@ public class AppletGiftBagVo implements Vo {
private String goodsSid;
private String weight="0";//重量
private List<GiftBagGoods> giftBagGoods;
private List<recommendRecord> recordList;
private List<RecommendRecord> recordList;
public String getPrice() {
DecimalFormat decimalFormat = new DecimalFormat("#0.00");

2
src/main/java/com/yxt/yythmall/api/appletgiftbag/recommendRecord.java → src/main/java/com/yxt/yythmall/api/appletgiftbag/RecommendRecord.java
View File

@@ -7,6 +7,6 @@ import lombok.Data;
* @date 2024/1/11 9:29
*/
@Data
public class recommendRecord {
public class RecommendRecord {
private String content;
}

2
src/main/java/com/yxt/yythmall/api/lpkreserveorder/LpkReserveOrder.java
View File

@@ -1,5 +1,6 @@
package com.yxt.yythmall.api.lpkreserveorder;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -11,6 +12,7 @@ import java.util.UUID;
* @date 2023/11/23 10:29
*/
@Data
@TableName("lpk_reserve_order")
public class LpkReserveOrder{
private String id;
private String sid= UUID.randomUUID().toString();

2
src/main/java/com/yxt/yythmall/api/lpkreserveordergoods/LpkReserveOrderGoods.java
View File

@@ -1,5 +1,6 @@
package com.yxt.yythmall.api.lpkreserveordergoods;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -11,6 +12,7 @@ import java.util.UUID;
* @date 2023/11/23 10:29
*/
@Data
@TableName("lpk_reserve_order_goods")
public class LpkReserveOrderGoods {
private String id;
private String sid= UUID.randomUUID().toString();

2
src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java
View File

@@ -18,6 +18,7 @@ public class OrdOrder {
private Date createTime;
private String remarks;
private String mainSid;
private String outTradeNo;
private int payStatus;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
@@ -29,6 +30,7 @@ public class OrdOrder {
private String name;
private int timeRemarks;
private String returnUrl;
private String meet;
// private String receivablePrice;//应收价格

1
src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java
View File

@@ -34,6 +34,7 @@ public class OrdOrderDto implements Dto {
private String customerSid;
private String brandId;
private String bagSid;
private String meet;
// private String receivablePrice;
private List<OrdOrderDetailVo> ordOrderDetailsVoList;

3
src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderQuery.java
View File

@@ -11,5 +11,6 @@ import lombok.Data;
public class OrdOrderQuery implements Query {
private String startDate; //开始时间
private String endDate; //结束时间
private String countNumber; //总数
private String customerSid; //总数
private String state;
}

15
src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderVo.java
View File

@@ -2,9 +2,11 @@ package com.yxt.yythmall.api.ordorder;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetail;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author wangpengfei
@@ -18,15 +20,24 @@ public class OrdOrderVo implements Vo {
private Date createTime;
private String remarks;
private String mainSid;
private int payStatus;
private String outTradeNo;
private int payStatus;//状态
private String payType="微信支付";
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
private int cardNumber;
private int source;
private String totalTee;
private String totalTee;//实付金额
private String meet="0";//应付价格
private String surcharge="0";//附加费
private String openId;
private String userSid;
private String name;
private int timeRemarks;
private String returnUrl;
private String count;//商品数
private List<String> picUrls;//图片
List<OrdOrderDetail> ordOrderDetails;
private String endTime;
private PayResult result;
}

15
src/main/java/com/yxt/yythmall/api/ordorderdetails/OrdOrderDetail.java
View File

@@ -1,9 +1,11 @@
package com.yxt.yythmall.api.ordorderdetails;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
@@ -19,11 +21,14 @@ public class OrdOrderDetail {
private String remarks;
private String orderSid;
private String goodsSid;
private String goodsName;
private int partNumber;
private double numofPart;
private double priceUnit;
private double pricePart;
private String goodsName;//商品名
private int partNumber; //份数
private double numofPart;//每份数量
private double priceUnit;//
private double pricePart;//每份价格
@TableField(exist = false)
private String picUrl;//图片
}

35
src/main/java/com/yxt/yythmall/api/recommendnewuserbag/RecommendNewUserBag.java Normal file
View File

@@ -0,0 +1,35 @@
package com.yxt.yythmall.api.recommendnewuserbag;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
import java.util.UUID;
/**
* @author wangpengfei
* @date 2023/11/21 15:06
*/
@ApiModel(value = "礼包信息", description = "礼包信息")
@TableName("applet_giftbag")
@Data
public class RecommendNewUserBag {
private String id;
private String sid = UUID.randomUUID().toString();
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private String remarks;
private String isEnable;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dateStart;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dateEnd;
private String name;
private String price;
private String iconUrl;
private String isGrounding;
private String isRecommend;
private String preferentialPrice;
}

27
src/main/java/com/yxt/yythmall/api/recommendnewuserbag/RecommendNewUserBagDetailVo.java Normal file
View File

@@ -0,0 +1,27 @@
package com.yxt.yythmall.api.recommendnewuserbag;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/1/6 15:39
*/
@Data
public class RecommendNewUserBagDetailVo {
private String sid;
private String name;
private String dateStart;
private String dateEnd;
private String price;
private String iconUrl;
private String isEnable;
private String isGrounding;
private String isRecommend;
private String remark;
private String count;
private List<GiftBagGoods> goods = new ArrayList<>();
}

31
src/main/java/com/yxt/yythmall/api/recommendnewuserbag/RecommendNewUserBagDto.java Normal file
View File

@@ -0,0 +1,31 @@
package com.yxt.yythmall.api.recommendnewuserbag;
import com.yxt.common.core.dto.Dto;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:13
*/
@ApiModel(value = "礼包信息 数据传输对象", description = "礼包信息 数据传输对象")
@Data
public class RecommendNewUserBagDto implements Dto {
private String sid;
private String remarks;
private String dateStart;
private String dateEnd;
private String name;
private String price;
private String iconUrl;
private String isGrounding;
private String isRecommend;
private String preferentialPrice;
//商品sid
private List<GiftBagGoods> goods = new ArrayList<>();
}

28
src/main/java/com/yxt/yythmall/api/recommendnewuserbag/RecommendNewUserBagInitVo.java Normal file
View File

@@ -0,0 +1,28 @@
package com.yxt.yythmall.api.recommendnewuserbag;
import com.yxt.common.core.vo.Vo;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/11/22 11:15
*/
@Data
public class RecommendNewUserBagInitVo implements Vo {
private String sid;
private String remarks;
private String dateStart;
private String dateEnd;
private String name;
private String price;
private String iconUrl;
private String isRecommend;
private String preferentialPrice;
//商品sid
private List<GiftBagGoods> goods = new ArrayList<>();
}

15
src/main/java/com/yxt/yythmall/api/recommendnewuserbag/RecommendNewUserBagQuery.java Normal file
View File

@@ -0,0 +1,15 @@
package com.yxt.yythmall.api.recommendnewuserbag;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/11/21 15:31
*/
@ApiModel(value = "礼包信息 查询条件", description = "礼包信息 查询条件")
@Data
public class RecommendNewUserBagQuery implements Query {
private String name;
}

45
src/main/java/com/yxt/yythmall/api/recommendnewuserbag/RecommendNewUserBagVo.java Normal file
View File

@@ -0,0 +1,45 @@
package com.yxt.yythmall.api.recommendnewuserbag;
import com.yxt.common.core.vo.Vo;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import com.yxt.yythmall.api.appletgiftbag.RecommendRecord;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.text.DecimalFormat;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:12
*/
@Data
@ApiModel(value = "礼包信息 视图数据对象", description = "礼包信息 视图数据对象")
@NoArgsConstructor
public class RecommendNewUserBagVo implements Vo {
private String sid;
private String name;//
private String dateStart;
private String dateEnd;
private String price;//礼包总价格
private String prefPrice;//优惠价格
private String iconUrl;//图片
private String isEnable;
private String isGrounding;
private String isRecommend;//是否推荐 1 推荐 0 默认
private String remarks;
private String count;//
private String goodsSid;
private String weight="0";//重量
private List<GiftBagGoods> giftBagGoods;
private List<RecommendRecord> recordList;
public String getPrice() {
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
if(null==price){
price="0";
}
return price=decimalFormat.format(Double.valueOf(price));
}
}

29
src/main/java/com/yxt/yythmall/api/recommendnewuserbagdetails/RecommendNewUserBagDetails.java Normal file
View File

@@ -0,0 +1,29 @@
package com.yxt.yythmall.api.recommendnewuserbagdetails;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
import java.util.UUID;
/**
* @author wangpengfei
* @date 2023/11/21 15:06
*/
@ApiModel(value = "礼包包含商品信息", description = "礼包包含商品信息")
@TableName("applet_giftbag_goods")
@Data
public class RecommendNewUserBagDetails {
private String id;
private String sid = UUID.randomUUID().toString();
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private String remarks;
private String giftbagSid;
private String goodsSid;
private String goodsNumber;
// private String isGrounding;
private double price;
}

14
src/main/java/com/yxt/yythmall/api/recommendnewuserbagdetails/RecommendNewUserBagDetailsDto.java Normal file
View File

@@ -0,0 +1,14 @@
package com.yxt.yythmall.api.recommendnewuserbagdetails;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/11/21 15:13
*/
@ApiModel(value = "礼包包含商品信息 数据传输对象", description = "礼包包含商品信息 数据传输对象")
@Data
public class RecommendNewUserBagDetailsDto implements Dto {
}

15
src/main/java/com/yxt/yythmall/api/recommendnewuserbagdetails/RecommendNewUserBagDetailsQuery.java Normal file
View File

@@ -0,0 +1,15 @@
package com.yxt.yythmall.api.recommendnewuserbagdetails;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author wangpengfei
* @date 2023/11/21 15:31
*/
@ApiModel(value = "礼包包含商品信息 查询条件", description = "礼包包含商品信息 查询条件")
@Data
public class RecommendNewUserBagDetailsQuery implements Query {
}

23
src/main/java/com/yxt/yythmall/api/recommendnewuserbagdetails/RecommendNewUserBagDetailsVo.java Normal file
View File

@@ -0,0 +1,23 @@
package com.yxt.yythmall.api.recommendnewuserbagdetails;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author wangpengfei
* @date 2023/11/21 15:12
*/
@Data
@ApiModel(value = "礼包包含商品信息 视图数据对象", description = "礼包包含商品信息 视图数据对象")
@NoArgsConstructor
public class RecommendNewUserBagDetailsVo implements Vo {
private String goodsName;
private double goodsNumber;
private String picUrl;
private String goodsSid;
private String price;
private String unitName;
private String remarks;
}

2
src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagRest.java
View File

@@ -71,7 +71,7 @@ public class AppletGiftBagRest {
public ResultBean getGiftBagBySid(@PathVariable String sid) {
return AppletGiftBagService.getGiftBagBySid(sid);
}
@ApiOperation("共享家庭卡蔬菜详情")
@ApiOperation("")
@GetMapping("/recommendRecord/{sid}")
public ResultBean recommendRecord(@PathVariable("sid") String sid) {
return AppletGiftBagService.recommendRecord(sid);

12
src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagService.java
View File

@@ -14,8 +14,7 @@ import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.appletgiftbag.*;
import com.yxt.yythmall.api.appletgiftbaggoods.AppletGiftBagGoods;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import com.yxt.yythmall.api.appletgiftbag.recommendRecord;
import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
import com.yxt.yythmall.api.appletgiftbag.RecommendRecord;
import com.yxt.yythmall.api.lpkgoods.LpkGoods;
import com.yxt.yythmall.biz.appletgiftbaggoods.AppletGiftBagGoodsService;
import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
@@ -24,7 +23,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -253,13 +251,13 @@ public class AppletGiftBagService extends MybatisBaseService<AppletGiftBagMapper
AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper<AppletGiftBag>().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31"));
vo.setRemarks(bag.getRemarks());
vo.setIconUrl(fileUploadComponent.getUrlPrefix() +bag.getIconUrl());
recommendRecord recommendRecord=new recommendRecord();
RecommendRecord recommendRecord=new RecommendRecord();
recommendRecord.setContent("梧桐居助力您获得7斤白菜");
recommendRecord recommendRecord1=new recommendRecord();
RecommendRecord recommendRecord1=new RecommendRecord();
recommendRecord1.setContent("龙助力您获得7斤白菜");
recommendRecord recommendRecord2=new recommendRecord();
RecommendRecord recommendRecord2=new RecommendRecord();
recommendRecord2.setContent("美人助力您获得15斤土豆");
List<recommendRecord> list=new ArrayList<>();
List<RecommendRecord> list=new ArrayList<>();
list.add(recommendRecord);
list.add(recommendRecord1);
list.add(recommendRecord2);

3
src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
View File

@@ -1175,6 +1175,9 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
}
}
}
order.setPayStatus(4);
order.setPayTime(new Date());
ordOrderService.updateById(order);
return rb.success();
}

56
src/main/java/com/yxt/yythmall/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java
View File

@@ -47,34 +47,34 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService<LpkReserveOr
baseMapper.insert(goods);
}
}
AppletVo vo = lpkGiftCardService.getGifCardBySid(dto.getSid()).getData();
int i=0;
for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
EmpCardGiftGoodsVo goods1=empCardGiftGoodsService.recordListGoods(dto.getSid(),vo1.getGoodsSid()).getData();
LpkReserveOrderGoods goods2 = baseMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
double c=0;
if(goods1==null){
if(goods2==null){
c=0;
}else{
c=goods2.getGoodsNumber();
}
}else{
if(goods2==null){
c=goods1.getGoodsNumber();
}else{
c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
}
}
if (vo1.getNum() <= c) {
i++;
}
}
if (vo.getGoodsVos().size() == i) {
lpkGiftCardService.changState(dto.getSid(), "5");
} else {
lpkGiftCardService.changState(dto.getSid(), "4");
}
// AppletVo vo = lpkGiftCardService.getGifCardBySid(dto.getSid()).getData();
// int i=0;
// for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) {
// EmpCardGiftGoodsVo goods1=empCardGiftGoodsService.recordListGoods(dto.getSid(),vo1.getGoodsSid()).getData();
// LpkReserveOrderGoods goods2 = baseMapper.getReserveByCardSid(dto.getSid(), vo1.getGoodsSid());
// double c=0;
// if(goods1==null){
// if(goods2==null){
// c=0;
// }else{
// c=goods2.getGoodsNumber();
// }
// }else{
// if(goods2==null){
// c=goods1.getGoodsNumber();
// }else{
// c=goods2.getGoodsNumber()+goods1.getGoodsNumber();
// }
// }
// if (vo1.getNum() <= c) {
// i++;
// }
// }
// if (vo.getGoodsVos().size() == i) {
// lpkGiftCardService.changState(dto.getSid(), "5");
// } else {
// lpkGiftCardService.changState(dto.getSid(), "4");
// }
return rb.success().setData("预约成功");
}

2
src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordMapper.java
View File

@@ -26,6 +26,6 @@ public interface NewcomerRecoRecordMapper extends BaseMapper<NewcomerRecoRecord>
List<NewcomerRecoRecord> selInOrderSid(@Param("orderSids") List<String> orderSids);
@Select("select *,goodsNumber as num from lpk_reserve_order_goods where orderSid=#{orderSid}")
List<NewcomerRecoRecord> selByOrderSids(String orderSid);
@Select("select * from newcomer_reco_record r where customerSid =#{customerSid} limit 5")
@Select("select * from newcomer_reco_record r where r.customerSid =#{customerSid} limit 5")
List<NewcomerRecoRecordVo> recordList(@Param("customerSid")String customerSid);
}

9
src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
View File

@@ -5,6 +5,9 @@ import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import com.yxt.yythmall.api.appletgiftbag.AppletGiftBag;
import com.yxt.yythmall.api.appletgiftbag.AppletGiftBagVo;
import com.yxt.yythmall.api.appletgiftbag.RecommendRecord;
import com.yxt.yythmall.api.appletgiftbaggoods.AppletGiftBagGoods;
import com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo;
import com.yxt.yythmall.api.lpkcustomer.LpkCustomer;
@@ -95,8 +98,10 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
public ResultBean recordList(String customerSid) {
ResultBean rb = new ResultBean();
List<NewcomerRecoRecordVo> vos=baseMapper.recordList(customerSid);
// List<NewcomerRecoRecordVo> vos=baseMapper.recordList(customerSid);
// AppletGiftBagVo vo=new AppletGiftBagVo();
// AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper<AppletGiftBag>().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31"));
baseMapper.recordList()
// vos.forEach(s->{
// s.
// });

11
src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderMapper.java
View File

@@ -1,8 +1,17 @@
package com.yxt.yythmall.biz.ordorder;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.common.core.result.ResultBean;
import com.yxt.yythmall.api.lpkstore.LpkStore;
import com.yxt.yythmall.api.ordorder.OrdOrder;
import com.yxt.yythmall.api.ordorder.OrdOrderVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
@@ -10,5 +19,7 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface OrdOrderMapper extends BaseMapper<OrdOrder> {
IPage<OrdOrderVo> orderList(IPage<OrdOrder> page, @Param(Constants.WRAPPER) QueryWrapper<OrdOrder> qw);
OrdOrderVo getOrderDetails(@Param("sid")String sid);
}

110
src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderMapper.xml
View File

@@ -4,111 +4,23 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="storeListPage" resultType="com.yxt.yythmall.api.lpkstore.LpkStoreVo">
<select id="orderList" resultType="com.yxt.yythmall.api.ordorder.OrdOrderVo">
select
sid,
date_format(createTime, '%Y-%m-%d') as createTime,
code,
`name`,
address,
phone,
businessHours
from lpk_store
*
from ord_order
<where>
${ew.sqlSegment}
</where>
</select>
<select id="orderList" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo">
<select id="getOrderDetails" resultType="com.yxt.yythmall.api.ordorder.OrdOrderVo">
select
o.sid,
date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
o.userName,
o.userPhone,
s.`name` as store,
b.`name` as bagName,
c.`code`
from lpk_reserve_order as o
left join lpk_store as s on o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="orderListByStore" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo">
select
o.sid,
date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
s.`name` as store,
s.sid as storeSid
from lpk_reserve_order as o
left join lpk_store as s on o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="orderByCardSid" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo">
SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
c.`code`,
s.`name` as store,
b.`name` as bagName,
o.sid as orderSid
FROM lpk_reserve_order AS o
LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
WHERE o.cardSid = #{sid}
</select>
<select id="orderListByUserSid" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo">
SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
c.`code`,
s.`name` as store,
b.`name` as bagName,
o.cardSid as cardSid,
o.sid as orderSid,
o.userName,
o.userPhone,c.serialNumber as serialNumber,
o.sid
FROM lpk_reserve_order AS o
LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="exportExcel" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExport">
select
o.sid,
date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
o.userName,
o.userPhone,
s.`name` as store,
b.`name` as bagName,
c.`code`
from lpk_reserve_order as o
left join lpk_store as s on o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="exportExcelByStore" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExportByStore">
select
o.sid,
date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
s.`name` as store,
s.sid as storeSid
from lpk_reserve_order as o
left join lpk_store as s on o.storeSid = s.sid
LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
<where>
${ew.sqlSegment}
</where>
*
from ord_order
where sid=#{sid}
</select>
</mapper>

20
src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderRest.java
View File

@@ -1,7 +1,12 @@
package com.yxt.yythmall.biz.ordorder;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.lpkstore.LpkStoreVo;
import com.yxt.yythmall.api.ordorder.OrdOrderDto;
import com.yxt.yythmall.api.ordorder.OrdOrderQuery;
import com.yxt.yythmall.api.ordorder.OrdOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,4 +39,19 @@ public class OrdOrderRest {
public ResultBean createNewUserBagOrder(@RequestBody OrdOrderDto dto) {
return ordOrderService.createNewUserBagOrder(dto);
}
@PostMapping("/ordersList")
@ApiOperation(value = "支付记录")
public ResultBean<PagerVo<OrdOrderVo>> orderList(@RequestBody PagerQuery<OrdOrderQuery> query) {
return ordOrderService.orderList(query);
}
@GetMapping("/OrderDetails/{sid}")
@ApiOperation(value = "支付记录明细")
public ResultBean<OrdOrderVo> getOrderDetails(@PathVariable("sid") String sid) {
return ordOrderService.getOrderDetails(sid);
}
@GetMapping("/changePayState/{sid}")
@ApiOperation(value = "改变订单状态")
public ResultBean changePayState(@PathVariable("sid") String sid) {
return ordOrderService.changePayState(sid);
}
}

162
src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
View File

@@ -1,12 +1,22 @@
package com.yxt.yythmall.biz.ordorder;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss;
import com.yxt.yythmall.api.lpkcustomer.LpkCustomerVo;
import com.yxt.yythmall.api.lpkgoods.LpkGoods;
import com.yxt.yythmall.api.lpkstore.LpkStore;
import com.yxt.yythmall.api.lpkstore.LpkStoreQuery;
import com.yxt.yythmall.api.lpkstore.LpkStoreVo;
import com.yxt.yythmall.api.ordorder.*;
import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetail;
import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetailVo;
@@ -24,6 +34,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -45,6 +56,10 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
LpkGoodsService lpkGoodsService;
@Autowired
AppletGiftBagService appletGiftBagService;
@Autowired
OrdOrderDetailService ordOrderDetailService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Transactional(rollbackFor = Exception.class)
@@ -63,9 +78,10 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
}
OrdOrder order=new OrdOrder();
BeanUtil.copyProperties(dto, order, "id", "sid");
order.setCreateTime(new Date());
order.setMainSid(rb2.get("mainSid").toString());
order.setPayStatus(1);
order.setOutTradeNo(rb2.get("outTradeNo").toString());
order.setPayStatus(2);
order.setPayTime(new Date());
order.setCardNumber(dto.getCardNumber());
order.setSource(0);
@@ -140,6 +156,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
query.setBrandId(dto.getBrandId());
List<ShoppingCartVo> vos=shoppingCartService.shoppingCartList(query).getData();
List<String> strings=new ArrayList<>();
double totalAmount=0;
for (ShoppingCartVo vo : vos) {
OrdOrderDetailVo vo1 =new OrdOrderDetailVo();
LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", vo.getGoodsSid()));
@@ -149,6 +166,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
vo1.setNumofPart(Double.valueOf(vo.getWeight()));
vo1.setPriceUnit(Double.valueOf(goods.getPrice()));
vo1.setPricePart((Double.valueOf(goods.getPrice())*Double.valueOf(goods.getWeight())));
totalAmount= Double.valueOf(vo1.getPricePart())*Double.valueOf(vo1.getPartNumber())+totalAmount;
ordOrderDetailVos.add(vo1);
strings.add(vo.getSid());
}
@@ -165,15 +183,17 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
}
OrdOrder order=new OrdOrder();
BeanUtil.copyProperties(dto, order, "id", "sid");
order.setCreateTime(new Date());
order.setMainSid(rb2.get("mainSid").toString());
order.setPayStatus(1);
order.setOutTradeNo(rb2.get("outTradeNo").toString());
order.setPayStatus(2);
order.setPayTime(new Date());
order.setCardNumber(dto.getCardNumber());
order.setSource(0);
order.setUserSid(vo.getSid());
order.setOpenId(vo.getWxMpOpenid());
order.setTotalTee(dto.getTotalTee());
order.setTotalTee(dto.getTotalTee());//实付金额
order.setMeet(removeZeros(String.valueOf(totalAmount)));//应付金额
if(dto.getOrdOrderDetailsVoList().size()>1){
order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品");
}else{
@@ -241,6 +261,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
List<GiftBagGoodss> vos=appletGiftBagService.getGoodsByBagSid(dto.getBagSid()).getData();
dto.setTotalTee(vos.get(0).getPrefPrice());
dto.setCardNumber(1);
double totalAmount=0;
for (GiftBagGoodss vo : vos) {
OrdOrderDetailVo vo1 =new OrdOrderDetailVo();
LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid", vo.getGoodsSid()));
@@ -250,6 +271,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
vo1.setNumofPart(Double.valueOf(vo.getWeight()));
vo1.setPriceUnit(Double.valueOf(goods.getPrice()));
vo1.setPricePart((Double.valueOf(goods.getPrice())*Double.valueOf(goods.getWeight())));
totalAmount= Double.valueOf(vo1.getPricePart())*Double.valueOf(vo1.getPartNumber())+totalAmount;
ordOrderDetailVos.add(vo1);
}
dto.setOrdOrderDetailsVoList(ordOrderDetailVos);
@@ -266,15 +288,17 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
}
OrdOrder order=new OrdOrder();
BeanUtil.copyProperties(dto, order, "id", "sid");
order.setCreateTime(new Date());
order.setMainSid(rb2.get("mainSid").toString());
order.setPayStatus(1);
order.setOutTradeNo(rb2.get("outTradeNo").toString());
order.setPayStatus(2);
order.setPayTime(new Date());
order.setCardNumber(dto.getCardNumber());
order.setSource(0);
order.setUserSid(vo.getSid());
order.setOpenId(vo.getWxMpOpenid());
order.setTotalTee(dto.getTotalTee());
order.setMeet(removeZeros(String.valueOf(totalAmount)));//应付金额
if(dto.getOrdOrderDetailsVoList().size()>1){
order.setName(dto.getOrdOrderDetailsVoList().get(0).getGoodsName().toString()+"等"+(dto.getOrdOrderDetailsVoList().size()-1)+"件商品");
}else{
@@ -347,23 +371,109 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
mp_template_msg.put("returnUrl", returnUrl);
return mp_template_msg;
}
// private OrdOrderDto price(OrdOrderDto dto){
// int weight=0;
// for (OrdOrderDetailVo s : dto.getOrdOrderDetailsVoList()) {
// weight= (int) (s.getNumofPart()*s.getPartNumber()+weight);
// }
//
// if(weight>=20 && weight<=100){
// dto.setReceivablePrice(dto.getTotalTee());
// double a =1.1;
// dto.setTotalTee(String.valueOf(Double.valueOf(dto.getTotalTee())*a));
// }else if(weight>=101 && weight<=200){
// dto.setReceivablePrice(dto.getTotalTee());
// double a =1.05;
// dto.setTotalTee(String.valueOf(Double.valueOf(dto.getTotalTee())*a));
// }else {
// dto.setReceivablePrice(dto.getTotalTee());
// }
// return dto;
// }
public ResultBean<PagerVo<OrdOrderVo>> orderList(PagerQuery<OrdOrderQuery> pq) {
ResultBean rb=new ResultBean().fail();
OrdOrderQuery query = pq.getParams();
IPage<OrdOrder> page = PagerUtil.queryToPage(pq);
QueryWrapper<OrdOrder> qw = new QueryWrapper<>();
if (StringUtils.isBlank(query.getCustomerSid())){
return rb.setMsg("参数不全");
}
if(StringUtils.isNotBlank(query.getState())){
qw.eq("payStatus",query.getState());
}
qw.eq("userSid",query.getCustomerSid());
qw.orderByDesc("createTime");
IPage<OrdOrderVo> pagging = baseMapper.orderList(page, qw);
for (OrdOrderVo record : pagging.getRecords()) {
List<OrdOrderDetail> details=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",record.getSid()));
List<String> urls=new ArrayList<>();
for (OrdOrderDetail detail : details) {
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
urls.add(fileUploadComponent.getUrlPrefix()+lpkGoods.getPicUrl());
}
record.setCount(String.valueOf(details.size()));
record.setPicUrls(urls);
}
PagerVo<LpkStoreVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<OrdOrderVo> getOrderDetails(String sid) {
ResultBean rb=new ResultBean().fail();
OrdOrderVo pagging = baseMapper.getOrderDetails(sid);
List<OrdOrderDetail> details=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",pagging.getSid()));
if(StringUtils.isBlank(pagging.getMeet())){
pagging.setMeet(pagging.getTotalTee());
}
pagging.setSurcharge(removeZeros(String.valueOf(Double.valueOf(pagging.getTotalTee())-Double.valueOf(pagging.getMeet()))));
for (OrdOrderDetail detail : details) {
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
detail.setPicUrl(fileUploadComponent.getUrlPrefix()+lpkGoods.getPicUrl());
detail.setRemarks(removeZeros(String.valueOf(detail.getNumofPart()))+"斤/份，"+"共"+detail.getPartNumber()+"份");
}
pagging.setOrdOrderDetails(details);
SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
pagging.setEndTime(sdf1.format(DateUtil.offsetMinute(pagging.getCreateTime(),pagging.getTimeRemarks())));
if(pagging.getPayStatus()==2){
PayResult result=new PayResult();
if(details.size()>1){
result.setGoods(details.get(0).getGoodsName().toString()+"等"+(details.size()-1)+"件商品");
}else{
result.setGoods(details.get(0).getGoodsName().toString()+"商品");
}
result.setPrice(pagging.getTotalTee());
// result.setOrderId(rbData.getOutTradeNo());
result.setOrderId(pagging.getOutTradeNo());
result.setRemainder(String.valueOf(10*60));
PayUrl payUrl=new PayUrl();
payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay");
PayParams aVoid=new PayParams();
aVoid.setMainSid(pagging.getMainSid());
payUrl.setParams(aVoid);
OrderUrl orderUrl=new OrderUrl();
OrderParams orderParams=new OrderParams();
orderParams.setMainSid("");
orderUrl.setParams(orderParams);
TradeNoUrl tradeNoUrl=new TradeNoUrl();
tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery");
TradeParams tradeParams=new TradeParams();
tradeParams.setMainSid(pagging.getMainSid());
tradeNoUrl.setParams(tradeParams);
// result.setOrder_url(orderUrl);
result.setPay_url(payUrl);
result.setTrade_no_url(tradeNoUrl);
String [] a =new String []{"pay"};
result.setBus(a);
pagging.setResult(result);
}
return rb.success().setData(pagging);
}
public ResultBean changePayState(String sid) {
ResultBean rb=new ResultBean().fail();
OrdOrder order=baseMapper.selectOne(new QueryWrapper<OrdOrder>().eq("sid",sid));
order.setPayStatus(3);
baseMapper.updateById(order);
return rb.success().setData(order);
}
/**
* 去除多余.0
* @param num
* @return
*/
public static String removeZeros(String num) {
if (num.indexOf(".") > 0) {
// 去掉多余的0
num = num.replaceAll("0+?$", "");
// 如果最后一位是. 则去掉
num = num.replaceAll("[.]$", "");
}
return num;
}
}

29
src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagMapper.java Normal file
View File

@@ -0,0 +1,29 @@
package com.yxt.yythmall.biz.recommendnewuserbag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss;
import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBag;
import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Mapper
public interface RecommendNewUserBagMapper extends BaseMapper<RecommendNewUserBag> {
IPage<RecommendNewUserBagVo> giftBagListPage(IPage<RecommendNewUserBag> page, @Param(Constants.WRAPPER) QueryWrapper<RecommendNewUserBag> qw);
List<RecommendNewUserBagVo> giftBagList();
List<RecommendNewUserBagVo> giftBagGoodsList();
List<GiftBagGoodss> getGoodsByBagSid(@Param("bagSid") String bagSid);
int saveBags(@Param("bags") List<RecommendNewUserBag> bags);
}

62
src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagMapper.xml Normal file
View File

@@ -0,0 +1,62 @@
<?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.yxt.yythmall.biz.recommendnewuserbag.RecommendNewUserBagMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<insert id="saveBags" parameterType="java.util.List">
insert into lpk_giftbag(sid,createTime,`name`,dateStart,dateEnd)
values
<foreach collection="bags" item="item" index="index" separator=",">
(#{item.sid},#{item.createTime},#{item.name},#{item.dateStart},#{item.dateEnd})
</foreach>
</insert>
<select id="giftBagListPage" resultType="com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagVo">
select
sid,
`name`,
date_format(dateStart, '%Y-%m-%d') as dateStart,
date_format(dateEnd, '%Y-%m-%d') as dateEnd,
price,
iconUrl,
isEnable,
isGrounding,
isRecommend
from recommend_newuser_bag
<where>
${ew.sqlSegment}
</where>
</select>
<select id="giftBagList" resultType="com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagVo">
select
*
from recommend_newuser_bag
where isGrounding=1
order by isRecommend desc,createTime desc
</select>
<select id="giftBagGoodsList" resultType="com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagVo">
select
a.sid,
a.name ,
a.iconUrl,
a.price ,
a.preferentialPrice as prefPrice
from recommend_newuser_bag a
</select>
<select id="getGoodsByBagSid" resultType="com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss">
select
a.preferentialPrice as prefPrice,
c.name as name,
c.sid as goodsSid,
c.specificationUnit as specificationUnit,
c.unitName as unitName,
b.goodsNumber as goodsNumber,
c.weight as weight
from recommend_newuser_bag a
left join recommend_newuser_bag_details b on b.giftbagSid=a.sid
left join lpk_goods c on c.sid =b.goodsSid
where a.sid=#{bagSid}
</select>
</mapper>

79
src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagRest.java Normal file
View File

@@ -0,0 +1,79 @@
package com.yxt.yythmall.biz.recommendnewuserbag;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagDto;
import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagQuery;
import com.yxt.yythmall.api.recommendnewuserbag.RecommendNewUserBagVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Api(tags = "小程序礼包信息")
@RestController
@RequestMapping("RecommendNewUserBag")
public class RecommendNewUserBagRest {
@Autowired
RecommendNewUserBagService recommendNewUserBagService;
@ApiOperation("礼包信息列表")
@PostMapping("/giftBagListPage")
public ResultBean<PagerVo<RecommendNewUserBagVo>> giftBagListPage(@RequestBody PagerQuery<RecommendNewUserBagQuery> pq) {
return recommendNewUserBagService.giftBagListPage(pq);
}
@ApiOperation("保存修改")
@PostMapping("/saveGiftBag")
public ResultBean<String> saveGiftBag(@RequestBody RecommendNewUserBagDto dto) {
return recommendNewUserBagService.saveGiftBag(dto);
}
@ApiOperation("礼包初始化")
@GetMapping("/giftBagInit/{sid}")
public ResultBean giftBagInit(@PathVariable String sid) {
return recommendNewUserBagService.giftBagInit(sid);
}
@ApiOperation("删除礼包")
@DeleteMapping("/deleteBag/{sid}")
public ResultBean deleteBag(@PathVariable("sid") String sid) {
return recommendNewUserBagService.deleteBag(sid);
}
@ApiOperation("礼包信息列表")
@GetMapping("/giftBagList")
public ResultBean giftBagList() {
return recommendNewUserBagService.giftBagList();
}
@GetMapping("/isGrounding/{sid}/{state}")
@ApiOperation(value = "设置是否上下架")
public ResultBean isGrounding(@PathVariable("sid")String sid,@PathVariable("state") String state) {
return recommendNewUserBagService.isGrounding(sid, state);
}
@ApiOperation("小程序礼包信息列表")
@GetMapping("/recommendNewUserBagList")
public ResultBean<List<RecommendNewUserBagVo>> recommendNewUserBagList() {
return recommendNewUserBagService.recommendNewUserBagList();
}
@ApiOperation("礼包初始化")
@GetMapping("/getGiftBagBySid/{sid}")
public ResultBean getGiftBagBySid(@PathVariable String sid) {
return recommendNewUserBagService.getGiftBagBySid(sid);
}
@ApiOperation("新人专属购买礼包")
@PostMapping("/newUserQuota")
public ResultBean newUserQuota() {
return recommendNewUserBagService.newUserQuota();
}
}

302
src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagService.java Normal file
View File

@@ -0,0 +1,302 @@
package com.yxt.yythmall.biz.recommendnewuserbag;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss;
import com.yxt.yythmall.api.appletgiftbag.RecommendRecord;
import com.yxt.yythmall.api.lpkgoods.LpkGoods;
import com.yxt.yythmall.api.recommendnewuserbag.*;
import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetails;
import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
import com.yxt.yythmall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetailsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Service
public class RecommendNewUserBagService extends MybatisBaseService<RecommendNewUserBagMapper, RecommendNewUserBag> {
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private RecommendNewUserBagDetailsService recommendNewUserBagDetailsService;
@Autowired
private LpkGoodsService lpkGoodsService;
public ResultBean<PagerVo<RecommendNewUserBagVo>> giftBagListPage(PagerQuery<RecommendNewUserBagQuery> pq) {
ResultBean rb = ResultBean.fireFail();
RecommendNewUserBagQuery query = pq.getParams();
QueryWrapper<RecommendNewUserBag> qw = new QueryWrapper<>();
qw.eq("1", "1");
if (StringUtils.isNotBlank(query.getName())) {
qw.like("name", query.getName());
}
qw.orderByDesc("isRecommend");
qw.orderByDesc("createTime");
IPage<RecommendNewUserBag> page = PagerUtil.queryToPage(pq);
IPage<RecommendNewUserBagVo> pagging = baseMapper.giftBagListPage(page, qw);
PagerVo<RecommendNewUserBagVo> p = PagerUtil.pageToVo(pagging, null);
List<RecommendNewUserBagVo> records = pagging.getRecords();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (RecommendNewUserBagVo record : records) {
if (StringUtils.isNotBlank(record.getIconUrl())) {
record.setIconUrl(fileUploadComponent.getUrlPrefix() + record.getIconUrl());
}
}
}
return rb.success().setData(p);
}
@Transactional(rollbackFor = Exception.class)
public ResultBean<String> saveGiftBag(RecommendNewUserBagDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
recommendNewUserBagDetailsService.deleteGoodsByBagSid(dto.getSid());
RecommendNewUserBag RecommendNewUserBag = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, RecommendNewUserBag, "id", "sid");
RecommendNewUserBag.setCreateTime(new DateTime());
if (StringUtils.isNotBlank(dto.getIconUrl())) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = dto.getIconUrl().substring(urlPrefix.length());
RecommendNewUserBag.setIconUrl(path);
}
baseMapper.updateById(RecommendNewUserBag);
if (!dto.getGoods().isEmpty()) {
List<GiftBagGoods> goodsList = dto.getGoods();
for (GiftBagGoods goods : goodsList) {
RecommendNewUserBagDetails RecommendNewUserBagGoods = new RecommendNewUserBagDetails();
RecommendNewUserBagGoods.setCreateTime(new DateTime());
RecommendNewUserBagGoods.setGoodsSid(goods.getGoodsSid());
RecommendNewUserBagGoods.setGiftbagSid(RecommendNewUserBag.getSid());
RecommendNewUserBagGoods.setGoodsNumber(goods.getGoodsNumber());
RecommendNewUserBagGoods.setPrice(Double.valueOf(goods.getPrice()));
recommendNewUserBagDetailsService.insert(RecommendNewUserBagGoods);
}
}
} else {
RecommendNewUserBag RecommendNewUserBag = new RecommendNewUserBag();
sid = RecommendNewUserBag.getSid();
BeanUtil.copyProperties(dto, RecommendNewUserBag, "id", "sid");
RecommendNewUserBag.setCreateTime(new DateTime());
if (StringUtils.isNotBlank(dto.getIconUrl())) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = dto.getIconUrl().substring(urlPrefix.length());
RecommendNewUserBag.setIconUrl(path);
}
baseMapper.insert(RecommendNewUserBag);
if (!dto.getGoods().isEmpty()) {
List<GiftBagGoods> goodsList = dto.getGoods();
for (GiftBagGoods goods : goodsList) {
RecommendNewUserBagDetails RecommendNewUserBagGoods = new RecommendNewUserBagDetails();
RecommendNewUserBagGoods.setCreateTime(new DateTime());
RecommendNewUserBagGoods.setGoodsSid(goods.getGoodsSid());
RecommendNewUserBagGoods.setGiftbagSid(RecommendNewUserBag.getSid());
RecommendNewUserBagGoods.setGoodsNumber(goods.getGoodsNumber());
RecommendNewUserBagGoods.setPrice(Double.valueOf(goods.getPrice()));
recommendNewUserBagDetailsService.insert(RecommendNewUserBagGoods);
}
}
}
return rb.success().setData(sid);
}
public ResultBean giftBagInit(String sid) {
ResultBean rb = ResultBean.fireFail();
RecommendNewUserBagInitVo vo = new RecommendNewUserBagInitVo();
RecommendNewUserBag entity = fetchBySid(sid);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != entity) {
BeanUtil.copyProperties(entity, vo);
if (null != entity.getDateStart()) {
vo.setDateStart(sdf.format(entity.getDateStart()));
}
if (null != entity.getDateEnd()) {
vo.setDateEnd(sdf.format(entity.getDateEnd()));
}
if (StringUtils.isNotBlank(entity.getIconUrl())) {
vo.setIconUrl(fileUploadComponent.getUrlPrefix() + entity.getIconUrl());
}
List<GiftBagGoods> goods = new ArrayList<>();
List<RecommendNewUserBagDetails> records = recommendNewUserBagDetailsService.getRecordsByBagSid(sid);
if (!records.isEmpty()) {
for (RecommendNewUserBagDetails record : records) {
GiftBagGoods bagGoods = new GiftBagGoods();
if (StringUtils.isNotBlank(record.getGoodsNumber())) {
bagGoods.setGoodsNumber(record.getGoodsNumber());
}
if (StringUtils.isNotBlank(record.getGoodsSid())) {
bagGoods.setGoodsSid(record.getGoodsSid());
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(record.getGoodsSid());
if (null != lpkGoods) {
if (StringUtils.isNotBlank(lpkGoods.getName())) {
bagGoods.setName(lpkGoods.getName());
}
if (StringUtils.isNotBlank(lpkGoods.getPicUrl())) {
bagGoods.setIconUrl(lpkGoods.getPicUrl());
}
if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
bagGoods.setUnitName(lpkGoods.getUnitName());
}
if (StringUtils.isNotBlank(lpkGoods.getPrice())) {
bagGoods.setPrice(lpkGoods.getPrice());
}
bagGoods.setWeight(lpkGoods.getWeight());
bagGoods.setSpecificationUnit(lpkGoods.getSpecificationUnit());
}
}
goods.add(bagGoods);
}
}
vo.setGoods(goods);
}
return rb.success().setData(vo);
}
public ResultBean deleteBag(String sid) {
ResultBean rb = ResultBean.fireFail();
RecommendNewUserBag RecommendNewUserBag = fetchBySid(sid);
if (null != RecommendNewUserBag) {
baseMapper.deleteById(RecommendNewUserBag.getId());
recommendNewUserBagDetailsService.deleteGoodsByBagSid(sid);
}
return rb.success();
}
public ResultBean giftBagList() {
ResultBean rb = ResultBean.fireFail();
List<RecommendNewUserBagVo> pagging = baseMapper.giftBagList();
return rb.success().setData(pagging);
}
public ResultBean isGrounding(String sid,String state) {
ResultBean rb = new ResultBean().fail();
RecommendNewUserBag bag=baseMapper.selectOne(new QueryWrapper<RecommendNewUserBag>().eq("sid",sid));
bag.setIsGrounding(state);
baseMapper.updateById(bag);
return rb.success().setMsg("修改成功");
}
public int saveBags(List<RecommendNewUserBag> bags) {
return baseMapper.saveBags(bags);
}
public ResultBean<List<RecommendNewUserBagVo>> recommendNewUserBagList() {
ResultBean rb = ResultBean.fireFail();
List<RecommendNewUserBagVo> list=baseMapper.giftBagList();
list.forEach(s->{
// s.setPrice(Double.valueOf(aa(s.getPrice())));
List<com.yxt.yythmall.api.appletgiftbag.GiftBagGoods> list1=recommendNewUserBagDetailsService.getGoodsByBagSidB(s.getSid());
list1.forEach(l->{
l.setCount("共"+Integer.valueOf(l.getGoodsNumber())+l.getUnitName());
l.setSpec(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName());
});
// List<RecommendNewUserBagGoods> RecommendNewUserBagGoods=RecommendNewUserBagGoodsService.list(new QueryWrapper<RecommendNewUserBagGoods>().eq("giftbagSid",s.getSid()));
s.setCount(list1.size()+"种蔬菜");
s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl());
s.setGiftBagGoods(list1);
});
return rb.success().setData(list);
}
public ResultBean<RecommendNewUserBagDetailVo> getGiftBagBySid(String sid ) {
ResultBean rb = ResultBean.fireFail();
List<com.yxt.yythmall.api.appletgiftbag.GiftBagGoods> goodsList=recommendNewUserBagDetailsService.getGoodsByBagSidA(sid);
RecommendNewUserBagDetailVo RecommendNewUserBagVo=new RecommendNewUserBagDetailVo();
RecommendNewUserBag s= baseMapper.selectOne(new QueryWrapper<RecommendNewUserBag>().eq("sid",sid));
double i=0;
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
for(com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goods:goodsList){
// i=i+Double.valueOf(goods.getJPrice())*Double.valueOf(goods.getGoodsNumber());
i=i+Double.valueOf(goods.getJPrice())*Double.valueOf(goods.getWeight())*Double.valueOf(goods.getGoodsNumber());
goods.setIconUrl(fileUploadComponent.getUrlPrefix() +goods.getIconUrl());
goods.setTotalValue(String.valueOf(decimalFormat.format(Double.valueOf(goods.getGoodsNumber())*Double.valueOf(goods.getJPrice())*Double.valueOf(goods.getWeight()))));
// goods.setJPrice(String.valueOf(decimalFormat.format(Double.valueOf(goods.getPrice())*Double.valueOf(goods.getWeight()))));
goods.setPrice(String.valueOf(decimalFormat.format(Double.valueOf(goods.getJPrice())*Double.valueOf(goods.getWeight()))));
}
RecommendNewUserBagVo.setPrice(decimalFormat.format(i));
RecommendNewUserBagVo.setGoods(goodsList);
RecommendNewUserBagVo.setName(s.getName());
return rb.success().setData(RecommendNewUserBagVo);
}
public static String aa(double a){
BigDecimal d=new BigDecimal(a);
String c= d.setScale(2,BigDecimal.ROUND_HALF_UP).toString();
return String.valueOf(c);
}
public ResultBean recommendRecord(String sid ) {
ResultBean rb=new ResultBean().fail();
RecommendNewUserBagVo vo=new RecommendNewUserBagVo();
RecommendNewUserBag bag=baseMapper.selectOne(new QueryWrapper<RecommendNewUserBag>().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31"));
vo.setRemarks(bag.getRemarks());
vo.setIconUrl(fileUploadComponent.getUrlPrefix() +bag.getIconUrl());
RecommendRecord recommendRecord=new RecommendRecord();
recommendRecord.setContent("梧桐居助力您获得7斤白菜");
RecommendRecord recommendRecord1=new RecommendRecord();
recommendRecord1.setContent("龙助力您获得7斤白菜");
RecommendRecord recommendRecord2=new RecommendRecord();
recommendRecord2.setContent("美人助力您获得15斤土豆");
List<RecommendRecord> list=new ArrayList<>();
list.add(recommendRecord);
list.add(recommendRecord1);
list.add(recommendRecord2);
vo.setRecordList(list);
return rb.success().setData(vo);
}
public ResultBean newUserQuota() {
ResultBean rb=new ResultBean().fail();
List<RecommendNewUserBagVo> s=baseMapper.giftBagGoodsList();
for (RecommendNewUserBagVo RecommendNewUserBagVo : s) {
List<RecommendNewUserBagDetails> giftBagGoods=recommendNewUserBagDetailsService.list(new QueryWrapper<RecommendNewUserBagDetails>().eq("giftbagSid",RecommendNewUserBagVo.getSid()));
for(RecommendNewUserBagDetails goods:giftBagGoods){
LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods.getGoodsSid()));
RecommendNewUserBagVo.setWeight(removeZeros(String.valueOf(Double.valueOf(lpkGoods.getWeight())*Double.valueOf(goods.getGoodsNumber())+Double.valueOf(RecommendNewUserBagVo.getWeight()))));
}
RecommendNewUserBagVo.setIconUrl(fileUploadComponent.getUrlPrefix() +RecommendNewUserBagVo.getIconUrl());
}
return rb.success().setData(s);
}
public ResultBean<List<GiftBagGoodss>> getGoodsByBagSid(String bagSid) {
ResultBean rb=new ResultBean().fail();
List<GiftBagGoodss> s=baseMapper.getGoodsByBagSid(bagSid);
return rb.success().setData(s);
}
/**
* 去除多余.0
* @param num
* @return
*/
public static String removeZeros(String num) {
if (num.indexOf(".") > 0) {
// 去掉多余的0
num = num.replaceAll("0+?$", "");
// 如果最后一位是. 则去掉
num = num.replaceAll("[.]$", "");
}
return num;
}
}

36
src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.java Normal file
View File

@@ -0,0 +1,36 @@
package com.yxt.yythmall.biz.recommendnewuserbagdetails;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetails;
import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Mapper
public interface RecommendNewUserBagDetailsMapper extends BaseMapper<RecommendNewUserBagDetails> {
int deleteGoodsByBagSid(@Param("sid") String sid);
@Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl,goods.price,goods.unitName,goods.remarks " +
" from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<RecommendNewUserBagDetailsVo> getGoodsByBagSid(String sid);
@Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " +
" ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<GiftBagGoods> getGoodsByBagSidA(String sid);
@Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " +
" ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<GiftBagGoods> getGoodsByBagSidB(String sid);
List<RecommendNewUserBagDetails> getRecordsByBagSid(@Param("sid") String sid);
int saveBagGoods(@Param("bagGoods") List<RecommendNewUserBagDetails> bagGoods);
}

24
src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsMapper.xml Normal file
View File

@@ -0,0 +1,24 @@
<?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.yxt.yythmall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetailsMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<delete id="deleteGoodsByBagSid">
DELETE
FROM applet_giftbag_goods
WHERE giftbagSid = #{sid}
</delete>
<select id="getRecordsByBagSid" resultType="com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetails">
select *
from applet_giftbag_goods
WHERE giftbagSid = #{sid}
</select>
<insert id="saveBagGoods" parameterType="java.util.List">
insert into applet_giftbag_goods(sid,createTime,giftbagSid,goodsSid,goodsNumber)
values
<foreach collection="bagGoods" item="item" index="index" separator=",">
(#{item.sid},#{item.createTime},#{item.giftbagSid},#{item.goodsSid},#{item.goodsNumber})
</foreach>
</insert>
</mapper>

24
src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsRest.java Normal file
View File

@@ -0,0 +1,24 @@
package com.yxt.yythmall.biz.recommendnewuserbagdetails;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Api(tags = "礼包包含商品信息")
@RestController
@RequestMapping("recobagdetails")
public class RecommendNewUserBagDetailsRest {
@Autowired
RecommendNewUserBagDetailsService recommendNewUserBagDetailsService;
}

40
src/main/java/com/yxt/yythmall/biz/recommendnewuserbagdetails/RecommendNewUserBagDetailsService.java Normal file
View File

@@ -0,0 +1,40 @@
package com.yxt.yythmall.biz.recommendnewuserbagdetails;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetails;
import com.yxt.yythmall.api.recommendnewuserbagdetails.RecommendNewUserBagDetailsVo;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author wangpengfei
* @date 2023/11/21 15:03
*/
@Service
public class RecommendNewUserBagDetailsService extends MybatisBaseService<RecommendNewUserBagDetailsMapper, RecommendNewUserBagDetails> {
public int deleteGoodsByBagSid(String sid) {
return baseMapper.deleteGoodsByBagSid(sid);
}
public List<RecommendNewUserBagDetails> getRecordsByBagSid(String sid) {
return baseMapper.getRecordsByBagSid(sid);
}
public List<RecommendNewUserBagDetailsVo> getGoodsByBagSid(String sid) {
return baseMapper.getGoodsByBagSid(sid);
}
public List<GiftBagGoods> getGoodsByBagSidA(String sid) {
return baseMapper.getGoodsByBagSidA(sid);
}
public List<GiftBagGoods> getGoodsByBagSidB(String sid) {
return baseMapper.getGoodsByBagSidB(sid);
}
public int saveBagGoods(List<RecommendNewUserBagDetails> bagGoods) {
return baseMapper.saveBagGoods(bagGoods);
}
}

2
src/main/java/com/yxt/yythmall/biz/vegecallerreservedetail/VegeCellarReserveDetailsRest.java
View File

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api(tags = "预约订单信息")
@RestController
@RequestMapping("lpksreservoordersss")
@RequestMapping("vegecellarreservedetails")
public class VegeCellarReserveDetailsRest {
@Autowired
VegeCellarReserveDetailsService vegeCellarReserveOrderService;

3
src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
View File

@@ -76,6 +76,9 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",ordOrder.getUserSid()));
customer.setIsPurchase("0");
lpkCustomerService.updateById(customer);
ordOrder.setPayStatus(4);
ordOrder.setPayTime(new Date());
ordOrderService.updateById(ordOrder);
return rb.success().setMsg("成功");
}
@Transactional(rollbackFor = Exception.class)

3
src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java
View File

@@ -37,6 +37,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
.excludePathPatterns("/lpksreservoorder/exportExcelByStore")
.excludePathPatterns("/empsreservoorder/createNewUserBagOrder")
.excludePathPatterns("/lpksreservoorders/submission")
.excludePathPatterns("/empsreservoorder/ordersList")
.excludePathPatterns("/empsreservoorder/submission")
.excludePathPatterns("/empsreservoorder/submissionEmp")
.excludePathPatterns("/empcardgift/generateCard")
@@ -47,6 +48,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
.excludePathPatterns("/lpksreservoorder/orderDetails/**")
.excludePathPatterns("/transferrecords/transferRecordsList")
.excludePathPatterns("/empsreservoorder/createVegeOrder")
.excludePathPatterns("/empsreservoorder/OrderDetails/**")
.excludePathPatterns("/empsreservoorder/changePayState/**")
.excludePathPatterns("/lpkgoods/goodsDetails/**")
.excludePathPatterns("/lpkstore/getAllStoreByQuery")
.excludePathPatterns("/vegetablecellar/receiveTransferGoods")