czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

全局跨域处理

Browse Source 
字典isChild 回显
字典标签回显
This commit is contained in:
wangw
2024-04-08 17:51:10 +08:00
parent 7bb156628b
commit d2550475b4
6 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/config/CorsFilter.java
View File

@@ -28,7 +28,7 @@ public class CorsFilter implements Filter {
response.setHeader("Access-Control-Allow-Origin", curOrigin == null ? "true" : curOrigin);
response.setHeader("Access-Control-Allow-Methods", "*");
response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Headers", "x-requested-with,signature");
response.setHeader("Access-Control-Allow-Headers", "environment,type,version,token");
response.setHeader("Access-Control-Allow-Credentials", "true");
chain.doFilter(req, resp);
}

5
src/main/java/com/chaozhanggui/system/cashierservice/dao/TbMerchantCouponMapper.java
View File

@@ -1,8 +1,11 @@
package com.chaozhanggui.system.cashierservice.dao;
import com.chaozhanggui.system.cashierservice.entity.TbMerchantCoupon;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Component;
import java.util.List;
/**
@@ -11,6 +14,8 @@ import java.util.List;
* @author lyf
* @since 2024-04-02 09:24:16
*/
@Component
@Mapper
public interface TbMerchantCouponMapper {
/**

9
src/main/java/com/chaozhanggui/system/cashierservice/entity/SysDict.java
View File

@@ -5,6 +5,7 @@ import java.util.Date;
public class SysDict implements Serializable {
private Long dictId;
private String dictName;
private String name;
@@ -22,6 +23,14 @@ public class SysDict implements Serializable {
private static final long serialVersionUID = 1L;
public String getDictName() {
return dictName;
}
public void setDictName(String dictName) {
this.dictName = dictName;
}
public Integer getIsChild() {
return isChild;
}

15
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/DicDetailVO.java
View File

@@ -9,18 +9,27 @@ import java.util.List;
*/
public class DicDetailVO {
private String name;
private String dictName;
private String description;
private List<SysDictDetail> detail;
private Integer isChild;
private Boolean isChild;
public Integer getIsChild() {
public String getDictName() {
return dictName;
}
public void setDictName(String dictName) {
this.dictName = dictName;
}
public Boolean getIsChild() {
return isChild;
}
public void setIsChild(Integer isChild) {
public void setIsChild(Boolean isChild) {
this.isChild = isChild;
}

33
src/main/java/com/chaozhanggui/system/cashierservice/service/HomePageService.java
View File

@@ -41,11 +41,11 @@ public class HomePageService {
private TagProductDeptsMapper tagProductDeptsMapper;
public Result homePage(HomeDto homeDto,String environmen) throws ExecutionException, InterruptedException {
public Result homePage(HomeDto homeDto, String environmen) throws ExecutionException, InterruptedException {
int beginNo;
if(homeDto.getPage() <=0){
if (homeDto.getPage() <= 0) {
beginNo = 0;
}else{
} else {
beginNo = (homeDto.getPage() - 1) * homeDto.getSize();
}
//优惠卷
@@ -71,7 +71,7 @@ public class HomePageService {
//组装
List<HomeVO> homeVOList = new ArrayList<>();
for (TbMerchantCoupon o :tbMerchantCoupons) {
for (TbMerchantCoupon o : tbMerchantCoupons) {
HomeVO homeVO = new HomeVO();
homeVO.setDiscount(o.getRatio());
for (TbShopInfo tbShopInfo : shopInfo.get()) {
@@ -82,17 +82,17 @@ public class HomePageService {
homeVO.setShopTag(tbPlatformDict == null?"":tbPlatformDict.getName());
}
}
for (TbProduct tbProduct :product.get()) {
for (TbProduct tbProduct : product.get()) {
if (o.getRelationIds().equals(tbProduct.getId().toString())) {
homeVO.setProductName(tbProduct.getName());
homeVO.setImage(tbProduct.getCoverImg());
homeVO.setId(tbProduct.getId());
}
}
for (TbProductSku tbProductSku :productSku.get()) {
for (TbProductSku tbProductSku : productSku.get()) {
if (o.getRelationIds().equals(tbProductSku.getProductId())) {
homeVO.setOriginPrice(tbProductSku.getSalePrice());
homeVO.setRealSalesNumber(tbProductSku.getRealSalesNumber() == null?BigDecimal.ZERO: new BigDecimal(tbProductSku.getRealSalesNumber()));
homeVO.setRealSalesNumber(tbProductSku.getRealSalesNumber() == null ? BigDecimal.ZERO : new BigDecimal(tbProductSku.getRealSalesNumber()));
Float discount = homeVO.getDiscount();
BigDecimal discountDecimal = new BigDecimal(discount);
homeVO.setSalePrice(tbProductSku.getSalePrice().multiply((discountDecimal.multiply(new BigDecimal("0.1")))));
@@ -108,26 +108,27 @@ public class HomePageService {
homeVOList.add(homeVO);
}
return Result.success(CodeEnum.SUCCESS,homeVOList);
return Result.success(CodeEnum.SUCCESS, homeVOList);
}
public Result homePageUp(String environment){
public Result homePageUp(String environment) {
HomeUpVO homeUpVO = new HomeUpVO();
//轮播图
List<TbPlatformDict> carouselList = platformDictMapper.queryAllByType("carousel",environment);
List<TbPlatformDict> carouselList = platformDictMapper.queryAllByType("carousel", environment);
homeUpVO.setCarousel(carouselList);
//金刚区
List<TbPlatformDict> districtList = platformDictMapper.queryAllByType("homeDistrict",environment);
List<TbPlatformDict> districtList = platformDictMapper.queryAllByType("homeDistrict", environment);
homeUpVO.setDistrict(districtList);
//菜单
List<SysDict> sysDicts = sysDictDetailMapper.selectByAll();
List<DicDetailVO> dicDetailVO = new ArrayList<>();
for (SysDict sysDictsList : sysDicts) {
DicDetailVO dicDetailVOList = new DicDetailVO();
dicDetailVOList.setDictName(sysDictsList.getDictName());
dicDetailVOList.setName(sysDictsList.getName());
dicDetailVOList.setDescription(sysDictsList.getDescription());
dicDetailVOList.setDetail(sysDictDetailMapper.selectByDictId(sysDictsList.getDictId()));
dicDetailVOList.setIsChild(sysDictsList.getIsChild());
dicDetailVOList.setIsChild((sysDictsList.getIsChild() == null || sysDictsList.getIsChild() == 0) ? false : true);
dicDetailVO.add(dicDetailVOList);
}
homeUpVO.setMenu(dicDetailVO);
@@ -137,10 +138,10 @@ public class HomePageService {
List<HomeVO> homeVOs = productSkuMapper.selectSale();
for (HomeVO o : homeVOs) {
BigDecimal originPrice = o.getOriginPrice();
if (originPrice.compareTo(BigDecimal.ZERO)!= 0){
BigDecimal multiply = o.getSalePrice().divide(o.getOriginPrice(),2,RoundingMode.DOWN).multiply(BigDecimal.TEN);
if (originPrice.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal multiply = o.getSalePrice().divide(o.getOriginPrice(), 2, RoundingMode.DOWN).multiply(BigDecimal.TEN);
o.setDiscount(multiply.floatValue());
}else {
} else {
o.setDiscount(null);
}
}
@@ -155,7 +156,7 @@ public class HomePageService {
TodayRankingVO todayRankingVO = new TodayRankingVO();
todayRankingVO.setTodayList(homeVODay);
homeUpVO.setTodayList(todayRankingVO);
return Result.success(CodeEnum.SUCCESS,homeUpVO);
return Result.success(CodeEnum.SUCCESS, homeUpVO);
}

2
src/main/java/com/chaozhanggui/system/cashierservice/util/LocationUtils.java
View File

@@ -13,7 +13,7 @@ public class LocationUtils {
//超掌柜生活-用户端
param.put("key","7a7f2e4790ea222660a027352ee3af39");
param.put("keywords",keywords);
param.put("subdistrict","1");
param.put("subdistrict","2");
param.put("extensions","base");
String s = HttpClientUtil.doGet("https://restapi.amap.com/v3/config/district", param);
return s;