diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java index d97fde30..5ce0cbf9 100644 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java +++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java @@ -2,9 +2,7 @@ package com.hzs.sale.order; import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.ext.CuMemberAccountExt; -import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.sale.order.dto.*; @@ -75,15 +73,6 @@ public interface ISaOrderServiceApi { **/ R> selfAddressOrderList(String orderCode, Integer editType, Long memberId, Integer pkCountry); - /** - * 批量保存订单 - * - * @param orderList 订单列表（需要pk_id） - * @param orderItemsList 订单明细列表 - * @return - */ - R saveOrderBatch(List orderList, List orderItemsList); - /** * 查询注册订单数量 * diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java index 812d925a..f7c49e83 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java @@ -2,11 +2,8 @@ package com.hzs.system.base; import com.hzs.common.core.domain.R; import com.hzs.common.domain.system.base.BdStorehouse; -import com.hzs.common.domain.system.base.ext.BdCubasdocExt; -import com.hzs.common.domain.system.sys.SysCorp; import com.hzs.system.base.dto.CurrencyDTO; -import java.util.Collection; import java.util.List; import java.util.Set; @@ -45,19 +42,6 @@ public interface ICurrencyServiceApi { */ R queryBdStorehouseByProvince(Integer province, Integer... type); - /** - * 根据省查询对应的发货仓库 - */ - R queryBdStorehouseById(Integer pkId); - - /** - * 根据省查询对应的发货仓库 - * - * @param provinceList 省列表 - * @return - */ - R> queryBdStorehouseMapByProvince(Collection provinceList); - /** * 根据id 查询所属历史币种 * @@ -70,23 +54,4 @@ public interface ICurrencyServiceApi { */ R> findAll(); - /** - * 提供查询供应商的dubbo调用 - */ - R queryBdCubasdocById(Integer pkId, Integer pkCountry); - - /** - * 提供查询供应商的dubbo调用 - */ - R queryBdCustomerById(Integer pkId, Integer pkCountry); - - /** - * 提供查询采购组织的dubbo调用 - */ - R querySysCorp(Integer pkId, Integer pkCountry); - - /** - * 根据仓库主键查询仓库 - */ - R> queryStorehouseByIds(Set storehouseIdSet, Integer pkCountry, Integer pkCorp); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 8db2214b..9068ad14 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -283,6 +283,19 @@ public interface CuMemberMapper extends BaseMapper { @Param("checkEmpty") Boolean checkEmpty, @Param("excludeMemberEmpty") Long excludeMemberEmpty); + + /** + * 校验会员编号是否存在 + * + * @param phoneList 会员联系方式列表 + * @param checkEmpty 是否需要校验批量空单数据 + * @param excludeMemberEmpty 排除的批次 + * @return + */ + List checkMemberPhoneExist(@Param("phoneList") Collection phoneList, + @Param("checkEmpty") Boolean checkEmpty, + @Param("excludeMemberEmpty") Long excludeMemberEmpty); + /** * 查询全部用户 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 87434cc1..f990bd61 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -488,6 +488,16 @@ public interface ICuMemberService extends IService { */ Map checkMemberCodeExist(Collection codeList, Boolean checkEmpty, Long excludeMemberEmpty); + /** + * 校验会员联系方式是否存在 + * + * @param phoneList 会员联系方式列表 + * @param checkEmpty 是否需要校验批量空单数据 + * @param excludeMemberEmpty 排除的批次 + * @return + */ + Map checkMemberPhoneExist(Collection phoneList, Boolean checkEmpty, Long excludeMemberEmpty); + /** * 查询全部用户 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index b8a529e5..dc2388ee 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -30,7 +30,6 @@ import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.wares.BdWaresAuthority; import com.hzs.common.domain.system.config.BdAwards; -import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdTradeWhiteConfig; import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; @@ -77,7 +76,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -2506,6 +2504,19 @@ public class CuMemberServiceImpl extends ServiceImpl i return resultMap; } + @Override + public Map checkMemberPhoneExist(Collection phoneList, Boolean checkEmpty, Long excludeMemberEmpty) { + Map resultMap = new HashMap<>(); + + List list = baseMapper.checkMemberPhoneExist(phoneList, checkEmpty, excludeMemberEmpty); + if (CollectionUtil.isNotEmpty(list)) { + for (MemberCountDTO memberCountDTO : list) { + resultMap.put(memberCountDTO.getPhone(), memberCountDTO.getMemberCount()); + } + } + return resultMap; + } + @Override public List findAll() { return baseMapper.findAll(); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java index ab597cf1..3a82a55b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyCodeController.java @@ -12,11 +12,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description: 空单生成会员编号控制器 - * @Author: jiang chao - * @Time: 2023/8/29 11:14 - * @Classname: CuMemberEmptyCodeController - * @PackageName: com.hzs.member.empty.controller.manage + * 空单生成会员编号控制器 */ @RequestMapping("/manage/member-empty-code") @RestController diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java index d6ef714f..f928cd11 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyController.java @@ -24,13 +24,11 @@ import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.empty.CuMemberEmpty; import com.hzs.common.domain.member.empty.CuMemberEmptyDetail; import com.hzs.common.domain.member.empty.ext.CuMemberEmptyDetailExt; -import com.hzs.common.domain.member.empty.ext.CuMemberEmptyProductDTO; import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; import com.hzs.member.empty.dto.MemberEmptyDetailDTO; -import com.hzs.member.empty.dto.MemberEmptyProductDTO; import com.hzs.member.empty.param.MemberEmptyAddParam; import com.hzs.member.empty.param.MemberEmptySignParam; import com.hzs.member.empty.param.MemberEmptyQueryParam; @@ -220,21 +218,6 @@ public class CuMemberEmptyController extends BaseController { return AjaxResult.error(TransactionUtils.getContent(CommonMsgConstants.MISSING_PARAM)); } } - // 选购产品，需要校验产品以及地址信息 - if (EYesNo.YES.getIntValue() == detail.getProductFlag()) { - if (StringUtils.isAnyEmpty(detail.getRecName(), detail.getRecPhone(), detail.getRecAddress()) - || null == detail.getRecProvince() || null == detail.getRecCity() || CollectionUtil.isEmpty(detail.getProductList())) { - // 缺少参数 - return AjaxResult.error(TransactionUtils.getContent(CommonMsgConstants.MISSING_PARAM)); - } - for (MemberEmptyProductDTO product : detail.getProductList()) { - if (StringUtils.isAnyEmpty(product.getSpecsName(), product.getSpecsNameId()) - || null == product.getPkProduct() || null == product.getQuantity()) { - // 缺少参数 - return AjaxResult.error(TransactionUtils.getContent(CommonMsgConstants.MISSING_PARAM)); - } - } - } } if (iMemberEmptyService.updateDate(paramList, SecurityUtils.getUserId(), SecurityUtils.getPkCountry())) { @@ -443,10 +426,6 @@ public class CuMemberEmptyController extends BaseController { detailDTO.setPkCountryVal(emptyDetail.getCountryName()); detailDTO.setPkSettleCountryVal(emptyDetail.getSettleCountryName()); - if (CollectionUtil.isNotEmpty(emptyDetail.getProductDTOList())) { - // 处理产品信息 - detailDTO.setProductList(BeanUtil.copyToList(emptyDetail.getProductDTOList(), MemberEmptyProductDTO.class)); - } dataList.add(detailDTO); } } @@ -496,25 +475,8 @@ public class CuMemberEmptyController extends BaseController { detailDTO.setOrderTypeVal(cacheMap.get(EnumsPrefixConstants.ORDER_TYPE + emptyDetail.getOrderType())); detailDTO.setPointStatusVal(cacheMap.get(EnumsPrefixConstants.POINT_STATUS + emptyDetail.getPointStatus())); detailDTO.setSettlementFlagVal(cacheMap.get(EnumsPrefixConstants.YES_NO + emptyDetail.getSettlementFlag())); - detailDTO.setProductFlagVal(cacheMap.get(EnumsPrefixConstants.YES_NO + emptyDetail.getProductFlag())); detailDTO.setAutoFlagVal(cacheMap.get(EnumsPrefixConstants.DEALER_YES_NO + emptyDetail.getAutoFlag())); - // 处理产品显示数据 - if (CollectionUtil.isNotEmpty(emptyDetail.getProductDTOList())) { - // 产品信息拼接 - StringBuilder productSb = new StringBuilder(); - List productList = emptyDetail.getProductDTOList(); - for (CuMemberEmptyProductDTO productDTO : productList) { - productSb.append(productDTO.getProductName()) - .append("(") - .append(productDTO.getSpecsName()) - .append(") * ") - .append(productDTO.getQuantity()) - .append("; \n"); - } - detailDTO.setProductStr(productSb.toString()); - } - resultList.add(detailDTO); } } @@ -548,11 +510,6 @@ public class CuMemberEmptyController extends BaseController { for (CuMemberEmptyDetailExt emptyDetail : detailList) { MemberEmptyDetailDTO detailDTO = BeanUtil.copyProperties(emptyDetail, MemberEmptyDetailDTO.class); - - // 处理产品信息 - if (CollectionUtil.isNotEmpty(emptyDetail.getProductDTOList())) { - detailDTO.setProductList(BeanUtil.copyToList(emptyDetail.getProductDTOList(), MemberEmptyProductDTO.class)); - } paramList.add(detailDTO); } @@ -600,11 +557,6 @@ public class CuMemberEmptyController extends BaseController { for (CuMemberEmptyDetailExt emptyDetail : detailList) { MemberEmptyDetailDTO detailDTO = BeanUtil.copyProperties(emptyDetail, MemberEmptyDetailDTO.class); - - // 处理产品信息 - if (CollectionUtil.isNotEmpty(emptyDetail.getProductDTOList())) { - detailDTO.setProductList(BeanUtil.copyToList(emptyDetail.getProductDTOList(), MemberEmptyProductDTO.class)); - } paramList.add(detailDTO); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java index 584a60fc..a90f82a3 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/controller/manage/CuMemberEmptyRegisterController.java @@ -11,13 +11,10 @@ import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.empty.ext.CuMemberEmptyDetailExt; -import com.hzs.common.domain.member.empty.ext.CuMemberEmptyProductExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; import com.hzs.member.empty.param.MemberEmptyRegisterQueryParam; -import com.hzs.member.empty.service.ICuMemberEmptyProductService; import com.hzs.member.empty.service.ICuMemberEmptyService; -import com.hzs.member.empty.vo.MemberEmptyRegisterQueryProductVO; import com.hzs.member.empty.vo.MemberEmptyRegisterQueryVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -27,14 +24,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.*; -import java.util.stream.Collectors; /** - * @Description: 空单注册列表控制器 - * @Author: jiang chao - * @Time: 2023/7/6 15:06 - * @Classname: CuMemberEmptyRegisterController - * @PackageName: com.hzs.member.empty.controller.manage + * 空单注册列表控制器 */ @RequestMapping("/manage/member-empty-register") @RestController @@ -43,8 +35,6 @@ public class CuMemberEmptyRegisterController extends BaseController { @Autowired private ICuMemberEmptyService iCuMemberEmptyService; @Autowired - private ICuMemberEmptyProductService iCuMemberEmptyProductService; - @Autowired private ITransactionCommonService iTransactionCommonService; /** @@ -66,19 +56,8 @@ public class CuMemberEmptyRegisterController extends BaseController { startPage(); List list = iCuMemberEmptyService.emptyRegisterList(param, pkCountry); if (CollectionUtil.isNotEmpty(list)) { - - // 查询空单批次产品信息 - Map> productMap = iCuMemberEmptyProductService.queryProductList(list.stream().map(CuMemberEmptyDetailExt::getPkId).collect(Collectors.toList())); - for (CuMemberEmptyDetailExt emptyDetailExt : list) { MemberEmptyRegisterQueryVO queryVO = BeanUtil.copyProperties(emptyDetailExt, MemberEmptyRegisterQueryVO.class); - - // 产品数据处理 - List emptyProductList = productMap.get(emptyDetailExt.getPkId()); - if (CollectionUtil.isNotEmpty(emptyProductList)) { - queryVO.setDetailList(BeanUtil.copyToList(emptyProductList, MemberEmptyRegisterQueryProductVO.class)); - } - resultList.add(queryVO); } } @@ -105,10 +84,6 @@ public class CuMemberEmptyRegisterController extends BaseController { List list = iCuMemberEmptyService.emptyRegisterList(param, pkCountry); if (CollectionUtil.isNotEmpty(list)) { - - // 查询空单批次产品信息 - Map> productMap = iCuMemberEmptyProductService.queryProductList(list.stream().map(CuMemberEmptyDetailExt::getPkId).collect(Collectors.toList())); - // 获取翻译内容 Map cacheMap = iTransactionCommonService.exportEnumTransaction(EPlaceDept.values(), EOrderSource.values(), EOrderType.values(), EDealerYesNo.values()); Map dbMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); @@ -123,24 +98,6 @@ public class CuMemberEmptyRegisterController extends BaseController { queryVO.setOrderSourceVal(cacheMap.get(EnumsPrefixConstants.ORDER_SOURCE + queryVO.getOrderSource())); queryVO.setOrderTypeVal(cacheMap.get(EnumsPrefixConstants.ORDER_TYPE + queryVO.getOrderType())); queryVO.setSettlementFlagVal(cacheMap.get(EnumsPrefixConstants.DEALER_YES_NO + queryVO.getSettlementFlag())); - queryVO.setProductFlagVal(cacheMap.get(EnumsPrefixConstants.DEALER_YES_NO + queryVO.getProductFlag())); - - // 产品信息拼接 - StringBuilder productSb = new StringBuilder(); - // 产品信息 - List emptyProductList = productMap.get(emptyDetailExt.getPkId()); - if (CollectionUtil.isNotEmpty(emptyProductList)) { - for (CuMemberEmptyProductExt emptyProduct : emptyProductList) { - productSb.append(emptyProduct.getProductName()) - .append("(") - .append(emptyProduct.getSpecsName()) - .append(") * ") - .append(emptyProduct.getQuantity()) - .append("; \n"); - } - } - queryVO.setProductStr(productSb.toString()); - resultList.add(queryVO); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java deleted file mode 100644 index f88ffa8f..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.member.empty.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @Description: - * @Author: jiang chao - * @Time: 2023/7/4 11:36 - * @Classname: CuMemberPhoneDTO - * @PackageName: com.hzs.member.empty.dto - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class EmptyMemberDTO { - - /** - * 联系方式 - */ - private String phone; - - /** - * 结算国家 - */ - private Integer pkSettleCountry; - - /** - * 明细数据 - */ - private List detailList; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java deleted file mode 100644 index 0e98d434..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/EmptyMemberDetailDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.member.empty.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Description: 查询会员明细DTO - * @Author: jiang chao - * @Time: 2023/7/4 11:36 - * @Classname: CuMemberPhoneDetailDTO - * @PackageName: com.hzs.member.empty.dto - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class EmptyMemberDetailDTO { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java index a1bdc9bd..92466c61 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyDetailDTO.java @@ -6,7 +6,6 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.Data; import java.math.BigDecimal; -import java.util.List; /** * 空单注册明细DTO @@ -173,71 +172,6 @@ public class MemberEmptyDetailDTO { @Excel(name = "上传业绩") private BigDecimal transferAchieve; - /** - * 选购产品（0=是，1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer productFlag; - /** - * 选购产品显示 - */ - @Excel(name = "选购产品") - private String productFlagVal; - - /** - * 产品拼装（导出使用） - */ - @Excel(name = "产品信息") - private String productStr; - - /** - * 收货人 - */ - @Excel(name = "收货人") - private String recName; - - /** - * 联系方式 - */ - @Excel(name = "联系方式") - private String recPhone; - - /** - * 省 - */ - private Integer recProvince; - /** - * 省 - */ - @Excel(name = "省") - private String recProvinceVal; - - /** - * 市 - */ - private Integer recCity; - /** - * 市 - */ - @Excel(name = "市") - private String recCityVal; - - /** - * 县 - */ - private Integer recCounty; - /** - * 县 - */ - @Excel(name = "县") - private String recCountyVal; - - /** - * 详细地址 - */ - @Excel(name = "详细地址") - private String recAddress; - /** * 是否激活标记（0=是，1=否） */ @@ -271,9 +205,4 @@ public class MemberEmptyDetailDTO { @Excel(name = "生成备注") private String remark; - /** - * 产品列表 - */ - private List productList; - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java deleted file mode 100644 index e8e7f419..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/dto/MemberEmptyProductDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.member.empty.dto; - -import lombok.Data; - -/** - * @Description: 空单产品DTO - * @Author: jiang chao - * @Time: 2023/6/19 14:45 - * @Classname: CuMemberEmptyProductDTO - * @PackageName: com.hzs.member.empty.dto - */ -@Data -public class MemberEmptyProductDTO { - - /** - * 产品ID - */ - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 产品规格 - */ - private String specsName; - - /** - * 产品规格ID - */ - private String specsNameId; - - /** - * 产品数量 - */ - private Integer quantity; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java index c6c5a101..85709a3a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyMapper.java @@ -11,9 +11,6 @@ import java.util.List; /** * 空单批次 Mapper 接口 - * - * @author hzs - * @since 2023-06-16 */ public interface CuMemberEmptyMapper extends BaseMapper { @@ -45,5 +42,4 @@ public interface CuMemberEmptyMapper extends BaseMapper { */ String queryLastCode(); - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java index d74d834f..0e399af5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyProductMapper.java @@ -2,46 +2,10 @@ package com.hzs.member.empty.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.empty.CuMemberEmptyProduct; -import com.hzs.common.domain.member.empty.ext.CuMemberEmptyProductExt; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 空单批次明细产品 Mapper 接口 - * - * @author hzs - * @since 2023-08-28 */ public interface CuMemberEmptyProductMapper extends BaseMapper { - /** - * 批量删除会员空单产品 - * - * @param emptyProductList 空单产品数据 - * @param pkMemberEmpty 空单批次ID - * @param userId 当前会员 - * @return - */ - int deleteBatch(@Param("emptyProductList") List emptyProductList, - @Param("pkMemberEmpty") Long pkMemberEmpty, - @Param("userId") Long userId); - - /** - * 批量插入会员空单产品 - * - * @param emptyProductList 空单产品数据 - * @param userId 当前会员 - * @return - */ - int insertOrUpdateBatch(@Param("emptyProductList") List emptyProductList, @Param("userId") Long userId); - - /** - * 查询空单明细产品信息列表 - * - * @param emptyDetailIdList 空单明细ID列表 - * @return - */ - List queryProductList(@Param("emptyDetailIdList") List emptyDetailIdList); - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java index 39449570..4c70223b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyDetailService.java @@ -10,9 +10,6 @@ import java.util.List; /** * 空单批次明细 服务类 - * - * @author hzs - * @since 2023-06-16 */ public interface ICuMemberEmptyDetailService extends IService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java index a36c73ac..1c09720a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyProductService.java @@ -2,44 +2,11 @@ package com.hzs.member.empty.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.empty.CuMemberEmptyProduct; -import com.hzs.common.domain.member.empty.ext.CuMemberEmptyProductExt; - -import java.util.List; -import java.util.Map; /** * 空单批次明细产品 服务类 - * - * @author hzs - * @since 2023-08-28 */ public interface ICuMemberEmptyProductService extends IService { - /** - * 批量删除会员空单产品 - * - * @param emptyProductList 空单产品数据 - * @param pkMemberEmpty 空单批次ID - * @param userId 当前会员 - * @return - */ - int deleteBatch(List emptyProductList, Long pkMemberEmpty, Long userId); - - /** - * 批量插入会员空单产品 - * - * @param emptyProductList 空单产品数据 - * @param userId 当前会员 - * @return - */ - int insertOrUpdateBatch(List emptyProductList, Long userId); - - /** - * 查询空单明细产品信息列表 - * - * @param emptyDetailIdList 空单明细ID列表 - * @return - */ - Map> queryProductList(List emptyDetailIdList); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java index c0a18891..41d7bda8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/IMemberEmptyService.java @@ -9,11 +9,7 @@ import com.hzs.system.sys.dto.LoginUser; import java.util.List; /** - * @Description: 空单处理服务 - * @Author: jiang chao - * @Time: 2023/6/17 14:07 - * @Classname: IMemberEMptyService - * @PackageName: com.hzs.member.empty.service + * 空单处理服务 */ public interface IMemberEmptyService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java index 6fb3f93f..de39472e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyDetailServiceImpl.java @@ -7,14 +7,12 @@ import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.domain.member.empty.CuMemberEmpty; import com.hzs.common.domain.member.empty.CuMemberEmptyCode; import com.hzs.common.domain.member.empty.CuMemberEmptyDetail; -import com.hzs.common.domain.member.empty.CuMemberEmptyProduct; import com.hzs.common.domain.member.empty.ext.CuMemberEmptyDetailExt; import com.hzs.member.empty.dto.MemberEmptyDetailDTO; import com.hzs.member.empty.mapper.CuMemberEmptyDetailMapper; import com.hzs.member.empty.param.MemberEmptyAddParam; import com.hzs.member.empty.service.ICuMemberEmptyCodeService; import com.hzs.member.empty.service.ICuMemberEmptyDetailService; -import com.hzs.member.empty.service.ICuMemberEmptyProductService; import com.hzs.member.empty.service.ICuMemberEmptyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,9 +23,6 @@ import java.util.stream.Collectors; /** * 空单批次明细 服务实现类 - * - * @author hzs - * @since 2023-06-16 */ @Service public class CuMemberEmptyDetailServiceImpl extends ServiceImpl implements ICuMemberEmptyDetailService { @@ -36,8 +31,6 @@ public class CuMemberEmptyDetailServiceImpl extends ServiceImpl productUpdateWrapper = new LambdaUpdateWrapper<>(); - productUpdateWrapper.in(CuMemberEmptyProduct::getPkMemberEmptyDetail, detailIdList); - productUpdateWrapper.eq(CuMemberEmptyProduct::getDelFlag, EDelFlag.UN_DELETE.getValue()); - productUpdateWrapper.set(CuMemberEmptyProduct::getDelFlag, EDelFlag.DELETE.getValue()); - productUpdateWrapper.set(CuMemberEmptyProduct::getPkModified, userId); - productUpdateWrapper.set(CuMemberEmptyProduct::getModifiedTime, nowDate); - iCuMemberEmptyProductService.update(productUpdateWrapper); - // 删除空单明细 LambdaUpdateWrapper detailUpdateWrapper = new LambdaUpdateWrapper<>(); detailUpdateWrapper.in(CuMemberEmptyDetail::getPkId, detailIdList); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java index 1b19c21b..47107c0f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyProductServiceImpl.java @@ -1,48 +1,16 @@ package com.hzs.member.empty.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.empty.CuMemberEmptyProduct; -import com.hzs.common.domain.member.empty.ext.CuMemberEmptyProductExt; import com.hzs.member.empty.mapper.CuMemberEmptyProductMapper; import com.hzs.member.empty.service.ICuMemberEmptyProductService; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * 空单批次明细产品 服务实现类 - * - * @author hzs - * @since 2023-08-28 */ @Service public class CuMemberEmptyProductServiceImpl extends ServiceImpl implements ICuMemberEmptyProductService { - @Override - public int deleteBatch(List emptyProductList, Long pkMemberEmpty, Long userId) { - return baseMapper.deleteBatch(emptyProductList, pkMemberEmpty, userId); - } - - @Override - public int insertOrUpdateBatch(List emptyProductList, Long userId) { - return baseMapper.insertOrUpdateBatch(emptyProductList, userId); - } - - @Override - public Map> queryProductList(List emptyDetailIdList) { - Map> resultMap = new HashMap<>(); - - List resultList = baseMapper.queryProductList(emptyDetailIdList); - if (CollectionUtil.isNotEmpty(resultList)) { - for (CuMemberEmptyProductExt productExt : resultList) { - resultMap.computeIfAbsent(productExt.getPkMemberEmptyDetail(), k -> new ArrayList<>()).add(productExt); - } - } - return resultMap; - } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java index d4e15ecf..61f56f7d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyServiceImpl.java @@ -6,13 +6,11 @@ import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.enums.EOrderPrefix; import com.hzs.common.domain.member.empty.CuMemberEmpty; import com.hzs.common.domain.member.empty.CuMemberEmptyDetail; -import com.hzs.common.domain.member.empty.CuMemberEmptyProduct; import com.hzs.common.domain.member.empty.ext.CuMemberEmptyDetailExt; import com.hzs.member.empty.mapper.CuMemberEmptyMapper; import com.hzs.member.empty.param.MemberEmptyQueryParam; import com.hzs.member.empty.param.MemberEmptyRegisterQueryParam; import com.hzs.member.empty.service.ICuMemberEmptyDetailService; -import com.hzs.member.empty.service.ICuMemberEmptyProductService; import com.hzs.member.empty.service.ICuMemberEmptyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,17 +21,12 @@ import java.util.List; /** * 空单批次 服务实现类 - * - * @author hzs - * @since 2023-06-16 */ @Service public class CuMemberEmptyServiceImpl extends ServiceImpl implements ICuMemberEmptyService { @Autowired private ICuMemberEmptyDetailService iCuMemberEmptyDetailService; - @Autowired - private ICuMemberEmptyProductService iCuMemberEmptyProductService; @Override public List queryList(MemberEmptyQueryParam param, Integer pkCountry, Integer systemType) { @@ -62,14 +55,6 @@ public class CuMemberEmptyServiceImpl extends ServiceImpl emptyProductUpdateWrapper = new LambdaUpdateWrapper<>(); - emptyProductUpdateWrapper.in(CuMemberEmptyProduct::getPkMemberEmpty, pkIdList); - emptyProductUpdateWrapper.set(CuMemberEmptyProduct::getDelFlag, EDelFlag.DELETE.getValue()); - emptyProductUpdateWrapper.set(CuMemberEmptyProduct::getPkModified, userId); - emptyProductUpdateWrapper.set(CuMemberEmptyProduct::getModifiedTime, nowDate); - iCuMemberEmptyProductService.update(emptyProductUpdateWrapper); } @Override diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java index 1a303ed5..16183057 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.RabbitMqConstants; import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.constant.msg.CommonMsgConstants; @@ -14,7 +13,6 @@ import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.exception.ServiceException; -import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.StringUtils; @@ -26,11 +24,6 @@ import com.hzs.common.domain.member.detail.CuMemberGrade; import com.hzs.common.domain.member.detail.CuMemberLevel; import com.hzs.common.domain.member.empty.*; import com.hzs.common.domain.member.empty.ext.CuMemberEmptyDetailExt; -import com.hzs.common.domain.member.empty.ext.CuMemberEmptyProductDTO; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.order.SaOrderItems; -import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.domain.system.config.BdAccount; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; @@ -41,10 +34,8 @@ import com.hzs.member.base.service.ICuMemberRegisterService; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.detail.service.ICuMemberLevelService; import com.hzs.member.empty.dto.MemberEmptyDetailDTO; -import com.hzs.member.empty.dto.MemberEmptyProductDTO; import com.hzs.member.empty.param.MemberEmptySignParam; import com.hzs.member.empty.service.*; -import com.hzs.sale.order.ISaOrderServiceApi; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAccountServiceApi; @@ -78,8 +69,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { @Autowired private ICuMemberEmptyCodeService iCuMemberEmptyCodeService; @Autowired - private ICuMemberEmptyProductService iCuMemberEmptyProductService; - @Autowired private ICuMemberEmptyLogService iCuMemberEmptyLogService; @Autowired private ICuMemberService iCuMemberService; @@ -101,13 +90,8 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { @DubboReference IAccountServiceApi iAccountServiceApi; @DubboReference - ISaOrderServiceApi iSaOrderServiceApi; - @DubboReference IApprovalServiceApi iApprovalServiceApi; - @Autowired - private RedisService redisService; - @Override public void importTemplate(List resultList) { // 会员编号列表（导入会员编号去重） @@ -187,8 +171,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { CuMemberEmpty memberEmpty = new CuMemberEmpty(); // 空单明细数据 List detailList = new ArrayList<>(); - // 空单明细产品数据 - List productList = new ArrayList<>(); // 空单数据 MemberEmptyDetailDTO tmpDetail = resultList.get(0); @@ -200,34 +182,12 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { // 空单明细数据 for (MemberEmptyDetailDTO detailDTO : resultList) { detailList.add(BeanUtil.copyProperties(detailDTO, CuMemberEmptyDetail.class)); - - // 产品列表数据 - List tmpProductList = detailDTO.getProductList(); - if (CollectionUtil.isNotEmpty(tmpProductList)) { - for (MemberEmptyProductDTO productDTO : tmpProductList) { - CuMemberEmptyProduct cuMemberEmptyProduct = new CuMemberEmptyProduct(); - cuMemberEmptyProduct.setPkMemberEmpty(detailDTO.getPkMemberEmpty()); - cuMemberEmptyProduct.setPkMemberEmptyDetail(detailDTO.getPkId()); - cuMemberEmptyProduct.setPkProduct(productDTO.getPkProduct()); - cuMemberEmptyProduct.setQuantity(productDTO.getQuantity()); - cuMemberEmptyProduct.setSpecsName(productDTO.getSpecsName()); - cuMemberEmptyProduct.setSpecsNameId(productDTO.getSpecsNameId()); - cuMemberEmptyProduct.setPkCountry(pkCountry); - productList.add(cuMemberEmptyProduct); - } - } } // 修改空单批次 iCuMemberEmptyService.updateById(memberEmpty); // 更新空单批次明细 iCuMemberEmptyDetailService.updateBatch(detailList, userId); - // 删除部分空单产品数据 - iCuMemberEmptyProductService.deleteBatch(productList, userId, tmpDetail.getPkMemberEmpty()); - if (CollectionUtil.isNotEmpty(productList)) { - // 插入或更新空间批次产品 - iCuMemberEmptyProductService.insertOrUpdateBatch(productList, userId); - } return true; } @@ -264,8 +224,8 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { // 查询会员编号是否存在 Map checkCodeMap = iCuMemberService.checkMemberCodeExist(checkMemberList, true, pkMemberEmpty); -// // 查询联系方式是否存在 -// Map checkPhoneMap = iCuMemberService.checkMemberPhoneExist(checkPhoneList, true, pkMemberEmpty, systemType); + // 查询联系方式是否存在 + Map checkPhoneMap = iCuMemberService.checkMemberPhoneExist(checkPhoneList, true, pkMemberEmpty); // 查询推荐编号是否存在（在本次推荐数据中的直接排除掉） final Map checkParentCodeMap = new HashMap<>(); @@ -284,6 +244,15 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { bool[0] = false; } } + if (checkPhoneMap.size() > 0) { + if (null != checkPhoneMap.get(detail.getPhone()) && checkPhoneMap.get(detail.getPhone()) >= 1) { + // 导入的会员联系方式已经存在数据库中，异常状态 + detail.setPointStatus(EPointStatus.ABNORMAL.getValue()); + // 会员联系方式存在重复 + detail.setContentAbstract(detail.getContentAbstract().replace(TransactionUtils.getContent(MemberMsgConstants.EMPTY_PHONE_NOT), "") + TransactionUtils.getContent(MemberMsgConstants.EMPTY_PHONE_NOT) + ";"); + bool[0] = false; + } + } // 处理校验推荐编号是否存在 if (!checkMemberList.contains(detail.getParentCode()) && checkParentCodeMap.get(detail.getParentCode()) == null) { // 推荐编号不在本次导入的会员中，也不在数据库中，异常状态 @@ -313,8 +282,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { Map memberAccountSeqMap = new HashMap<>(); // 需要查询汇率数据 Set queryRateSet = new HashSet<>(); - // 需要查询仓库数据 - Set queryStoreHouseSet = new HashSet<>(); // 需要查询奖金账户数据 Set queryAccountSet = new HashSet<>(); @@ -323,8 +290,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { // 生成需要入库的会员账户ID列表 List memberAccountSeqList = iCuMemberAccountService.querySeqList(detailList.size()); - // 订单需要生成seq的数量 - int orderSeqCount = 0; // 遍历空单明细数据，提取准备的数据 for (int i = 0; i < detailList.size(); i++) { CuMemberEmptyDetailExt emptyDetail = detailList.get(i); @@ -339,14 +304,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { // 需要查库的汇率数据 queryRateSet.add(emptyDetail.getPkSettleCountry()); - // 如果选购产品并且存在产品信息 - if (EYesNo.YES.getIntValue() == emptyDetail.getProductFlag() && CollectionUtil.isNotEmpty(emptyDetail.getProductDTOList())) { - // 累计订单数量 - orderSeqCount++; - // 记录查询仓库数据 - queryStoreHouseSet.add(emptyDetail.getRecProvince()); - } - if (null != emptyDetail.getBackAmount() && emptyDetail.getBackAmount().compareTo(BigDecimal.ZERO) > 0) { // 回调金额大于0，记录查询账户国家 queryAccountSet.add(emptyDetail.getPkSettleCountry()); @@ -378,18 +335,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { } } - // 省对应发货仓库（key: 省ID，value: 仓库ID) - Map storehouseMap = new HashMap<>(); - if (CollectionUtil.isNotEmpty(queryStoreHouseSet)) { - // 查询省对应仓库 - List storehouseList = iCurrencyServiceApi.queryBdStorehouseMapByProvince(queryStoreHouseSet).getData(); - if (CollectionUtil.isNotEmpty(storehouseList)) { - for (BdStorehouse storehouse : storehouseList) { - storehouseMap.put(storehouse.getProvince(), storehouse.getPkId()); - } - } - } - // 回填金额账户数据（key: 国家ID，value: 账户ID) Map accountMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(queryAccountSet)) { @@ -402,14 +347,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { } } - // 生成订单seq数据 - List orderSeqList = new ArrayList<>(orderSeqCount); - if (0 != orderSeqCount) { - orderSeqList = iSaOrderServiceApi.querySeqList(orderSeqCount).getData(); - } - // 订单seq数据下标 - int orderSeqInt = 0; - ////////// 封装入口相关数据开始 ////////// // 当前时间 @@ -422,10 +359,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { List registerMemberList = new ArrayList<>(detailList.size()); // 入库会员账户流水列表 List saveMemberTradeList = new ArrayList<>(); - // 入库订单列表 - List saveOrderList = new ArrayList<>(); - // 入库订单明细列表 - List saveOrderItemList = new ArrayList<>(); // 查询批次下推荐架构顶点 List placeTopList = iCuMemberEmptyDetailService.queryPlaceParentTopAndProduct(pkMemberEmpty); @@ -444,15 +377,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { CuMember cuMember = this.createMember(saveMemberList, saveMemberAccountList, registerMemberList, saveMemberTradeList, memberSeqMap, memberMap, memberAccountSeqMap, treeDetail, accountMap.get(pkSettleCountry), currencyMap.get(pkSettleCountry), userId, nowDate, systemType); - - // 如果选购产品并且存在产品信息 - if (EYesNo.YES.getIntValue() == treeDetail.getProductFlag() && CollectionUtil.isNotEmpty(treeDetail.getProductDTOList())) { - // 获取订单ID - Long pkOrder = orderSeqList.get(orderSeqInt++); - this.createOrder(saveOrderList, saveOrderItemList, treeDetail, cuMember, - currencyMap.get(pkSettleCountry), storehouseMap.get(treeDetail.getRecCounty()), - pkOrder, userId, nowDate, systemType); - } } } } @@ -467,15 +391,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { CuMember cuMember = this.createMember(saveMemberList, saveMemberAccountList, registerMemberList, saveMemberTradeList, memberSeqMap, memberMap, memberAccountSeqMap, topDetail, accountMap.get(pkSettleCountry), currencyMap.get(pkSettleCountry), userId, nowDate, systemType); - - // 如果选购产品并且存在产品信息 - if (EYesNo.YES.getIntValue() == topDetail.getProductFlag() && CollectionUtil.isNotEmpty(topDetail.getProductDTOList())) { - // 获取订单ID - Long pkOrder = orderSeqList.get(orderSeqInt++); - this.createOrder(saveOrderList, saveOrderItemList, topDetail, cuMember, - currencyMap.get(pkSettleCountry), storehouseMap.get(topDetail.getRecCounty()), - pkOrder, userId, nowDate, systemType); - } } } catch (Exception e) { log.error("空单注册处理异常", e); @@ -529,14 +444,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { memberEmptyUpdateWrapper.set(CuMemberEmpty::getModifiedTime, nowDate); iCuMemberEmptyService.update(memberEmptyUpdateWrapper); - // 购买产品，订单以及订单明细入库 - if (CollectionUtil.isNotEmpty(saveOrderList)) { - R orderResult = iSaOrderServiceApi.saveOrderBatch(saveOrderList, saveOrderItemList); - if (!orderResult.isSuccess()) { - throw new ServiceException("空单注册生成订单异常"); - } - } - if (pushLogFlag) { // 推送业务操作日志 rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, Collections.singletonList(logDTO)); @@ -710,108 +617,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { return cuMember; } - /** - * 封装订单以及订单详情数据 - * - * @param saveOrderList 入库订单列表 - * @param saveOrderItemList 入库订单明细列表 - * @param emptyDetail 空单明细数据 - * @param cuMember 新会员数据 - * @param pkRate 汇率ID - * @param pkStoreHouse 仓库ID - * @param pkOrder 订单ID - * @param userId 当前会员 - * @param nowDate 当前时间 - */ - private void createOrder(List saveOrderList, List saveOrderItemList, - CuMemberEmptyDetailExt emptyDetail, CuMember cuMember, - Integer pkRate, Integer pkStoreHouse, - Long pkOrder, Long userId, Date nowDate, Integer systemType) { - // 封装订单信息 - SaOrder saOrder = SaOrder.builder() - .pkId(pkOrder) - .orderCode(CommonUtil.createSerialNumber(EOrderPrefix.ORDER_CODE)) - .orderType(EOrderType.REGISTER_ORDER.getValue()) - .pkRate(pkRate) - .orderAmount(BigDecimal.ZERO) - .orderAchieve(null != emptyDetail.getSettlementAchieve() ? emptyDetail.getSettlementAchieve() : BigDecimal.ZERO) - .uploadAchieve(null != emptyDetail.getTransferAchieve() ? emptyDetail.getTransferAchieve() : BigDecimal.ZERO) - .recName(emptyDetail.getRecName()) - .recPhone(emptyDetail.getRecPhone()) - .recProvince(emptyDetail.getRecProvince()) - .recCity(emptyDetail.getRecCity()) - .recCounty(emptyDetail.getRecCounty()) - .recAddress(emptyDetail.getRecAddress()) - .payTime(nowDate) - .payType(EOrderPayType.WALLET.getValue()) - .orderStatus(EPayStatus.PAID.getValue()) - .pkMember(emptyDetail.getPkId()) - .pkReference(cuMember.getPkParent()) - .pkPlacement(cuMember.getPkPlaceParent()) - .pkVertex(cuMember.getPkVertex()) - .pkStorehouse(pkStoreHouse) - .systemType(systemType) - .build(); - saOrder.setPkCountry(emptyDetail.getPkSettleCountry()); - saOrder.setPkCreator(userId); - saOrder.setCreationTime(nowDate); - saveOrderList.add(saOrder); - - // 产品信息 - List productDTOList = emptyDetail.getProductDTOList(); - if (CollectionUtil.isNotEmpty(productDTOList)) { - for (CuMemberEmptyProductDTO productDTO : productDTOList) { - // 封装订单明细停放上 - SaOrderItems saOrderItems = SaOrderItems.builder() - .pkOrder(pkOrder) - .pkProduct(productDTO.getPkProduct()) - .pkRate(pkRate) - .quantity(productDTO.getQuantity()) - .pkGrade(cuMember.getPkSettleGrade()) - .pkAwards(cuMember.getPkAwards()) - .orderStatus(EOrderStatus.PAY.getValue()) - .specsName(productDTO.getSpecsName()) - .specsNameId(productDTO.getSpecsNameId()) - .waresQuantity(productDTO.getQuantity()) - .pkStorehouse(pkStoreHouse) - .build(); - saOrderItems.setPkCountry(emptyDetail.getPkSettleCountry()); - saOrderItems.setPkCreator(userId); - saOrderItems.setCreationTime(nowDate); - saveOrderItemList.add(saOrderItems); - } - } - } - - /** - * 安置位置验证以及锁定 - * - * @param emptyDetail 空单明细数据 - * @param redisLockList redis锁定列表 - * @return - */ - private Long placeLock(CuMemberEmptyDetail emptyDetail, List redisLockList) { - // 查询最末安置人 - CuMemberExt cuMemberExt = iCuMemberService.queryLastPlaceByMemberCode(emptyDetail.getPlaceParentCode(), emptyDetail.getPlaceDept()); - if (null == cuMemberExt) { - cuMemberExt = iCuMemberService.getMemberByCode(emptyDetail.getPlaceParentCode()); - } - // 需要锁安置位置 - String redisLock = CacheConstants.POSITION + cuMemberExt.getPkId() + emptyDetail.getPlaceDept(); - if (redisService.lockKeyOnce(redisLock)) { - redisLockList.add(redisLock); - - return cuMemberExt.getPkId(); - } - try { - Thread.sleep(200); - return this.placeLock(emptyDetail, redisLockList); - } catch (Exception e) { - log.error("空单注册锁定安置异常", e); - throw new ServiceException("空单注册锁定安置异常"); - } - } - @Transactional(rollbackFor = Exception.class) @Override public String submit(MemberEmptySignParam param, List detailList, LoginUser loginUser) { @@ -901,11 +706,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService { for (CuMemberEmptyDetailExt emptyDetail : detailList) { MemberEmptyDetailDTO detailDTO = BeanUtil.copyProperties(emptyDetail, MemberEmptyDetailDTO.class); - - if (StringUtils.isNotEmpty(emptyDetail.getProductDTOList())) { - // 处理产品信息 - detailDTO.setProductList(BeanUtil.copyToList(emptyDetail.getProductDTOList(), MemberEmptyProductDTO.class)); - } paramList.add(detailDTO); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java deleted file mode 100644 index 1b3bc621..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryProductVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.member.empty.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Description: 空单注册列表产品查询VO - * @Author: jiang chao - * @Time: 2023/7/6 17:30 - * @Classname: MemberEmptyRegisterQueryProductVO - * @PackageName: com.hzs.member.empty.vo - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class MemberEmptyRegisterQueryProductVO { - - /** - * 产品名称 - */ - private String productName; - - /** - * 产品规格名称 - */ - private String specsName; - - /** - * 产品数量 - */ - private Integer quantity; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java index ca4bd564..67da45c7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/vo/MemberEmptyRegisterQueryVO.java @@ -6,14 +6,9 @@ import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.Data; import java.math.BigDecimal; -import java.util.List; /** - * @Description: 空单注册列表查询VO - * @Author: jiang chao - * @Time: 2023/7/6 16:02 - * @Classname: MemberEmptyRegisterQueryVO - * @PackageName: com.hzs.member.empty.vo + * 空单注册列表查询VO */ @Data public class MemberEmptyRegisterQueryVO { @@ -42,14 +37,6 @@ public class MemberEmptyRegisterQueryVO { @Excel(name = "联系方式") private String phone; - /** - * 隶属体系 - */ - - /** - * 隶属团队 - */ - /** * 推荐编号 */ @@ -163,73 +150,4 @@ public class MemberEmptyRegisterQueryVO { @Excel(name = "上传业绩") private BigDecimal transferAchieve; - /** - * 选购产品 - */ - @Transaction(transactionKey = EnumsPrefixConstants.DEALER_YES_NO) - private Integer productFlag; - /** - * 选购产品显示 - */ - @Excel(name = "选购产品") - private String productFlagVal; - - /** - * 产品信息VO - */ - private List detailList; - /** - * 产品信息 - */ - @Excel(name = "产品信息") - private String productStr; - - /** - * 收货人 - */ - @Excel(name = "收货人") - private String recName; - - /** - * 收货电话 - */ - @Excel(name = "收货电话") - private String recPhone; - - /** - * 省 - */ - private Integer recProvince; - /** - * 省显示 - */ - @Excel(name = "省") - private String recProvinceVal; - - /** - * 市 - */ - private Integer recCity; - /** - * 市显示 - */ - @Excel(name = "市") - private String recCityVal; - - /** - * 县 - */ - private Integer recCounty; - /** - * 县显示 - */ - @Excel(name = "县") - private String recCountyVal; - - /** - * 详细地址 - */ - @Excel(name = "详细地址") - private String recAddress; - } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index fe6d8799..d1b1200c 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -1534,6 +1534,47 @@ group by tmp.member_code + + + - select cmep.*, bp.product_name, bp.product_code - from cu_member_empty_product cmep - left join bd_product bp - on bp.pk_id = cmep.pk_product - and bp.del_flag = 0 - where cmep.del_flag = 0 - and cmep.pk_member_empty_detail in - - #{item} - - order by cmep.pk_member_empty_detail desc - - diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java index d45385d3..f6ee779f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java @@ -20,9 +20,6 @@ import java.util.List; /** * 销售订单-明细表 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface SaOrderItemsMapper extends BaseMapper { @@ -119,33 +116,15 @@ public interface SaOrderItemsMapper extends BaseMapper { * 更新订单明细表，将订单明细更改为删除 * * @param saOrder 订单 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/24 20:48 */ Integer updateOrderItems(SaOrder saOrder); /* - * @description: - * @author: sui q - * @date: 2023/7/27 16:16 - * @param: null null + * **/ void updateOrderItemsByMemberList(@Param("memberList") List memberList, @Param("pkApprove") Long pkApprove, @Param("currentDateTime") Date currentDateTime); - /** - * 根据主键列表更新订单明细，删除部分退的订单 - * - * @param pkOrderItemsId 订单明细 - * @param pkApprove 审核人 - * @param currentDate 更新时间 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/28 11:25 - */ - Integer updateOrderItemsById(@Param("pkOrderItemsId") List pkOrderItemsId, @Param("pkApprove") Long pkApprove, @Param("currentDate") Date currentDate); - /** * 根据订单ID查询订单明细列表（前台使用，尽量只查能用到的） * @@ -155,11 +134,7 @@ public interface SaOrderItemsMapper extends BaseMapper { List queryListByOrderId(@Param("orderIdList") List orderIdList); /** - * @description: 根据订单ID查询订单商品明细列表 - * @author: zhang jing - * @date: 2023/5/29 15:38 - * @param: [orderIdList, tOrderIdList] - * @return: java.util.List + * 根据订单ID查询订单商品明细列表 **/ List waresListByOrderId(@Param("orderIdList") List orderIdList); @@ -171,7 +146,6 @@ public interface SaOrderItemsMapper extends BaseMapper { */ List queryWaresListByOrderId(@Param("orderId") Long orderId); - /** * 根据订单明细ID查询订单明细列表 * @@ -206,11 +180,7 @@ public interface SaOrderItemsMapper extends BaseMapper { List selectByList(@Param("pkOrder") Long pkOrder); /** - * @description: 根据订单ID查询商品 - * @author: zhang jing - * @date: 2023/4/21 18:02 - * @param: [canApplyOrderVO] - * @return: java.util.List + * 根据订单ID查询商品 **/ List getOrderItemsParams(@Param("orderIdList") List orderIdList); @@ -222,14 +192,6 @@ public interface SaOrderItemsMapper extends BaseMapper { */ List queryDeliverByOrder(@Param("pkOrder") Long pkOrder); - /** - * 批量插入订单明细数据 - * - * @param orderItemsList 订单明细数据 - * @return - */ - int insertBach(@Param("orderItemsList") List orderItemsList); - /** * 校验订单商品是否下架 * @@ -260,22 +222,6 @@ public interface SaOrderItemsMapper extends BaseMapper { */ List selectByWaresCodeList(@Param("orderCode") String orderCode); - /** - * 查询新零售购买指定商品数量 - * - * @param pkMember 会员ID - * @param waresCodeList 商品编号列表 - * @param payTime 支付时间（可为null） - * @param orderTypeList 订单类型列表 - * @param systemType 系统类型（可为null） - * @return - */ - int getRetailWaresQuantity(@Param("pkMember") Long pkMember, - @Param("waresCodeList") List waresCodeList, - @Param("payTime") Date payTime, - @Param("orderTypeList") List orderTypeList, - @Param("systemType") Integer systemType); - /** * 查询新零售购买指定商品数量（新） * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java index b3e21cac..f4b523c4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java @@ -83,18 +83,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi { return R.ok(iSaOrderService.selfAddressOrderList(param, memberId, pkCountry)); } - @Override - public R saveOrderBatch(List orderList, List orderItemsList) { - try { - if (iSaOrderService.insertBach(orderList, orderItemsList) > 0) { - return R.ok(); - } - } catch (Exception e) { - log.error("批量插入订单和订单明细异常", e); - } - return R.fail(); - } - @Override public List checkMemberIsFirstOrder(List memberCodeList) { List memberFirstOrderVos = iSaOrderService.checkMemberIsFirstOrder(memberCodeList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java index 6d9782f2..3d6f2509 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java @@ -20,9 +20,6 @@ import java.util.List; /** * 销售订单-明细表 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ISaOrderItemsService extends IService { @@ -76,32 +73,14 @@ public interface ISaOrderItemsService extends IService { * 更新订单明细表，将订单明细更改为删除 * * @param saOrder - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/24 20:48 */ Boolean updateOrderItems(SaOrder saOrder); /* - * @description: - * @author: sui q - * @date: 2023/7/27 16:16 - * @param: null null + * **/ void updateOrderItemsByMemberList(List memberList, Long pkApprove, Date currentDateTime); - /** - * 根据主键列表更新订单明细，删除部分退的订单 - * - * @param pkOrderItemsId 订单明细 - * @param pkApprove 审核人 - * @param currentDate 更新时间 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/28 11:25 - */ - Boolean updateOrderItemsById(List pkOrderItemsId, Long pkApprove, Date currentDate); - /** * 根据订单ID查询订单明细列表 * @@ -111,11 +90,7 @@ public interface ISaOrderItemsService extends IService { List queryListByOrderId(List orderIdList); /** - * @description: 根据订单id查询订单商品列表 - * @author: zhang jing - * @date: 2023/5/29 15:37 - * @param: [orderIdList, tOrderIdList] - * @return: java.util.List + * 根据订单id查询订单商品列表 **/ List waresListByOrderId(List orderIdList); @@ -157,11 +132,7 @@ public interface ISaOrderItemsService extends IService { List selectByList(Long pkOrder); /** - * @description: 根据订单ID查询商品 - * @author: zhang jing - * @date: 2023/4/21 18:02 - * @param: [canApplyOrderVO] - * @return: java.util.List + * 根据订单ID查询商品 **/ List getOrderItemsParams(@Param("orderIdList") List orderIdList); @@ -173,14 +144,6 @@ public interface ISaOrderItemsService extends IService { */ List queryDeliverByOrder(Long pkOrder); - /** - * 批量插入订单明细数据 - * - * @param orderItemsList 订单明细数据 - * @return - */ - int insertBach(List orderItemsList); - /** * 校验订单商品是否下架 * @@ -228,18 +191,6 @@ public interface ISaOrderItemsService extends IService { */ List selectByWaresCodeList(String orderCode); - /** - * 查询新零售购买指定商品数量 - * - * @param pkMember 会员ID - * @param waresCodeList 商品编号列表 - * @param payTime 支付时间（可为null） - * @param orderTypeList 订单类型列表 - * @param systemType 系统类型（可为null） - * @return - */ - int getRetailWaresQuantity(Long pkMember, List waresCodeList, Date payTime, List orderTypeList, Integer systemType); - /** * 查询新零售购买指定商品数量（新） * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 0b109c00..f99e3c92 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -537,14 +537,6 @@ public interface ISaOrderService extends IService { */ List querySeqList(Integer param); - /** - * 批量插入订单数据 - * - * @param orderList 订单列表 - * @return - */ - int insertBach(List orderList, List orderItemsList); - /** * 根据编号查询会员首单 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index 9ec79b64..bc4f8738 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -64,11 +64,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl pkOrderItemsId, Long pkApprove, Date currentDate) { - return baseMapper.updateOrderItemsById(pkOrderItemsId, pkApprove, currentDate) > 0; - } - @Override public List queryListByOrderId(List orderIdList) { return baseMapper.queryListByOrderId(orderIdList); @@ -94,32 +89,16 @@ public class SaOrderItemsServiceImpl extends ServiceImpl selectByList(Long pkOrder) { return baseMapper.selectByList(pkOrder); } - /** - * @description: 根据订单ID查询商品 - * @author: zhang jing - * @date: 2023/4/21 18:02 - * @param: [canApplyOrderVO] - * @return: java.util.List - **/ @Override public List getOrderItemsParams(List orderIdList) { return baseMapper.getOrderItemsParams(orderIdList); @@ -130,11 +109,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl orderItemsList) { - return baseMapper.insertBach(orderItemsList); - } - @Override public int checkOrderItemsPutOn(String orderCode) { return baseMapper.checkOrderItemsPutOn(orderCode); @@ -175,22 +149,11 @@ public class SaOrderItemsServiceImpl extends ServiceImpl selectByWaresCodeList(String orderCode) { return baseMapper.selectByWaresCodeList(orderCode); } - @Override - public int getRetailWaresQuantity(Long pkMember, List waresCodeList, Date payTime, List orderTypeList, Integer systemType) { - return baseMapper.getRetailWaresQuantity(pkMember, waresCodeList, payTime, orderTypeList, systemType); - } - @Override public BigDecimal getRetailWaresQuantityNew(Long pkMember, List waresCodeList, Date payTime, List orderTypeList, Integer systemType) { return baseMapper.getRetailWaresQuantityNew(pkMember, waresCodeList, payTime, orderTypeList, systemType); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 00bdaeaf..d50611bb 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -1715,16 +1715,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.querySeqList(param); } - @Transactional(rollbackFor = Exception.class) - @Override - public int insertBach(List orderList, List orderItemsList) { - int i = baseMapper.insertBach(orderList); - if (i > 0 && CollectionUtil.isNotEmpty(orderItemsList)) { - iSaOrderItemsService.insertBach(orderItemsList); - } - return i; - } - @Override public List checkMemberIsFirstOrder(List memberCodeList) { return baseMapper.checkMemberIsFirstOrder(memberCodeList); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml index f87658da..f8239c4f 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml @@ -660,16 +660,6 @@ and pk_order = #{pkId} and del_flag = 0 - - update SA_ORDER_ITEMS - set del_flag = 1, - pk_modified=#{pkApprove}, - modified_time=#{currentDate} - where del_flag = 0 and pk_id in - - #{item} - - - - - INSERT ALL - - into SA_ORDER_ITEMS ( - PK_ORDER, PK_PRODUCT, QUANTITY, PK_RATE, - PK_GRADE, PK_AWARDS, ORDER_STATUS, - SPECS_NAME, SPECS_NAME_ID, WARES_QUANTITY, - PK_CREATOR, CREATION_TIME, PK_COUNTRY - ) - values ( - #{item.pkOrder}, #{item.pkProduct}, #{item.quantity}, #{item.pkRate, jdbcType=NUMERIC}, - #{item.pkGrade}, #{item.pkAwards}, #{item.orderStatus}, - #{item.specsName}, #{item.specsNameId}, #{item.waresQuantity}, - #{item.pkCreator}, #{item.creationTime}, #{item.pkCountry} - ) - - SELECT 1 FROM dual - - - - - @@ -51,33 +37,19 @@ AND bse.NAME like '%' || #{name} || '%' + - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index 5098f3bc..840ea2f3 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -223,6 +223,10 @@ public class MemberMsgConstants { * 空单注册，导入的会员编号中存在重复 -- 会员编号存在重复 */ public static final String EMPTY_MEMBER_REPEAT = "会员编号存在重复"; + /** + * 空单注册，导入的会员联系方式中存在重复 -- 联系方式存在重复 + */ + public static final String EMPTY_PHONE_NOT = "联系方式存在重复"; /** * 空单注册，导入的会员编号中存在重复 -- 推荐编号不存在 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmpty.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmpty.java index 2f4091b4..767f96b6 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmpty.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmpty.java @@ -13,9 +13,6 @@ import lombok.experimental.Accessors; /** * 空单批次 - * - * @author hzs - * @since 2023-06-16 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmptyProduct.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmptyProduct.java index 9d919eac..91020bf9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmptyProduct.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmptyProduct.java @@ -11,9 +11,6 @@ import lombok.experimental.Accessors; /** * 空单批次明细产品 - * - * @author hzs - * @since 2023-08-28 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyDetailExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyDetailExt.java index 2f4608fa..be4c1b56 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyDetailExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyDetailExt.java @@ -4,14 +4,8 @@ import com.hzs.common.domain.member.empty.CuMemberEmptyDetail; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** - * @Description: 空单批次明细扩展类 - * @Author: jiang chao - * @Time: 2023/7/6 15:33 - * @Classname: CuMemberEmptyDetailExt - * @PackageName: com.hzs.common.domain.member.empty.ext + * 空单批次明细扩展类 */ @EqualsAndHashCode(callSuper = true) @Data @@ -55,27 +49,9 @@ public class CuMemberEmptyDetailExt extends CuMemberEmptyDetail { */ private String awardsVal; - /** - * 省名称 - */ - private String recProvinceVal; - /** - * 市名称 - */ - private String recCityVal; - /** - * 县名称 - */ - private String recCountyVal; - /** * 生成备注 */ private String remark; - /** - * 空单明细产品列表 - */ - private List productDTOList; - } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyProductDTO.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyProductDTO.java deleted file mode 100644 index 10168821..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyProductDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.common.domain.member.empty.ext; - -import lombok.Data; - -/** - * @Description: 空单批次明细产品展示 - * @Author: jiang chao - * @Time: 2023/8/30 10:44 - * @Classname: CuMemberEmptyProductOther - * @PackageName: com.hzs.common.domain.member.empty.ext - */ -@Data -public class CuMemberEmptyProductDTO { - - /** - * 产品ID - */ - private Integer pkProduct; - - /** - * 产品编号 - */ - private String productCode; - - /** - * 产品名称 - */ - private String productName; - - /** - * 产品规格名称 - */ - private String specsName; - - /** - * 产品规格ID - */ - private String specsNameId; - - /** - * 产品数量 - */ - private Integer quantity; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyProductExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyProductExt.java deleted file mode 100644 index 4c034340..00000000 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/ext/CuMemberEmptyProductExt.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.common.domain.member.empty.ext; - -import com.hzs.common.domain.member.empty.CuMemberEmptyProduct; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @Description: 空单明细产品扩展 - * @Author: jiang chao - * @Time: 2023/8/30 11:51 - * @Classname: CuMemberEmptyProductExtt - * @PackageName: com.hzs.common.domain.member.empty.ext - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class CuMemberEmptyProductExt extends CuMemberEmptyProduct { - - private static final long serialVersionUID = 2283368663097538169L; - - /** - * 产品名称 - */ - private String productName; - - /** - * 产品编码 - */ - private String productCode; - -} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouseAreaMiddle.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouseAreaMiddle.java index fced8773..244040d2 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouseAreaMiddle.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdStorehouseAreaMiddle.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 仓库地区中间表 - *

- * - * @author hzs - * @since 2023-05-05 */ @Data @EqualsAndHashCode(callSuper = true)