angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 支付回调处理188会员；

This commit is contained in:
cabbage 2025-07-21 14:15:52 +08:00
parent 3031d07218
commit be3ef1f01a
31 changed files with 140 additions and 837 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderParamDTO.java
View File

@ -186,26 +186,6 @@ public class OrderParamDTO implements Serializable {
*/
private String remark;
/**
* 配送中心
*/
private Integer deliveryCenter;
/**
* 配送省
*/
private Integer deliveryProvince;
/**
* 配送市
*/
private Integer deliveryCity;
/**
* 配送县
*/
private Integer deliveryCounty;
/**
* 发货方式
*/
@ -241,19 +221,6 @@ public class OrderParamDTO implements Serializable {
*/
private Integer specialArea;
/**
* 银行
*/
private Integer pkBank;
/**
* 支行名称
*/
private String subBankName;
/**
* 银行卡号
*/
private String cardNumber;
/**
* 会员店铺
*/
@ -299,10 +266,7 @@ public class OrderParamDTO implements Serializable {
private Integer displayDefault;
/**
* @Description: 验证保存的必输字段
* @return: List
* @Author: sui q
* @Date: 2022/8/29 11:10
* 验证保存的必输字段
*/
@JsonIgnore
public List<String> getValidSaveField() {

1
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -144,7 +144,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
customerList.add(ECustomerType.NORMAL.getValue());
// 2023.11.02 需求调整，首单校验时，空单也算
customerList.add(ECustomerType.EMPTY_ORDER.getValue());
customerList.add(ECustomerType.FANS.getValue());
queryWrapper.in(CuMember::getCustomerType, customerList);
Integer count = baseMapper.selectCount(queryWrapper);
return count == null ? 0 : count;

6
bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java
View File

@ -105,7 +105,7 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
}
// 用户未支付状态
if (ECustomerType.FANS.getValue() != member.getCustomerType() && EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
if (EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
recordLoginLog(null, EStatus.NO, username + " 登录用户不存在");
// 登录用户: %s 不存在
throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));
@ -195,7 +195,7 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
LoginMember loginMember = memberResult.getData();
CuMemberExt member = loginMember.getCuMember();
// 用户未支付状态
if (ECustomerType.FANS.getValue() != member.getCustomerType() && EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
if (EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
recordLoginLog(null, EStatus.NO, username + " 登录用户不存在");
// 登录用户: %s 不存在
throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));
@ -261,7 +261,7 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
CuMemberExt member = loginMember.getCuMember();
// 用户未支付状态
if (ECustomerType.FANS.getValue() != member.getCustomerType() && EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
if (EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
recordLoginLog(null, EStatus.NO, username + " 登录用户不存在", loginId, source);
// 登录用户: %s 不存在
throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));

33
bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/OrderParam.java
View File

@ -186,26 +186,6 @@ public class OrderParam implements Serializable {
*/
private String remark;
/**
* 配送中心
*/
private Integer deliveryCenter;
/**
* 配送省
*/
private Integer deliveryProvince;
/**
* 配送市
*/
private Integer deliveryCity;
/**
* 配送县
*/
private Integer deliveryCounty;
/**
* 发货方式
*/
@ -241,19 +221,6 @@ public class OrderParam implements Serializable {
*/
private Integer specialArea;
/**
* 银行
*/
private Integer pkBank;
/**
* 支行名称
*/
private String subBankName;
/**
* 银行卡号
*/
private String cardNumber;
/**
* 会员店铺
*/

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiFanSaOrderController.java
View File

@ -158,7 +158,7 @@ public class ApiFanSaOrderController extends ParentOrderController {
// 封装订单数据
SaOrderExt saOrder = new SaOrderExt();
saOrder.setOrderCode(orderCode);
// 188注册订单实际按复购订单来片
// 188注册订单实际按复购订单来算
saOrder.setOrderType(EOrderType.REPURCHASE_ORDER.getValue());
saOrder.setOrderTypeExtend(EOrderTypeExtend.REG_REP.getValue());
saOrder.setOrderAmount(orderAmount);

14
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderChargeLogMapper.java
View File

@ -10,9 +10,6 @@ import java.util.List;
/**
* 订单修改记录 Mapper 接口
*
* @author hzs
* @since 2023-02-01
*/
public interface SaOrderChargeLogMapper extends BaseMapper<SaOrderChargeLog> {
@ -59,17 +56,12 @@ public interface SaOrderChargeLogMapper extends BaseMapper<SaOrderChargeLog> {
* @return
*/
int checkOrderApprovalExistRemoveBusinessCode(@Param("typeList") List<Integer> typeList,
@Param("orderCodeList") List<String> orderCodeList,
@Param("pkCountry") Integer pkCountry, @Param("businessCode") String businessCode);
/**
* 查询撤单列表（弃用）
* @return
*/
List<SaOrderChargeLogExt> selectByOrderCharge(SaOrderChargeLogParam orderChargeLogParam);
@Param("orderCodeList") List<String> orderCodeList,
@Param("pkCountry") Integer pkCountry, @Param("businessCode") String businessCode);
/**
* 撤单列表
*
* @param orderChargeLogParam
* @return
*/

35
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderParam.java
View File

@ -193,26 +193,6 @@ public class OrderParam implements Serializable {
*/
private String remark;
/**
* 配送中心
*/
private Integer deliveryCenter;
/**
* 配送省
*/
private Integer deliveryProvince;
/**
* 配送市
*/
private Integer deliveryCity;
/**
* 配送县
*/
private Integer deliveryCounty;
/**
* 发货方式
*/
@ -248,19 +228,6 @@ public class OrderParam implements Serializable {
*/
private Integer specialArea;
/**
* 银行
*/
private Integer pkBank;
/**
* 支行名称
*/
private String subBankName;
/**
* 银行卡号
*/
private String cardNumber;
/**
* 会员店铺
*/
@ -297,7 +264,7 @@ public class OrderParam implements Serializable {
private Boolean isEnough = false;
/**
* 是否海粉订单
* 是否海粉订单 -- 现用于188注册转复购会员处理
*/
@JsonIgnore
private Boolean isHaiFun = false;

35
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderReturn.java
View File

@ -212,26 +212,6 @@ public class OrderReturn implements Serializable {
*/
private String remark;
/**
* 配送中心
*/
private Integer deliveryCenter;
/**
* 配送省
*/
private Integer deliveryProvince;
/**
* 配送市
*/
private Integer deliveryCity;
/**
* 配送县
*/
private Integer deliveryCounty;
/**
* 发货方式
*/
@ -263,21 +243,6 @@ public class OrderReturn implements Serializable {
private String specialAreaVal;
/**
* 银行
*/
private Integer pkBank;
/**
* 支行名称
*/
private String subBankName;
/**
* 银行卡号
*/
private String cardNumber;
/**
* 登录密码明文
*/

14
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderChargeLogService.java
View File

@ -10,9 +10,6 @@ import java.util.Map;
/**
* 订单修改记录 服务类
*
* @author hzs
* @since 2023-02-01
*/
public interface ISaOrderChargeLogService extends IService<SaOrderChargeLog> {
@ -41,19 +38,14 @@ public interface ISaOrderChargeLogService extends IService<SaOrderChargeLog> {
* @param typeList 业务类型列表
* @param orderCodeList 订单编号列表
* @param pkCountry 所属国家
* @param businessCode 单据编号
* @param businessCode 单据编号
* @return
*/
int checkOrderApprovalExist(List<Integer> typeList, List<String> orderCodeList, Integer pkCountry, String ... businessCode);
/**
* 查询撤单列表（弃用）
* @return
*/
List<SaOrderChargeLogExt> selectByOrderCharge(SaOrderChargeLogParam orderChargeLogParam);
int checkOrderApprovalExist(List<Integer> typeList, List<String> orderCodeList, Integer pkCountry, String... businessCode);
/**
* 撤单列表
*
* @param orderChargeLogParam
* @return
*/

22
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderChargeLogServiceImpl.java
View File

@ -14,9 +14,6 @@ import java.util.Map;
/**
* 订单修改记录 服务实现类
*
* @author hzs
* @since 2023-02-01
*/
@Service
public class SaOrderChargeLogServiceImpl extends ServiceImpl<SaOrderChargeLogMapper, SaOrderChargeLog> implements ISaOrderChargeLogService {
@ -48,27 +45,14 @@ public class SaOrderChargeLogServiceImpl extends ServiceImpl<SaOrderChargeLogMap
}
@Override
public int checkOrderApprovalExist(List<Integer> typeList, List<String> orderCodeList, Integer pkCountry, String ... businessCode) {
if(businessCode != null && businessCode.length >0){
public int checkOrderApprovalExist(List<Integer> typeList, List<String> orderCodeList, Integer pkCountry, String... businessCode) {
if (businessCode != null && businessCode.length > 0) {
return baseMapper.checkOrderApprovalExistRemoveBusinessCode(typeList, orderCodeList, pkCountry, businessCode[0]);
}else {
} else {
return baseMapper.checkOrderApprovalExist(typeList, orderCodeList, pkCountry);
}
}
/**
* 查询撤单列表（弃用）
* @return
*/
@Override
public List<SaOrderChargeLogExt> selectByOrderCharge(SaOrderChargeLogParam orderChargeLogParam) {
return baseMapper.selectByOrderCharge(orderChargeLogParam);
}
/**
* 撤单列表
* @param orderChargeLogParam
* @return
*/
@Override
public List<SaOrderChargeLogExt> cancellationList(SaOrderChargeLogParam orderChargeLogParam) {
return baseMapper.cancellationList(orderChargeLogParam);

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java
View File

@ -144,7 +144,7 @@ public class SaOrderHandle {
.build();
// 海粉没有安置人安置位置
if (orderParam.getIsHaiFun()) {
cuMember.setCustomerType(ECustomerType.FANS.getValue());
cuMember.setCustomerType(ECustomerType.NORMAL.getValue());
if (null != orderParam.getPlaceParentId()) {
cuMember.setPkPlaceParent(orderParam.getPlaceParentId());
}

88
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -775,8 +775,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
/**
* 尝试重新换位置
*
* @param newCuMember 修改的会员
* 尝试重新换位置
*/
private synchronized CuMember repeatTry(CuMember newCuMember, Boolean isFirstAchieve) {
CuMember cuMember = obtainLastResettleByRecommend(newCuMember, isFirstAchieve, null);
@ -815,8 +816,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
/**
* 销售订单更改状态为待支付
*
* @param saOrderExt 销售订单
* 销售订单更改状态为待支付
*/
public void encapsulationSaOrder(SaOrderExt saOrderExt) {
saOrderExt.setPayTime(new Date());
@ -1827,43 +1829,45 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (StringUtils.isEmpty(orderCode)) {
return Boolean.FALSE;
}
log.info("在线支付回调接受的参数pkMember:{}, orderCode:{}!", pkMember, orderCode);
log.info("在线支付回调接受的参数, pkMember:{}, orderCode:{}!", pkMember, orderCode);
SaOrder querySaOrder = SaOrder.builder().orderStatus(EOrderStatus.WAIT_PAY.getValue()).orderCode(orderCode).build();
SaOrderExt saOrderExt = querySaleOrderExtByOrderCode(querySaOrder, null);
if (saOrderExt == null) {
saOrderExt = redisService.getCacheObject(CacheConstants.TEMP_ORDER + pkMember + orderCode);
if (saOrderExt == null) {
// 订单已经不存在
log.warn("在线支付回调,订单已经不存在");
return Boolean.FALSE;
}
}
log.info("在线支付回调接受的参数1: {}", saOrderExt);
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// 注册订单
if (saOrderExt.getPkCreator().equals(saOrderExt.getPkMember())) {
// 自注册分享订单
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
payShareSaOrder(saOrderExt);
return Boolean.TRUE;
}
} else if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()) {
// 复购订单
// 判断是否消费过生成了会员
CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember());
if (cuMember == null) {
// 自注册分享订单
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
payShareSaOrder(saOrderExt);
return Boolean.TRUE;
}
}
log.info("在线支付回调接受的参数2");
log.info("在线支付回调接受的参数, order : {}", saOrderExt);
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
// if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// // 注册订单
// if (saOrderExt.getPkCreator().equals(saOrderExt.getPkMember())) {
// // 自注册分享订单
// payShareSaOrder(saOrderExt);
// return Boolean.TRUE;
// }
// } else if (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType()) {
// // 复购订单
// // 判断是否消费过生成了会员
// CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember());
// if (cuMember == null) {
// // 自注册分享订单
// payShareSaOrder(saOrderExt);
// return Boolean.TRUE;
// }
// }
CuMember newCuMember = null;
if (saOrderExt.getPkMember() != null) {
newCuMember = getCuMemberByKey(saOrderExt.getPkMember());
}
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()
|| EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// 注册订单
boolean isToBePay = getIsToBePayByOrderType(saOrderExt.getPkCountry(), saOrderExt.getOrderType());
OrderParam orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + pkMember + orderCode);
if (newCuMember == null && !isToBePay) {
@ -1873,22 +1877,42 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (newCuMember == null) {
throw new RuntimeException("生成会员失败");
}
// 注册订单
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
payRegSaOrder(saOrderExt, newCuMember, null, Boolean.FALSE);
} else if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
log.info("在线支付回调接受的参数saOrderExt:{}!", JSONUtil.toJsonStr(saOrderExt));
// 升级订单
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
payUpgradeSaOrder(saOrderExt, null);
} else {
// 其他订单
log.info("在线支付回调其它订单参数saOrderExt:{}!!!", saOrderExt);
saOrderExt.setPayType(EOrderPayType.ONLINE.getValue());
payRepurchaseSaOrder(saOrderExt, null);
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
&& EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) {
// 188分享订单，复购订单 扩展类型为 注册转复购
OrderParam orderParam = redisService.getCacheObject(CacheConstants.TEMP_PARAM + pkMember + orderCode);
orderParam.setIsHaiFun(Boolean.TRUE);
newCuMember = packageCuMember(orderParam);
// 会员ID已经提前生成，此处直接使用
if (null != orderParam.getPkMemberId()) {
newCuMember.setPkId(orderParam.getPkMemberId());
newCuMember.setPkCenterCode(null);
}
saOrderExt = packageSaOrder(orderParam, newCuMember);
// 会员ID已经提前生成，此处直接使用
if (null != orderParam.getPkMemberId()) {
saOrderExt.setPkCreator(orderParam.getPkMemberId());
saOrderExt.setOrderCode(orderParam.getOrderCode());
}
if (newCuMember == null) {
throw new RuntimeException("生成会员失败");
}
payRegSaOrder(saOrderExt, newCuMember, null, Boolean.TRUE);
} else {
payRepurchaseSaOrder(saOrderExt, null);
}
}
log.info("在线支付回调成功，返回{}", Boolean.TRUE);
log.info("在线支付回调成功，返回 {}", Boolean.TRUE);
return Boolean.TRUE;
}

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/mapper/BdProductExtendMapper.java
View File

@ -7,11 +7,9 @@ import org.apache.ibatis.annotations.Param;
/**
* 商品拓展表 Mapper 接口
*
* @author hzs
* @since 2022-09-01
*/
public interface BdProductExtendMapper extends BaseMapper<BdProductExtend> {
/**
* 根据产品id查询产品拓展
*

7
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/IBdProductExtendService.java
View File

@ -5,12 +5,7 @@ import com.hzs.common.domain.sale.ext.BdProductExtendExt;
import com.hzs.common.domain.sale.product.BdProductExtend;
/**
* <p>
* 商品拓展表 服务类
* </p>
*
* @author hzs
* @since 2022-09-01
*/
public interface IBdProductExtendService extends IService<BdProductExtend> {
@ -20,7 +15,7 @@ public interface IBdProductExtendService extends IService<BdProductExtend> {
* @param productId
* @return
*/
public BdProductExtend getProductExtend(Integer productId);
BdProductExtend getProductExtend(Integer productId);
/**
* 根据产品id 查找当前商品的上一位商品排序

38
bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/service/impl/BdProductExtendServiceImpl.java
View File

@ -11,12 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* <p>
* 商品拓展表 服务实现类
* </p>
*
* @author hzs
* @since 2022-09-01
*/
@Service
public class BdProductExtendServiceImpl extends ServiceImpl<BdProductExtendMapper, BdProductExtend> implements IBdProductExtendService {
@ -24,12 +19,6 @@ public class BdProductExtendServiceImpl extends ServiceImpl<BdProductExtendMappe
@Autowired
private RedisService redisService;
/**
* 根据产品id查询产品拓展
*
* @param productId
* @return
*/
@Override
public BdProductExtend getProductExtend(Integer productId) {
BdProductExtend productExtend = redisService.getCacheObject(CacheConstants.BD_PRODUCT_EXTEND + productId);
@ -42,53 +31,26 @@ public class BdProductExtendServiceImpl extends ServiceImpl<BdProductExtendMappe
return productExtend;
}
/**
* 根据产品id 查找当前商品的上一位商品排序
*
* @param productId
* @return
*/
@Override
public Integer selectByMoveUpSort(Integer productId) {
return baseMapper.selectByMoveUpSort(productId);
}
/**
* 大于传入编号的全部上移1
*
* @param sort
*/
@Override
public void updateMoveUpBySort(Integer sort) {
baseMapper.updateMoveUpBySort(sort);
}
/**
* 根据id 查询当前商品的下一位商品排序
*
* @param productId
* @return
*/
@Override
public Integer selectByMoveDownSort(Integer productId) {
return baseMapper.selectByMoveDownSort(productId);
}
/**
* 大于传入编号的全部下移1
*
* @param sort
*/
@Override
public void updateMoveDownBySort(Integer sort) {
baseMapper.updateMoveDownBySort(sort);
}
/**
* 查询排序最大值
*
* @return
*/
@Override
public Integer getMaxProductSort() {
return baseMapper.getMaxProductSort();

33
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresExtendMapper.java
View File

@ -1,6 +1,5 @@
package com.hzs.sale.wares.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.sale.wares.BdWaresExtend;
import com.hzs.sale.order.vo.WaresPreSaleVo;
@ -11,44 +10,26 @@ import java.util.Date;
import java.util.List;
/**
* <p>
* 商品发布扩展表 Mapper 接口
* </p>
*
* @author hzs
* @since 2022-09-09
*/
public interface BdWaresExtendMapper extends BaseMapper<BdWaresExtend> {
/**
* 修改销量
* @param waresNumberParam
*
* @param pkWares
* @param number
*/
void updateWaresSalesAccrual(@Param("pkWares") Integer pkWares,@Param("number") Integer number);
/**
* 修改上下架时间
* @param waresId
*/
void updatePutOnTime(@Param("waresId") Integer waresId);
/**
* 修改上下架时间
* @param waresId
*/
void updatePutOffTime(Integer waresId);
/**
* 根据商品id修改拓展表（可以赋值空值）
* @param waresExtend
*/
void updateByPkWares(BdWaresExtend waresExtend);
void updateWaresSalesAccrual(@Param("pkWares") Integer pkWares, @Param("number") Integer number);
/**
* 设置上下架时间
*
* @param waresId
* @param putOnTime
* @param putOffTime
*/
void updatePutOnTimeAndPutOffTimeByWaresId(@Param("waresId") Integer waresId,@Param("putOnTime") Date putOnTime,@Param("putOffTime") Date putOffTime);
void updatePutOnTimeAndPutOffTimeByWaresId(@Param("waresId") Integer waresId, @Param("putOnTime") Date putOnTime, @Param("putOffTime") Date putOffTime);
/**
* 根据商品编号查询 每个商品所剩余的预售数量

11
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresSpecsRelationMapper.java
View File

@ -9,11 +9,9 @@ import java.util.List;
/**
* 规格明细值 Mapper 接口
*
* @author hzs
* @since 2022-09-09
*/
public interface BdWaresSpecsRelationMapper extends BaseMapper<BdWaresSpecsRelation> {
/**
* 查询产品规格
*
@ -24,9 +22,14 @@ public interface BdWaresSpecsRelationMapper extends BaseMapper<BdWaresSpecsRelat
/**
* 查询规格明细值
*
* @param pkWares
* @param pkProduct
* @return
*/
List<BdWaresSpecsRelationExt> getWaresProduct(@Param("pkWares") Integer pkWares,@Param("pkProduct") Integer pkProduct,@Param("pkWaresSpecsSku") Integer pkWaresSpecsSku,@Param("waresSpecsIds") List<Integer> waresSpecsIds);
List<BdWaresSpecsRelationExt> getWaresProduct(@Param("pkWares") Integer pkWares,
@Param("pkProduct") Integer pkProduct,
@Param("pkWaresSpecsSku") Integer pkWaresSpecsSku,
@Param("waresSpecsIds") List<Integer> waresSpecsIds);
}

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresSpecsSkuParam.java
View File

@ -1,21 +1,7 @@
package com.hzs.sale.wares.param;/**
* @Description:
* @Author: yuhui
* @Time: 2023/6/15 10:41
* @Classname: WaresSpecsSkuParam
* @PackageName: com.hzs.sale.wares.param
*/
package com.hzs.sale.wares.param;
import lombok.Data;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.sale.wares.param
*@Author: yh
*@CreateTime: 2023-06-15 10:41
*@Description: TODO
*@Version: 1.0
*/
@Data
public class WaresSpecsSkuParam {

28
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresExtendService.java
View File

@ -1,6 +1,5 @@
package com.hzs.sale.wares.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.sale.wares.BdWaresExtend;
import com.hzs.sale.order.param.WaresNumberParam;
@ -11,41 +10,20 @@ import java.util.Date;
import java.util.List;
/**
* <p>
* 商品发布扩展表 服务类
* </p>
*
* @author hzs
* @since 2022-09-09
*/
public interface IBdWaresExtendService extends IService<BdWaresExtend> {
/**
* 修改销量
*
* @param waresNumberParamList
*/
void updateWaresSalesAccrual( List<WaresNumberParam> waresNumberParamList);
/**
* 修改上下架时间
* @param waresId
*/
void updatePutOnTime( Integer waresId);
/**
* 修改上下架时间
* @param waresId
*/
void updatePutOffTime(Integer waresId);
/**
* 根据商品id修改拓展表（可以赋值空值）
* @param waresExtend
*/
void updateByPkWares(BdWaresExtend waresExtend);
void updateWaresSalesAccrual(List<WaresNumberParam> waresNumberParamList);
/**
* 设置上下架时间
*
* @param waresId
* @param putOnTime
* @param putOffTime

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java
View File

@ -25,9 +25,11 @@ public interface IBdWaresService extends IService<BdWares> {
/**
* 获取最大排序值
*
* @return
*/
int getMaxSortNum();
/**
* 新增商品基础信息
*

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresSpecsRelationService.java
View File

@ -8,9 +8,6 @@ import java.util.List;
/**
* 规格明细值 服务类
*
* @author hzs
* @since 2022-09-09
*/
public interface IBdWaresSpecsRelationService extends IService<BdWaresSpecsRelation> {
@ -24,10 +21,11 @@ public interface IBdWaresSpecsRelationService extends IService<BdWaresSpecsRelat
/**
* 查询规格明细值
*
* @param pkWares
* @param pkProduct
* @param pkWaresSpecsSku
* @return
*/
List<BdWaresSpecsRelationExt> getWaresProduct(Integer pkWares, Integer pkProduct,Integer pkWaresSpecsSku,List<Integer> waresSpecsIds);
List<BdWaresSpecsRelationExt> getWaresProduct(Integer pkWares, Integer pkProduct, Integer pkWaresSpecsSku, List<Integer> waresSpecsIds);
}

57
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresExtendServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.hzs.sale.wares.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.domain.sale.wares.BdWaresExtend;
import com.hzs.sale.order.param.WaresNumberParam;
@ -14,77 +13,33 @@ import java.util.Date;
import java.util.List;
/**
* <p>
* 商品发布扩展表 服务实现类
* </p>
*
* @author hzs
* @since 2022-09-09
*/
@Service
public class BdWaresExtendServiceImpl extends ServiceImpl<BdWaresExtendMapper, BdWaresExtend> implements IBdWaresExtendService {
/**
* 修改销量
* @param waresNumberParamList
*/
@Override
public void updateWaresSalesAccrual(List<WaresNumberParam> waresNumberParamList) {
if (waresNumberParamList != null && waresNumberParamList.size() > 0){
if (waresNumberParamList != null && waresNumberParamList.size() > 0) {
for (WaresNumberParam waresNumberParam : waresNumberParamList) {
Integer pkWares = waresNumberParam.getPkWares();
Integer number = waresNumberParam.getNumber();
if (number == null){
if (number == null) {
number = 0;
}
baseMapper.updateWaresSalesAccrual(pkWares,number);
baseMapper.updateWaresSalesAccrual(pkWares, number);
}
}
}
/**
* 修改上下架时间
* @param waresId
*/
@Override
public void updatePutOnTime(Integer waresId) {
baseMapper.updatePutOnTime(waresId);
}
/**
* 修改上下架时间
* @param waresId
*/
@Override
public void updatePutOffTime(Integer waresId) {
baseMapper.updatePutOffTime(waresId);
}
/**
* 根据商品id修改拓展表（可以赋值空值）
* @param waresExtend
*/
@Override
public void updateByPkWares(BdWaresExtend waresExtend) {
baseMapper.updateByPkWares(waresExtend);
}
/**
* 设置上下架时间
* @param waresId
* @param putOnTime
* @param putOffTime
*/
@Override
public void updatePutOnTimeAndPutOffTimeByWaresId(Integer waresId, Date putOnTime, Date putOffTime) {
baseMapper.updatePutOnTimeAndPutOffTimeByWaresId( waresId, putOnTime, putOffTime);
baseMapper.updatePutOnTimeAndPutOffTimeByWaresId(waresId, putOnTime, putOffTime);
}
/**
* 根据商品编号查询 每个商品所剩余的预售数量
* @param waresCodeList
* @param specialArea
* @return
*/
@Override
public List<WaresPreSaleVo> selectByWaresCodeList(Collection<String> waresCodeList, Integer specialArea) {
return baseMapper.selectByWaresCodeList(waresCodeList, specialArea);
}
}

85
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java
View File

@ -36,7 +36,6 @@ import com.hzs.sale.wares.mapper.BdWaresMapper;
import com.hzs.sale.wares.service.*;
import com.hzs.sale.wares.vo.*;
import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.ITransactionServiceApi;
import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.config.IAwardsServiceApi;
import com.hzs.system.config.ILabelServiceApi;
@ -106,16 +105,14 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
IAwardsServiceApi iAwardsServiceApi;
@DubboReference
IRangeServiceApi iRangeServiceApi;
@DubboReference
ITransactionServiceApi iTransactionServiceApi;
@Override
public int getMaxSortNum() {
Integer maxSort = this.getMaxSort(SecurityUtils.getPkCountry());
if(ObjectUtil.isNotEmpty(maxSort)){
if (ObjectUtil.isNotEmpty(maxSort)) {
return maxSort + 1;
}
return 1;
return 1;
}
@Override
@ -124,9 +121,7 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
// 设置 wares 对象的值
BdWares wares = BeanUtil.copyProperties(waresParams, BdWares.class);
wares.setPkId(waresParams.getWaresId());
R<Integer> transaction = iTransactionServiceApi.createTransaction(user.getDataCountry(), ETransactionKey.SPEC, waresParams.getWaresName(), EYesNo.NO, EYesNo.NO);
wares.setWaresCode(waresParams.getWaresCode());
wares.setPkTransaction(transaction.getData());
wares.setPkCreator(user.getUserId());
wares.setPkCountry(user.getDataCountry());
wares.setDelFlag(EDelFlag.UN_DELETE.getValue());
@ -234,40 +229,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
return wares;
}
/**
* 计算商品极差
*
* @return
*/
private List<WaresRangeParams> computeWaresRange(List<WaresSpecsSkuParams> waresSpecsSkuList) {
R<List<BdRangeExt>> rangeDto = iRangeServiceApi.queryRange(SecurityUtils.getPkCountry());
List<BdRangeExt> rangeList = rangeDto.getData();
List<WaresRangeParams> waresRangeParamsList = new ArrayList<>();
for (WaresSpecsSkuParams waresSpecsSkuParams : waresSpecsSkuList) {
List<ComputeWaresPrice> computeWaresPriceList = new ArrayList<>();
ComputeWaresPrice computeWaresPrice = new ComputeWaresPrice();
computeWaresPrice.setProductPrice(waresSpecsSkuParams.getProductPrice());
computeWaresPrice.setProductPv(waresSpecsSkuParams.getProductAchieve());
computeWaresPrice.setProductBv(waresSpecsSkuParams.getAssAchieve());
computeWaresPrice.setPkProduct(waresSpecsSkuParams.getPkProduct());
computeWaresPriceList.add(computeWaresPrice);
List<ComputeWaresPrice> computeWaresPrices = this.computeWaresPrice(computeWaresPriceList, rangeList);
for (ComputeWaresPrice waresPrice : computeWaresPrices) {
for (RangePriceVo rangePriceVo : waresPrice.getRangePriceVoList()) {
WaresRangeParams waresRangeParams = new WaresRangeParams();
waresRangeParams.setPkRange(rangePriceVo.getPkRange());
waresRangeParams.setPkProduct(rangePriceVo.getPkProduct());
waresRangeParams.setPrice(rangePriceVo.getPrice());
waresRangeParams.setAchieve(rangePriceVo.getAchieve());
waresRangeParams.setAssAchieve(rangePriceVo.getAssAchieve());
waresRangeParams.setWaresSpecsList(waresSpecsSkuParams.getWaresSpecsList());
waresRangeParamsList.add(waresRangeParams);
}
}
}
return waresRangeParamsList;
}
/**
* 所有标签生成记录
*
@ -585,8 +546,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
public void updateWares(WaresParams waresParams, LoginUser user) {
BdWares wares = BeanUtil.copyProperties(waresParams, BdWares.class);
wares.setPkId(waresParams.getWaresId());
R<Integer> transaction = iTransactionServiceApi.createTransaction(user.getDataCountry(), ETransactionKey.SPEC, waresParams.getWaresName(), EYesNo.NO, EYesNo.NO);
wares.setPkTransaction(transaction.getData());
if (waresParams.getIsPutOn().equals(EYesNo.YES.getIntValue())) {
wares.setListingTime(DateUtils.currentDateTime());
}
@ -648,18 +607,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
// 团队配置
saveWaresAuthority(wares, waresParams.getWaresAuthorityList(), user);
// 生成 极差配置
// if (waresParams.getWaresSpecsSkuList().size() > 0){
// if (waresParams.getSpecialArea().equals(ESpecialArea.REPURCHASE_AREA.getValue()) ||
// waresParams.getSpecialArea().equals(ESpecialArea.CLOUD_COLLEGE_ORDER.getValue()) ||
// waresParams.getSpecialArea().equals(ESpecialArea.LIVE_BROADCAST.getValue()) ||
// waresParams.getSpecialArea().equals(ESpecialArea.COOPERATE_AREA.getValue()) ||
// waresParams.getSpecialArea().equals(ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue())
// ){
// List<WaresRangeParams> waresRangeParamsList = computeWaresRange(waresParams.getWaresSpecsSkuList());
// saveWaresRange(wares,waresRangeParamsList, user);
// }
// }
saveWaresRange(wares, waresParams.getWaresRangeList(), user);
// 产品包装新增
@ -1241,8 +1188,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
wsList.add(waresExt);
}
// //商品区域图片轮播
// List<WaresCoverInfoVo> waresCoverInfoVoList = new ArrayList<>();
// 推荐商品展示
List<WaresVo> waresVoList = new ArrayList<>();
List<BdWaresRange> bdWaresRangeList = new ArrayList<>();
@ -1251,29 +1196,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
}
for (BdWaresExt bdWares : wsList) {
// WaresCoverInfoVo waresCoverInfoVo = new WaresCoverInfoVo();
// waresCoverInfoVo.setCover(bdWares.getCover1());
// List<String> coverList = new ArrayList<>();
// if (StringUtils.isNotBlank(bdWares.getCover1())) {
// coverList.add(bdWares.getCover1());
// }
// if (StringUtils.isNotBlank(bdWares.getCover2())) {
// coverList.add(bdWares.getCover2());
// }
// if (StringUtils.isNotBlank(bdWares.getCover3())) {
// coverList.add(bdWares.getCover3());
// }
// if (StringUtils.isNotBlank(bdWares.getCover4())) {
// coverList.add(bdWares.getCover4());
// }
// if (StringUtils.isNotBlank(bdWares.getCover5())) {
// coverList.add(bdWares.getCover5());
// }
// if (StringUtils.isNotBlank(bdWares.getCover6())) {
// coverList.add(bdWares.getCover6());
// }
// waresCoverInfoVo.setCoverList(coverList);
// waresCoverInfoVoList.add(waresCoverInfoVo);
Boolean isShow = waresShowMap.get(bdWares.getPkId());
if (isShow == null || isShow) {
// 商品信息填充
@ -1319,11 +1241,9 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
}
}
recommendWaresInfoVo.setWaresVoList(waresVoList);
// recommendWaresInfoVo.setWaresCoverInfoList(waresCoverInfoVoList);
return recommendWaresInfoVo;
}
@Override
public RecommendWaresInfoVo listWares(Integer pkCountry, Long userId, Map<Integer, Boolean> waresShowMap) {
// 登录用户
@ -1638,7 +1558,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
@Override
public List<BdWaresExt> listWares(IndexWaresParam param) {
return baseMapper.listWaresNew(param);
}
}

20
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsRelationServiceImpl.java
View File

@ -15,21 +15,13 @@ import java.util.concurrent.TimeUnit;
/**
* 规格明细值 服务实现类
*
* @author hzs
* @since 2022-09-09
*/
@Service
public class BdWaresSpecsRelationServiceImpl extends ServiceImpl<BdWaresSpecsRelationMapper, BdWaresSpecsRelation> implements IBdWaresSpecsRelationService {
@Autowired
private RedisService redisService;
/**
* 查询产品规格
*
* @param pkWaresSpecsSku
* @return
*/
@Override
public List<BdWaresSpecsRelationExt> selectByWaresSpecsSku(Integer pkWaresSpecsSku) {
String redisKey = CacheConstants.BD_WARES_SPECS_RELATION + pkWaresSpecsSku;
@ -43,15 +35,9 @@ public class BdWaresSpecsRelationServiceImpl extends ServiceImpl<BdWaresSpecsRel
return waresSpecsRelationExt;
}
/**
* 查询规格明细值
* @param pkWares
* @param pkProduct
* @return
*/
@Override
public List<BdWaresSpecsRelationExt> getWaresProduct(Integer pkWares, Integer pkProduct,Integer pkWaresSpecsSku,List<Integer> waresSpecsIds) {
return baseMapper.getWaresProduct(pkWares,pkProduct,pkWaresSpecsSku,waresSpecsIds);
public List<BdWaresSpecsRelationExt> getWaresProduct(Integer pkWares, Integer pkProduct, Integer pkWaresSpecsSku, List<Integer> waresSpecsIds) {
return baseMapper.getWaresProduct(pkWares, pkProduct, pkWaresSpecsSku, waresSpecsIds);
}
}

197
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderChargeLogMapper.xml
View File

@ -19,7 +19,6 @@
<result column="BUSINESS_CODE" property="businessCode"/>
<result column="REMARK" property="remark"/>
<result column="SOURCE" property="source"/>
</resultMap>
<!-- 查询订单以及修改次数 -->
@ -82,206 +81,17 @@
</foreach>
)
</sql>
<!-- 订单审批是否进行中 -->
<select id="checkOrderApprovalExist" resultType="int">
<include refid="checkOrderApproval"></include>
</select>
<select id="checkOrderApprovalExistRemoveBusinessCode" resultType="java.lang.Integer">
<include refid="checkOrderApproval"></include>
and business_code != #{businessCode}
</select>
<select id="selectByOrderCharge" resultType="com.hzs.common.domain.sale.ext.SaOrderChargeLogExt">
select
ocl.CREATION_TIME cancelOrderTime,ocl.CHARGE_TYPE chargeType,ocl.PK_ORDER pkOrder,so.ORDER_CODE orderCode,so.ORDER_TYPE orderType,cm.MEMBER_NAME memberName ,cm.MEMBER_CODE memberCode,
cm.CUSTOMER_TYPE customerType,cm.PHONE phone,cm.PK_PARENT pkParent,cm.PK_PLACE_PARENT pkPlaceParent,cm.PK_CENTER_CODE pkCenterCode,
so.ORDER_AMOUNT orderAmount,so.ORDER_ACHIEVE orderAchieve,so.PK_RATE pkRate,so.PK_VERTEX pkVertex,cm.PK_TEAM_CODE pkTeamCode,
so.REC_NAME recName,so.REC_PHONE recPhone,so.REC_PROVINCE recProvince ,so.REC_CITY recCity,so.REC_COUNTY recCounty,so.REC_ADDRESS recAddress,
so.POSTAGE postage,so.ORDER_STATUS orderStatus,so.CREATION_TIME creationTime,so.PAY_TIME payTime,so.DELIVERY_WAY deliveryWay,so.TRAN_TYPE tranType,
so.PAY_TYPE payType,ocl.PK_CREATOR pkCreator,ocl.APPROVAL_STATUS approvalStatus,
(select ab.APPROVAL_CODE from SYS_APPROVAL_BUSINESS ab where ab.BUSINESS_CODE = ocl.BUSINESS_CODE and ab.APPROVAL_BUSINESS = ocl.CHARGE_TYPE) approvalCode,
su.USER_NAME lastInstanceApprover,ocl.MODIFIED_TIME lastInstanceDate ,ocl.REMARK lastInstanceRemark,bc.IN_EXCHANGE_RATE inExchangeRate,cm.PLACE_DEPT placeDept,
s.USER_NAME cancelTheOrderName
from SA_ORDER_CHARGE_LOG ocl
left join SA_ORDER so on so.PK_ID = ocl.PK_ORDER
left join CU_MEMBER cm on cm.PK_ID = so.PK_MEMBER
left join SYS_USER su on su.USER_ID = ocl.PK_MODIFIED
left join BD_CURRENCY bc on bc.PK_ID = so.PK_RATE
left join sys_user s on s.USER_ID = ocl.PK_CREATOR
where 1 = 1 and ocl.DEL_FLAG = 0 and (ocl.CHARGE_TYPE = 233 or ocl.CHARGE_TYPE = 234)
<if test="approvalCode != null and approvalCode != ''">
and (select count(ab.PK_ID) from SYS_APPROVAL_BUSINESS ab where ab.APPROVAL_BUSINESS = ocl.CHARGE_TYPE and ab.BUSINESS_CODE = ocl.BUSINESS_CODE and ab.APPROVAL_CODE = #{approvalCode}) > 0
</if>
<if test="orderCode != null and orderCode != ''">
and so.ORDER_CODE = #{orderCode}
</if>
<if test="memberName != null and memberName != ''">
and cm.MEMBER_NAME = #{memberName}
</if>
<if test="memberCode != null and memberCode != ''">
and cm.MEMBER_CODE = #{memberCode}
</if>
<if test="phone != null and phone != ''">
and cm.PHONE = #{phone}
</if>
<if test="tranType != null">
and so.TRAN_TYPE = #{tranType}
</if>
<if test="payType != null">
and so.PAY_TYPE = #{payType}
</if>
<if test="pkVertex != null">
and so.PK_VERTEX = #{pkVertex}
</if>
<if test="pkTeamCode != null">
and cm.PK_TEAM_CODE = #{pkTeamCode}
</if>
<if test="creatorName != null and creatorName != ''">
and (select count(su.USER_ID) from SYS_USER su where ocl.PK_CREATOR = su.USER_ID and su.NICK_NAME = #{creatorName}) > 0
</if>
<if test="parentName != null and parentName != ''">
and (select count(me.PK_ID) from CU_MEMBER me where me.PK_PARENT = cm.PK_PARENT and me.MEMBER_NAME = #{parentName}) > 0
</if>
<if test="parentCode != null and parentCode != ''">
and (select count(me.PK_ID) from CU_MEMBER me where me.PK_PARENT = cm.PK_PARENT and me.MEMBER_CODE = #{parentCode}) > 0
</if>
<if test="placeParentName != null and placeParentName != ''">
and (select count(me.PK_ID) from CU_MEMBER me where me.PK_PLACE_PARENT = cm.PK_PLACE_PARENT and me.MEMBER_NAME = #{placeParentName}) > 0
</if>
<if test="placeParentCode != null and placeParentCode != ''">
and (select count(me.PK_ID) from CU_MEMBER me where me.PK_PARENT = cm.PK_PARENT and me.MEMBER_CODE = #{placeParentCode}) > 0
</if>
<if test="pkCenterCode != null and pkCenterCode != ''">
and (select count(me.PK_ID) from CU_MEMBER me where me.pkCenterCode = cm.pkCenterCode and me.MEMBER_CODE = #{pkCenterCode}) > 0
</if>
<if test="pkCenterName != null and pkCenterName != ''">
and (select count(me.PK_ID) from CU_MEMBER me where me.pkCenterCode = cm.pkCenterCode and me.MEMBER_NAME = #{pkCenterName}) > 0
</if>
<if test="pkCountry != null">
and so.PK_COUNTRY = #{pkCountry}
</if>
<if test="orderType != null">
and so.ORDER_TYPE = #{orderType}
</if>
<if test="deliveryWay != null">
and so.DELIVERY_WAY = #{deliveryWay}
</if>
<if test="orderStatus != null">
and so.ORDER_STATUS = #{orderStatus}
</if>
<if test="operateScope != null">
and (
select
count(oi.PK_ID)
from sa_order_items oi
left join BD_WARES_EXTEND bw on bw.PK_WARES = oi.PK_WARES
where oi.PK_ORDER = ocl.PK_ORDER and bw.OPERATE_SCOPE = #{operateScope}
) > 0
</if>
<if test="preSaleStatus != null">
and (
select
count(oi.PK_ID)
from sa_order_items oi
left join BD_WARES_EXTEND bw on bw.PK_WARES = oi.PK_WARES
where oi.PK_ORDER = ocl.PK_ORDER and bw.PRE_SALE_STATUS = #{preSaleStatus}
) > 0
</if>
<if test="productName != null and productName != ''">
and (
select
count(oi.PK_ID)
from sa_order_items oi
left join BD_PRODUCT bp on bp.PK_ID = oi.PK_PRODUCT
where oi.PK_ORDER = ocl.PK_ORDER and bp.PRODUCT_NAME = #{productName}
) > 0
</if>
<if test="specsName != null and specsName != ''">
and (
select
count(oi.PK_ID)
from sa_order_items oi
where oi.PK_ORDER = ocl.PK_ORDER and oi.SPECS_NAME = #{specsName}
) > 0
</if>
<if test="logisticsCompany != null and logisticsCompany != ''">
and (
select
count(oi.PK_ID)
from sa_order_items oi
left join BD_PRODUCT bp on bp.PK_ID = oi.PK_PRODUCT
left join SA_DELIVER_ITEMS di on di.PK_ORDER_ITEMS = oi.PK_ID
left join SA_DELIVER sd on sd.PK_ID = di.PK_DELIVER
where oi.PK_ORDER = ocl.PK_ORDER and sd.LOGISTICS_COMPANY = #{logisticsCompany}
) > 0
</if>
<if test="logisticsCode != null and logisticsCode != ''">
and (
select
count(oi.PK_ID)
from sa_order_items oi
left join BD_PRODUCT bp on bp.PK_ID = oi.PK_PRODUCT
left join SA_DELIVER_ITEMS di on di.PK_ORDER_ITEMS = oi.PK_ID
left join SA_DELIVER sd on sd.PK_ID = di.PK_DELIVER
where oi.PK_ORDER = ocl.PK_ORDER and sd.LOGISTICS_CODE = #{logisticsCode}
) > 0
</if>
<if test="recName != null and recName !=''">
and so.REC_NAME = #{recName}
</if>
<if test="recPhone != null and recPhone !=''">
and so.REC_PHONE = #{recPhone}
</if>
<if test="recProvince != null">
and so.REC_PROVINCE = #{recProvince}
</if>
<if test="recCity != null">
and so.REC_CITY = #{recCity}
</if>
<if test="recCounty != null">
and so.REC_COUNTY = #{recCounty}
</if>
<if test="recAddress != null and recAddress != ''">
and so.REC_ADDRESS = #{recAddress}
</if>
<if test="startCreationTime != null">
and ocl.CREATION_TIME &gt;= #{startCreationTime}
</if>
<if test="endCreationTime != null">
and ocl.CREATION_TIME &lt;= #{endCreationTime}
</if>
<if test="startPayTime != null">
and so.PAY_TIME &gt;= #{startPayTime}
</if>
<if test="endPayTime != null">
and so.PAY_TIME &lt;= #{endPayTime}
</if>
<if test="startLastInstanceDate != null">
and ocl.MODIFIED_TIME &gt;= #{startLastInstanceDate}
</if>
<if test="endLastInstanceDate != null">
and ocl.MODIFIED_TIME &lt;= #{endLastInstanceDate}
</if>
<if test="lastInstanceApprover != null and lastInstanceApprover != ''">
and (select count(t.USER_ID) from SYS_USER t where ocl.PK_MODIFIED = t.USER_ID and t.USER_NAME like #{lastInstanceApprover}||'%') &gt; 0
</if>
<if test="memberIdList != null and memberIdList.size() >0">
and so.PK_MEMBER in
<foreach collection="memberIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
ORDER BY ocl.CREATION_TIME desc
</select>
<select id="cancellationList" resultType="com.hzs.common.domain.sale.ext.SaOrderChargeLogExt">
select a.BUSINESS_CODE approvalCode, so.ORDER_CODE orderCode,so.ORDER_TYPE orderType,
a.CHARGE_TYPE chargeType,cm.CUSTOMER_TYPE customerType,cb.MEMBER_CODE memberCode,cb.MEMBER_NAME memberName,
@ -330,7 +140,8 @@
soi.exchange_goods = 1
or (soi.exchange_goods = 0 and exists (
select * from SA_ORDER_CHARGE_LOG ocl
where ocl.del_flag = 0 and ocl.pk_country = #{pkCountry} and ocl.charge_type in (233, 234, 235) and ocl.APPROVAL_STATUS = 2 and ocl.pk_order = so.pk_id
where ocl.del_flag = 0 and ocl.pk_country = #{pkCountry} and ocl.charge_type in (233, 234, 235) and ocl.APPROVAL_STATUS = 2 and ocl.pk_order =
so.pk_id
))
)
and soi.modified_time is not null

47
bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresExtendMapper.xml
View File

@ -40,23 +40,11 @@
<update id="updateWaresSalesAccrual">
update BD_WARES_EXTEND
<set>
SALES=SALES+#{number}
SALES = SALES + #{number}
</set>
where PK_WARES = #{pkWares}
</update>
<update id="updatePutOnTime">
update BD_WARES_EXTEND
set PUT_ON_TIME = null
where PK_WARES = #{waresId}
</update>
<update id="updatePutOffTime">
update BD_WARES_EXTEND
set PUT_OFF_TIME = null
where PK_WARES = #{waresId}
</update>
<update id="updatePutOnTimeAndPutOffTimeByWaresId">
update BD_WARES_EXTEND set
<choose>
@ -78,39 +66,10 @@
where PK_WARES = #{waresId}
</update>
<update id="updateByPkWares">
update BD_WARES_EXTEND
set IS_PUT_ON = #{isPutOn},
PRE_SALE_STATUS = #{preSaleStatus},
PUT_ON_TIME = #{putOnTime},
PUT_OFF_TIME = #{putOffTime},
OPERATE_SCOPE = #{operateScope},
PREFIX_LABEL = #{prefixLabel},
COOL_LABEL = #{coolLabel},
S_LABEL = #{sLabel},
SALES = #{sales},
IS_SALE = #{isSale},
ARRIVAL_TIME = #{arrivalTime},
WARN_MESSAGE = #{warnMessage},
MODIFIED_TIME = #{modifiedTime},
IS_LAND_TRANS = #{isLandTrans},
IS_AIR_TRANS = #{isAirTrans},
IS_OCEAN_TRANS = #{isOceanTrans},
PK_LAND_POSTAGE = #{pkLandPostage},
PK_AIR_POSTAGE = #{pkAirPostage},
PK_OCEAN_POSTAGE = #{pkOceanPostage},
PK_MODIFIED = #{pkModified},
PK_AGREEMENT = #{pkAgreement},
SELLING_POINTS = #{sellingPoints},
IS_MAKER_GIFT = #{isMakerGift},
PK_SPECIAL_CURRENCY = #{pkSpecialCurrency}
where PK_WARES = #{pkWares}
</update>
<select id="selectByWaresCodeList" resultType="com.hzs.sale.order.vo.WaresPreSaleVo">
select
bw.WARES_CODE waresCode, bw.WARES_NAME waresName,bw.PRE_SALE_QUANTITY preSaleQuantity,
we.PK_WARES pkWares ,we.PRE_SALE_STATUS preSaleStatus
bw.WARES_CODE waresCode, bw.WARES_NAME waresName, bw.PRE_SALE_QUANTITY preSaleQuantity,
we.PK_WARES pkWares, we.PRE_SALE_STATUS preSaleStatus
from BD_WARES bw
left join BD_WARES_EXTEND we on we.PK_WARES = bw.PK_ID
where bw.del_flag = 0

28
bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsRelationMapper.xml
View File

@ -10,12 +10,6 @@
<result column="PK_WARES_DETAIL" property="pkWaresDetail"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
PK_ID
, PK_WARES_SPECS, PK_WARES_SPECS_SKU
</sql>
<select id="selectByWaresSpecsSku" resultType="com.hzs.common.domain.sale.ext.BdWaresSpecsRelationExt">
select wsr.*, bs.SPECS_NAME specsName, ws.PK_SPECS pkSpecs
from BD_WARES_SPECS_RELATION wsr
@ -26,17 +20,18 @@
</select>
<select id="getWaresProduct" resultType="com.hzs.common.domain.sale.ext.BdWaresSpecsRelationExt">
select ws.PK_SPECS pkSpecs,
wd.PK_PRODUCT pkProduct,wr.PRICE price,
select ws.PK_SPECS pkSpecs,
wd.PK_PRODUCT pkProduct,wr.PRICE price,
wr.ACHIEVE achieve,wr.PK_RANGE pkRange,
r.RANGE_NAME rangeName
from BD_WARES_SPECS_RELATION wsr
left join BD_WARES_SPECS ws on ws.PK_WARES_DETAIL = wsr.PK_WARES_DETAIL
left join bd_wares_detail wd on wd.PK_ID = ws.PK_WARES_DETAIL
left join BD_WARES_SPECS_SKU wss on wss.PK_ID = wsr.PK_WARES_SPECS_SKU
left join BD_WARES_RANGE wr on wr.PK_WARES_SPECS_SKU = wss.PK_ID
left join bd_range r on r.PK_ID = wr.PK_RANGE
where wd.PK_WARES = #{pkWares} and wd.PK_PRODUCT = #{pkProduct} and wsr.PK_WARES_SPECS_SKU = #{pkWaresSpecsSku} and wsr.del_flag = 0 and wd.del_flag = 0 and ws.del_flag = 0
r.RANGE_NAME rangeName
from BD_WARES_SPECS_RELATION wsr
left join BD_WARES_SPECS ws on ws.PK_WARES_DETAIL = wsr.PK_WARES_DETAIL
left join bd_wares_detail wd on wd.PK_ID = ws.PK_WARES_DETAIL
left join BD_WARES_SPECS_SKU wss on wss.PK_ID = wsr.PK_WARES_SPECS_SKU
left join BD_WARES_RANGE wr on wr.PK_WARES_SPECS_SKU = wss.PK_ID
left join bd_range r on r.PK_ID = wr.PK_RANGE
where wd.PK_WARES = #{pkWares} and wd.PK_PRODUCT = #{pkProduct} and wsr.PK_WARES_SPECS_SKU = #{pkWaresSpecsSku} and wsr.del_flag = 0 and
wd.del_flag = 0 and ws.del_flag = 0
and wss.del_flag = 0
and wr.del_flag = 0
and ws.PK_SPECS in
@ -45,7 +40,6 @@
</foreach>
group by wr.PK_RANGE,ws.PK_SPECS ,wd.PK_PRODUCT ,wr.PRICE ,wr.ACHIEVE,r.RANGE_NAME,r.range_value
order by r.range_value
</select>
</mapper>

65
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java
View File

@ -302,71 +302,6 @@ public class CacheConstants {
public final static String TRADE_CONFIG_WHITE = CACHE_PREFIX + "trade:config:white";
/**
* 采购订单锁
*/
public static final String PO_ORDER_LOCK = CACHE_PREFIX + "lock:po:order:";
/**
* 采购入库单锁
*/
public static final String IC_PURCHASE_IN_LOCK = CACHE_PREFIX + "lock:ic:purchase:";
/**
* 其他入库单锁
*/
public static final String IC_GENERAL_IN_LOCK = CACHE_PREFIX + "lock:ic:general-in:";
/**
* 其他出库单锁
*/
public static final String IC_GENERAL_OUT_LOCK = CACHE_PREFIX + "lock:ic:general-out:";
/**
* 调拨订单单锁
*/
public static final String TRANSFER_ORDER_LOCK = CACHE_PREFIX + "lock:ic:transfer-order:";
/**
* 调拨入库单锁
*/
public static final String TRANSFER_IN_LOCK = CACHE_PREFIX + "lock:ic:transfer-in:";
/**
* 调拨出库单锁
*/
public static final String TRANSFER_OUT_LOCK = CACHE_PREFIX + "lock:ic:transfer-out:";
/**
* 库存盘点单锁
*/
public static final String INVENTORY_ORDER_LOCK = CACHE_PREFIX + "lock:ic:inventory:";
/**
* 业务领用订单
*/
public static final String IO_ORDER_LOCK = CACHE_PREFIX + "lock:io:order:";
/**
* 现存量
*/
public static final String IC_ON_HAND_NUM_LOCK = CACHE_PREFIX + "lock:ic:hand:";
/**
* 可用量
*/
public static final String IC_AVAILABLE_NUM_LOCK = CACHE_PREFIX + "lock:ic:available:";
/**
* 批次号
*/
public static final String BATCH_CODE = CACHE_PREFIX + "lock:ic:batch-code:";
/**
* 产品bas
*/
public static final String BD_PRODUCT_BAS = "product:bas:";
/**
* 后台管理员，数据访问权限缓存key
*/

34
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECustomerType.java
View File

@ -6,8 +6,6 @@ import lombok.Getter;
/**
* 会员类型
*
* @author: hzs
*/
@AllArgsConstructor
@Getter
@ -16,32 +14,32 @@ public enum ECustomerType {
/**
* 正常
*/
NORMAL(0, "正常", 0, EnumsPrefixConstants.CUSTOMER_TYPE + "0"),
NORMAL(0, "正常", 0),
/**
* 空单
*/
EMPTY_ORDER(1, "空单", 0, EnumsPrefixConstants.CUSTOMER_TYPE + "1"),
EMPTY_ORDER(1, "空单", 0),
/**
* 死点
*/
DEAD_POINT(2, "死点", 0, EnumsPrefixConstants.CUSTOMER_TYPE + "2"),
DEAD_POINT(2, "死点", 0),
/**
* 嗨粉
*/
FANS(4, "海粉", 0, EnumsPrefixConstants.CUSTOMER_TYPE + "4"),
// /**
// * 嗨粉
// */
// FANS(4, "海粉", 0),
/**
* 商城小程序游客
*/
MALL_APPLET(5, "商城小程序游客", 0, EnumsPrefixConstants.CUSTOMER_TYPE + "5"),
MALL_APPLET(5, "商城小程序游客", 0),
/**
* 海粉
*/
HAI_FANS(6, "会员", 0, EnumsPrefixConstants.CUSTOMER_TYPE + "6"),
// /**
// * 海粉
// */
// HAI_FANS(6, "会员", 0),
;
/**
@ -56,14 +54,10 @@ public enum ECustomerType {
* 是否启用（0=是,1=否） -- 来源EYesNo
*/
private final int enable;
/**
* 国际化翻译key值
*/
private final String key;
public static ECustomerType getCustomerType(int value){
public static ECustomerType getCustomerType(int value) {
for (ECustomerType customerType : ECustomerType.values()) {
if (customerType.getValue() == value){
if (customerType.getValue() == value) {
return customerType;
}
}

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderChargeLog.java
View File

@ -9,9 +9,6 @@ import lombok.experimental.Accessors;
/**
* 订单修改记录
*
* @author hzs
* @since 2023-02-01
*/
@Data
@EqualsAndHashCode(callSuper = false)

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdProductExtend.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.hzs.common.core.web.domain.BaseEntity;
@ -12,12 +13,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 商品拓展表
* </p>
*
* @author hzs
* @since 2022-09-01
*/
@Data
@EqualsAndHashCode(callSuper = false)