diff --git a/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java b/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java index 4fce622a..172699e4 100644 --- a/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java +++ b/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java @@ -24,4 +24,10 @@ public class DevEnvironmentConfig { } return devEnv; } + + /** + * 开启账套 + */ + public final static boolean OPEN_TENANT_BOOK = true; + } diff --git a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java index 214e601a..6ba7829c 100644 --- a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java +++ b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java @@ -286,23 +286,7 @@ public class AsyncFactory { String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); if(summeryResult.equals(TbsCostApplyOperationServiceImpl.SummeryState_Success)){ - DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); - // TbsAffairCommitBo.state 0-否定,1-同意,2-退回 - Integer state = commitService.getState(verificationOperationService.getTemplateCode(),verificationId+""); - VtbVerificationApplication verificationApplication = SpringUtils.getBean(VtbVerificationApplication.class); - if(state.equals(1)){ - //调用成功回调方法 - verificationApplication.finishCallBack(verification, totalAmount); - }else if(state.equals(2)){ - verificationApplication.backCommitAndStop(verification,true); - }else if(state.equals(0)){ - verificationApplication.backCommitAndStop(verification,false); - }else { - return; - } - if(realaseFlag){ - vtbVerificationService.release(verification.getActivityId(),userCode,false); - } + verificationOperationService.runCompensate(verificationId+""); } diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index bf64ca58..fe206c89 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -30,6 +30,8 @@ import com.qs.serve.modules.his.service.HisUserChannelPointService; import com.qs.serve.modules.oss.service.OssService; import com.qs.serve.modules.tbs.entity.TbsActivityChannel; import com.qs.serve.modules.tbs.entity.TbsCostApply; +import com.qs.serve.modules.tbs.entity.TbsCostBirLog; +import com.qs.serve.modules.tbs.mapper.TbsCostBirLogMapper; import com.qs.serve.modules.tbs.service.TbsActivityChannelService; import com.qs.serve.modules.tbs.service.TbsCostApplyService; import lombok.AllArgsConstructor; @@ -41,10 +43,7 @@ import javax.validation.Valid; import java.io.*; import java.text.SimpleDateFormat; import java.time.LocalDate; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -63,6 +62,7 @@ public class BirActivityCenterGoodsController { private BirActivityCenterGoodsService centerGoodsService; private TbsCostApplyService tbsCostApplyService; private ProjectProperties projectProperties; + private TbsCostBirLogMapper tbsCostBirLogMapper; @GetMapping("/toSyncBir") public R syncBir(Long costId){ @@ -74,6 +74,18 @@ public class BirActivityCenterGoodsController { return R.ok(); } + + + @GetMapping("/toSyncBirEcro") + public R toSyncBirEcro(){ + List costIds = tbsCostBirLogMapper.listCostIds(); + if(CollectionUtil.isNotEmpty(costIds)){ + centerGoodsService.rebuildBir(costIds); + tbsCostBirLogMapper.delete(new LambdaQueryWrapper().in(TbsCostBirLog::getCostId,costIds)); + } + return R.ok(); + } + @GetMapping("/toSyncDev") public R syncBir(Integer idType){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java b/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java new file mode 100644 index 00000000..4042d449 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java @@ -0,0 +1,59 @@ +package com.qs.serve.modules.bms.common; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.framework.redis.RedisService; +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.common.util.JsonUtil; +import com.qs.serve.common.util.SpringUtils; +import com.qs.serve.modules.bms.entity.BmsAccount; +import com.qs.serve.modules.bms.entity.BmsAccountUser; +import com.qs.serve.modules.bms.mapper.BmsAccountUserMapper; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author YenHex + * @since 2024/4/18 + */ +public class BookAccountUtil { + + public static final String USER_CACHE_BOOK_PREFIX = ""; + + public static List getCurrentUserAccount(){ + String userId = AuthContextUtils.getSysUserId(); + BmsAccountUserMapper mapper = SpringUtils.getBean(BmsAccountUserMapper.class); + List bookAccList = mapper.selectList(new LambdaQueryWrapper() + .eq(BmsAccountUser::getUserId,userId)).stream().map(BmsAccountUser::getBookCode).collect(Collectors.toList()); + if(CollUtil.isEmpty(bookAccList)){ + bookAccList = new ArrayList<>(); + bookAccList.add("0"); + } + return bookAccList; +// String userId = AuthContextUtils.getSysUserId(); +// RedisService redisService = SpringUtils.getBean(RedisService.class); +// String json = redisService.getString(USER_CACHE_BOOK_PREFIX+userId); +// if(json==null){ +// List bookAccList = new ArrayList<>(); +// bookAccList.add("-999"); +// return bookAccList; +// } +// return JsonUtil.jsonToList(json,String.class); + } + +// public static void setCache(String userId){ +// RedisService redisService = SpringUtils.getBean(RedisService.class); +// BmsAccountUserMapper mapper = SpringUtils.getBean(BmsAccountUserMapper.class); +// List bookAccList = mapper.selectList(new LambdaQueryWrapper() +// .eq(BmsAccountUser::getUserId,userId)).stream().map(BmsAccountUser::getBookCode).collect(Collectors.toList()); +// if(CollUtil.isEmpty(bookAccList)){ +// bookAccList = new ArrayList<>(); +// bookAccList.add("-999"); +// } +// String json = JsonUtil.objectToJson(bookAccList); +// redisService.set(USER_CACHE_BOOK_PREFIX+userId,json); +// } + +} diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 8f391913..3409f042 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -2,12 +2,14 @@ package com.qs.serve.modules.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; +import com.qs.serve.modules.bms.common.BookAccountUtil; import com.qs.serve.modules.goods.entity.GoodsSpu; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryBo; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryLevelBo; @@ -130,6 +132,10 @@ public class GoodsCategoryController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); //param.setEnable(1); + if(DevEnvironmentConfig.OPEN_TENANT_BOOK){ + lqw.in(GoodsCategory::getBookBelong,BookAccountUtil.getCurrentUserAccount()); + } + if(CollectionUtil.isNotEmpty(param.getSelectIds())){ lqw.in(GoodsCategory::getId,param.getSelectIds()); } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java index 0c6ab76e..62f87127 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -9,6 +10,7 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.common.BookAccountUtil; import com.qs.serve.modules.goods.entity.bo.GoodsCustomerPriceBo; import com.qs.serve.modules.goods.entity.bo.GoodsCustomerPriceSingleBo; import lombok.AllArgsConstructor; @@ -57,9 +59,11 @@ public class GoodsCustomerPriceController { */ @GetMapping("/page") public R> getPage(GoodsCustomerPrice param){ - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + if(DevEnvironmentConfig.OPEN_TENANT_BOOK){ + param.setBookCodeList(BookAccountUtil.getCurrentUserAccount()); + } PageUtil.startPage(); - List list = goodsCustomerPriceService.list(lqw); + List list = goodsCustomerPriceService.selectGoodsCustomerPriceList(param); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java index 9f49b3b5..1bacfa01 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.goods.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -10,6 +11,7 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.common.BookAccountUtil; import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue; import com.qs.serve.modules.goods.entity.GoodsSpu; import com.qs.serve.modules.goods.entity.bo.GoodsSkuBo; @@ -91,6 +93,9 @@ public class GoodsSkuController { */ @GetMapping("/page") public R> getPage(GoodsSku param, HttpServletRequest request){ + if(DevEnvironmentConfig.OPEN_TENANT_BOOK){ + param.setBookCodeList(BookAccountUtil.getCurrentUserAccount()); + } PageUtil.startPage(); String spuName = request.getParameter("name"); diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 2a0ebc8a..3cd4e9fe 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -3,12 +3,14 @@ package com.qs.serve.modules.goods.controller; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; +import com.qs.serve.modules.bms.common.BookAccountUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper; @@ -143,6 +145,10 @@ public class GoodsSpuController { //产品规则设置 this.tiSetSpuParam2(param, supplier); + if(DevEnvironmentConfig.OPEN_TENANT_BOOK){ + param.setBookCodeList(BookAccountUtil.getCurrentUserAccount()); + } + Long total = goodsSpuService.selectCountSkuJoinSpuList(param); if(total<1){ return R.byEmptyList(); @@ -401,6 +407,11 @@ public class GoodsSpuController { @GetMapping("/page") @PreAuthorize("hasRole('goods:spu:query')") public R> getPage(GoodsSpu param){ + + if(DevEnvironmentConfig.OPEN_TENANT_BOOK){ + param.setBookCodeList(BookAccountUtil.getCurrentUserAccount()); + } + PageUtil.startPage(); List list = goodsSpuService.selectSpuList(param); // for (GoodsSpu goodsSpu : list) { @@ -548,8 +559,8 @@ public class GoodsSpuController { for (GoodsSpuImportBo.SpuItem item : param.getSpuList()) { spuCodes.add(item.getSpuCode()); //删除只需要spu编码 - if(StringUtils.hasText(item.getCategoryName())&&!item.getOpt().equals(DELETE)){ - cateNames.add(item.getCategoryName()); + if(StringUtils.hasText(item.getCategoryCode())&&!item.getOpt().equals(DELETE)){ + cateNames.add(item.getCategoryCode()); } } if(spuCodes.size()<1){ @@ -574,16 +585,16 @@ public class GoodsSpuController { } spuCodes.add(item.getSpuCode()); //更新或者保存,需要校验类目名称 - if(StringUtils.hasText(item.getCategoryName())&&!item.getOpt().equals(DELETE)){ + if(StringUtils.hasText(item.getCategoryCode())&&!item.getOpt().equals(DELETE)){ if(cateList==null){ isError = true; - item.setErrMsg("["+item.getCategoryName()+"]类目不存在"); + item.setErrMsg("["+item.getCategoryCode()+"]类目不存在"); }else { - String cateName = item.getCategoryName(); + String cateName = item.getCategoryCode(); boolean existCate = cateList.stream().anyMatch(a->a.getName().equals(cateName)); if(!existCate){ isError = true; - item.setErrMsg("["+item.getCategoryName()+"]类目不存在"); + item.setErrMsg("["+item.getCategoryCode()+"]类目不存在"); } } } @@ -675,7 +686,7 @@ public class GoodsSpuController { private void toSetSpuCate(List cateList, GoodsSpuImportBo.SpuItem spuItem, GoodsSpu spu) { if(cateList !=null){ for (GoodsCategory category : cateList) { - if(category.getName().equals(spuItem.getCategoryName())){ + if(category.getCode().equals(spuItem.getCategoryCode())){ String[] cateIds = category.getLevelPath().split("_"); if(cateIds.length==3){ spu.setCategoryFirst(cateIds[0]); diff --git a/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java b/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java index 7d12af4d..ac70e721 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.goods.controller.api; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -11,6 +12,7 @@ import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.TreeUtil; +import com.qs.serve.modules.bms.common.BookAccountUtil; import com.qs.serve.modules.goods.entity.GoodsCategory; import com.qs.serve.modules.goods.entity.bo.GoodsCategoryTreeVo; import com.qs.serve.modules.goods.service.GoodsCategoryService; @@ -44,6 +46,9 @@ public class GoodsCategoryApi { @GetMapping("/tree") public R> getTree(){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + if(DevEnvironmentConfig.OPEN_TENANT_BOOK){ + lqw.in(GoodsCategory::getBookBelong, BookAccountUtil.getCurrentUserAccount()); + } lqw.eq(GoodsCategory::getEnable,1); List list = goodsCategoryService.list(lqw); List treeVoList = list.stream().map(cate->{ diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCustomerPrice.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCustomerPrice.java index 4f2094a3..681e1a70 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCustomerPrice.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCustomerPrice.java @@ -4,6 +4,7 @@ import java.time.LocalDate; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; @@ -114,5 +115,17 @@ public class GoodsCustomerPrice implements Serializable { @JsonProperty private Boolean delFlag; + /** 账套编码 */ + @TableField(exist = false) + private String bookBelong; + + /** 账套名称 */ + @TableField(exist = false) + private String bookName; + + /** 账套编码列表 */ + @TableField(exist = false) + private List bookCodeList; + } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 54e3c487..d2cd63fe 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -161,6 +161,10 @@ public class GoodsSku implements Serializable { @TableField(exist = false) private Integer querySpuShelf; + /** 账套编码列表 */ + @TableField(exist = false) + private List bookCodeList; + /** 规格值信息 */ @TableField(exist = false) private List specValueList; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index 0161fec3..1279a63f 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -160,6 +160,10 @@ public class GoodsSpu implements Serializable { @TableField(exist = false) private String cateThirdLabel; + /** 账套编码列表 */ + @TableField(exist = false) + private List bookCodeList; + /** 搜索值,搜索sku标题及编码 */ @TableField(exist = false) private String searchValue; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java index be71a22d..517752c3 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java @@ -45,7 +45,10 @@ public class GoodsSpuImportBo { private Integer spuCunhuoFlag; /** 分类名称 */ - private String categoryName; + private String categoryCode; + + /** 分类名称 */ + //private String categoryName; private String errMsg; } diff --git a/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCustomerPriceMapper.java b/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCustomerPriceMapper.java index 46bff20e..c23e2914 100644 --- a/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCustomerPriceMapper.java +++ b/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCustomerPriceMapper.java @@ -2,6 +2,9 @@ package com.qs.serve.modules.goods.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.goods.entity.GoodsCustomerPrice; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 客户价格关系表 Mapper @@ -10,5 +13,7 @@ import com.qs.serve.modules.goods.entity.GoodsCustomerPrice; */ public interface GoodsCustomerPriceMapper extends BaseMapper { + List selectGoodsCustomerPriceList(@Param("query") GoodsCustomerPrice query); + } diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsCustomerPriceService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsCustomerPriceService.java index 3fb15ea1..3220663c 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsCustomerPriceService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsCustomerPriceService.java @@ -16,6 +16,7 @@ import java.util.List; */ public interface GoodsCustomerPriceService extends IService { + List selectGoodsCustomerPriceList(GoodsCustomerPrice query); void saveBatch(GoodsCustomerPriceBo param); diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java index f0ebb1b2..40fac3e1 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java @@ -37,6 +37,11 @@ public class GoodsCustomerPriceServiceImpl extends ServiceImpl selectGoodsCustomerPriceList(GoodsCustomerPrice query) { + return super.baseMapper.selectGoodsCustomerPriceList(query); + } + @Override public void saveBatch(GoodsCustomerPriceBo param) { BmsSupplier supplier = bmsSupplierMapper.selectById(param.getSupplierId()); diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java index 2027c286..3b77d143 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java @@ -263,7 +263,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl im } //拓展spu - GoodsSpu goodsSpu = goodsSpuMapper.selectById(goodsSku.getId()); + GoodsSpu goodsSpu = goodsSpuMapper.selectById(goodsSku.getSpuId()); if(goodsSpu==null){ Assert.throwEx("商品SKU不存在"); } diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java index ef9b53a9..bfe25914 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java @@ -42,6 +42,8 @@ public class OmsOrder implements Serializable { /** 订单类型:0->普通订单;1->赠品;2->试吃品 */ private Integer orderType; + private String orderSource; + /** 供应商ID */ @NotNull(message = "供应商ID不能为空") private Long supplierId; diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderBo.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderBo.java index 286c75e7..653b444f 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderBo.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderBo.java @@ -15,6 +15,8 @@ public class OmsOrderBo { @NotNull private Integer orderType; + private String orderSource; + /** 立即购买或非普通订单 */ private Long skuId; diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java index e6ad3062..388ca32a 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java @@ -21,6 +21,8 @@ public class OmsOrderModifyParam { @TableId(type = IdType.AUTO) private Long id; + private String orderSource; + /** 订单类型:0->普通订单;1->赠品;2->试吃品 */ private Integer orderType; diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java index 7f05ba6c..416a0344 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java @@ -17,6 +17,8 @@ public class OmsOrderSkuBo { @NotNull private Integer orderType; + private String orderSource; + /** SKU下单列表 */ private List spuParamList; diff --git a/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java b/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java index 356f264a..6eedd994 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/vo/OmsConfirmOrderResult.java @@ -24,6 +24,8 @@ public class OmsConfirmOrderResult { private Integer orderType; + private String orderSource; + /** 品牌规则ID */ private Long brandRuleId; diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index d8cf8fca..3c6e1433 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -127,6 +127,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im OmsConfirmOrderResult confirmOrderResult = new OmsConfirmOrderResult(); confirmOrderResult.setSupplier(supplier); confirmOrderResult.setOrderType(confirmOrder.getOrderType()); + confirmOrderResult.setOrderSource(confirmOrder.getOrderSource()); confirmOrderResult.setShoppingCarts(shoppingCarts); confirmOrderResult.setDefaultAddress(supplierAddress); confirmOrderResult.setAmountInfo(calcAmount); @@ -232,6 +233,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im } order.setId(param.getId()); order.setOrderType(param.getOrderType()); + order.setOrderSource(param.getOrderSource()); order.setSupplierAddrId(param.getSupplierAddrId()); GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(param.getBrandRuleId()); order.setBrandRuleId(param.getBrandRuleId()); @@ -427,6 +429,7 @@ public class OmsOrderServiceImpl extends ServiceImpl im public OmsOrder createOrderPc(OmsOrderSkuBo omsOrderBo) { OmsConfirmOrderResult confirmOrder = this.confirmOrderPc(omsOrderBo); confirmOrder.setLatitudeFrom("SPU"); + confirmOrder.setOrderSource(omsOrderBo.getOrderSource()); CreateOrderParam createOrderParam = omsOrderBo.getCreateOrderParam(); OmsOrder order = this.buildOmsOrder(confirmOrder, createOrderParam); if(omsOrderBo.getInstantFlag()!=null&&omsOrderBo.getInstantFlag().equals(1)){ diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index f4b52598..68b1274b 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -66,17 +66,17 @@ public class SysDeleteLogServiceImpl extends ServiceImpl { + @Select("SELECT cost_id FROM `tbs_cost_bir_log` where del_flag = 0 and cost_id is not null GROUP BY cost_id") + List listCostIds(); + } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index 5e558568..a3d0355b 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -2,11 +2,9 @@ package com.qs.serve.modules.vtb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.model.dto.R; -import com.qs.serve.common.util.Assert; -import com.qs.serve.common.util.CollectionUtil; -import com.qs.serve.common.util.SpringUtils; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.seeyon.service.SeeYonOperationService; +import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; @@ -22,6 +20,7 @@ import com.qs.serve.modules.vtb.entity.VtbFundFlow; import com.qs.serve.modules.vtb.entity.VtbVerification; import com.qs.serve.modules.vtb.entity.VtbVerificationSubject; import com.qs.serve.modules.vtb.entity.VtbVerificationYard; +import com.qs.serve.modules.vtb.entity.dto.XltDelVerificationDto; import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper; import com.qs.serve.modules.vtb.service.VtbFundFlowService; import com.qs.serve.modules.vtb.service.VtbVerificationService; @@ -115,6 +114,18 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi //移除错误的数据 vtbFundFlowService.remove(new LambdaQueryWrapper().eq(VtbFundFlow::getVerificationId,targetId)); vtbFundFlowService.flushActivityAmount(verification.getActivityId()); + + String host = "http://59.37.164.96:2506/action/cms/cost/deletion"; + //TODO 请求伟成接口,删除 XLT_BIFyDbf + XltDelVerificationDto delVerificationDto = new XltDelVerificationDto( + verification.getUserCode(), + null, + verification.getVerificationCode() + ); + String requestBody = JsonUtil.objectToJson(delVerificationDto); + String response = HttpUtil.doPost(host,requestBody,null); + log.info("请求伟成接口,删除 XLT_BIFyDbf:{}",response); + } return null; } diff --git a/src/main/resources/mapper/goods/GoodsCustomerPriceMapper.xml b/src/main/resources/mapper/goods/GoodsCustomerPriceMapper.xml new file mode 100644 index 00000000..e9ec065c --- /dev/null +++ b/src/main/resources/mapper/goods/GoodsCustomerPriceMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + goods_customer_price.`id`, + goods_customer_price.`supplier_id`, + goods_customer_price.`supplier_code`, + goods_customer_price.`supplier_name`, + goods_customer_price.`sku_code`, + goods_customer_price.`sku_id`, + goods_customer_price.`sku_name`, + goods_customer_price.`sku_unit`, + goods_customer_price.`init_price`, + goods_customer_price.`real_price`, + goods_customer_price.`maker`, + goods_customer_price.`maker_code`, + goods_customer_price.`mark_time` + + + + diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index 9bd1cffe..bfe95b00 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -201,6 +201,12 @@ and `cate2`.`name` like concat('%',#{query.categoryName},'%') and `cate3`.`name` like concat('%',#{query.seriesName},'%') + + and `goods_spu`.`book_belong` in + + #{selectId} + + ORDER BY `goods_sku`.`create_time` DESC diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index 5aa9b11a..b9710c8c 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -188,6 +188,14 @@ and (`goods_spu`.`special_sku_id` is null or `goods_spu`.`special_sku_id` = '0') --> and (`goods_spu`.`name` like concat('%',#{query.searchValue},'%') or `goods_spu`.`goods_spu` like concat('%',#{query.searchValue},'%')) + + + and `goods_spu`.`book_belong` in + + #{selectId} + + + and `goods_spu`.`id` in