## 报单660给1980,1980给9900;
This commit is contained in:
parent
6278c994fc
commit
584151389f
|
@ -38,7 +38,7 @@ import java.util.List;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @description: 订单控制类
|
||||
* 订单控制类
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/order")
|
||||
|
@ -51,9 +51,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
IAcPickServiceApi iAcPickServiceApi;
|
||||
|
||||
/**
|
||||
* 确认注册订单,生成待支付订单,只有注册订单有待支付订单
|
||||
*
|
||||
* @param orderParam 订单参数
|
||||
* @Description: 确认注册订单,生成待支付订单,只有注册订单有待支付订单
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@PostMapping("/confirm-reg-order")
|
||||
@RepeatSubmit
|
||||
|
@ -97,9 +97,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 支付注册订单,生成支付订单或者更新待支付订单
|
||||
*
|
||||
* @param orderParam 订单参数
|
||||
* @Description: 支付注册订单,生成支付订单或者更新待支付订单
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@PostMapping("/pay-reg-order")
|
||||
@RepeatSubmit
|
||||
|
@ -194,8 +194,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 查询订单
|
||||
*
|
||||
* @param orderParam 订单参数
|
||||
* @Description: 查询订单
|
||||
*/
|
||||
@PostMapping("/query-order")
|
||||
public AjaxResult queryOrder(@RequestBody OrderParam orderParam) {
|
||||
|
@ -287,8 +288,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 查询订单邮费
|
||||
*
|
||||
* @param orderParam 订单参数
|
||||
* @Description: 查询订单邮费
|
||||
*/
|
||||
@PostMapping("/query-order-postage")
|
||||
public AjaxResult queryOrderPostage(@RequestBody OrderParam orderParam) {
|
||||
|
@ -306,7 +308,7 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 自助服务-修改收货地址邮费计算
|
||||
* 自助服务-修改收货地址邮费计算
|
||||
**/
|
||||
@PostMapping("/self-order-postage")
|
||||
public AjaxResult selfOrderPostage(@RequestBody OrderParam orderParam) {
|
||||
|
@ -333,9 +335,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
|
||||
|
||||
/**
|
||||
* 查询订单消费明细
|
||||
*
|
||||
* @param orderParam 订单参数
|
||||
* @Description: 查询订单消费明细
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@PostMapping("/query-spend-details")
|
||||
public AjaxResult queryOrderSpendDetails(@RequestBody OrderParam orderParam) {
|
||||
|
@ -383,9 +385,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 验证手机号+姓名
|
||||
*
|
||||
* @param orderParam 手机号、姓名
|
||||
* @Description: 验证手机号+姓名
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@Override
|
||||
@PostMapping("/valid-phone")
|
||||
|
@ -395,9 +397,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 验证推荐编号、推荐关系,成功后返回姓名,只有注册订单调用
|
||||
*
|
||||
* @param orderParam 必须推荐人
|
||||
* @Description: 验证推荐编号、推荐关系,成功后返回姓名,只有注册订单调用
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@Override
|
||||
@PostMapping("/valid-p-code")
|
||||
|
@ -409,9 +411,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 验证安置编号,成功后返回姓名
|
||||
*
|
||||
* @param orderParam 必须安置人 当传输的值中安置部门不为空时,校验安置位置
|
||||
* @Description: 验证安置编号,成功后返回姓名
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@Override
|
||||
@PostMapping("/valid-p-p-code")
|
||||
|
@ -422,8 +424,7 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
|
||||
|
||||
/**
|
||||
* @Description: 空单注册 验证权限,验证编号是否有报单权限
|
||||
* @return: AjaxResult
|
||||
* 空单注册 验证权限,验证编号是否有报单权限
|
||||
*/
|
||||
@PostMapping("/valid-authority")
|
||||
public AjaxResult validateRegisterAuthority() {
|
||||
|
@ -432,9 +433,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 校验会员等级, 计算会员等级
|
||||
*
|
||||
* @param orderParam 参数
|
||||
* @Description: 校验会员等级, 计算会员等级
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@PostMapping("/valid-mem-level")
|
||||
public AjaxResult validateMemberLevel(@RequestBody OrderParam orderParam) {
|
||||
|
@ -473,9 +474,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 快速注册
|
||||
*
|
||||
* @param orderParam 参数
|
||||
* @Description: 快速注册
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@PostMapping("/quick-reg")
|
||||
public AjaxResult quickRegistration(@RequestBody OrderParam orderParam) {
|
||||
|
@ -540,9 +541,9 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 快速注册
|
||||
*
|
||||
* @param orderParam 参数
|
||||
* @Description: 快速注册
|
||||
* @return: AjaxResult
|
||||
*/
|
||||
@PostMapping("/update-default")
|
||||
public AjaxResult setRegisterDefault(@RequestBody OrderParam orderParam) {
|
||||
|
@ -554,8 +555,7 @@ public class ApiRegSaOrderController extends ParentOrderController {
|
|||
}
|
||||
|
||||
/**
|
||||
* @Description: 快速注册
|
||||
* @return: AjaxResult
|
||||
* 快速注册
|
||||
*/
|
||||
@GetMapping("/query-default")
|
||||
public AjaxResult setRegisterDefault() {
|
||||
|
|
|
@ -22,9 +22,7 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 订单的service处理类
|
||||
* @Classname: IOrderService
|
||||
* @PackageName: com.hzs.sale.order.service
|
||||
* 订单的service处理类
|
||||
*/
|
||||
public interface ISaOrderService extends IService<SaOrder> {
|
||||
|
||||
|
@ -33,8 +31,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 根据手机号查询出目前系统所有的会员
|
||||
*
|
||||
* @param cuMember 会员的各种属性、手机号码必输 国家
|
||||
* @Description:
|
||||
* @return: List<CuMemberExt>
|
||||
*/
|
||||
List<CuMemberExt> queryMemberExtByCondition(CuMember cuMember);
|
||||
|
||||
|
@ -43,10 +39,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 查找安置人伞上
|
||||
*
|
||||
* @param placeParentId 安置人
|
||||
* @Description:
|
||||
* @return: List<CuMemberExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:54
|
||||
*/
|
||||
List<CuMemberExt> querySponsorOnUmbrella(Long placeParentId, String phone);
|
||||
|
||||
|
@ -54,10 +46,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 查找安置人伞下
|
||||
*
|
||||
* @param memberId 会员编号
|
||||
* @Description:
|
||||
* @return: List<CuMemberExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:54
|
||||
*/
|
||||
List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList);
|
||||
|
||||
|
@ -65,10 +53,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 查找安置人伞下
|
||||
*
|
||||
* @param memberId 安置人,编号
|
||||
* @Description:
|
||||
* @return: List<CuMemberExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:54
|
||||
*/
|
||||
List<CuMemberExt> queryPlaceSponsorUnderUmbrella(Long memberId, String placeParent);
|
||||
|
||||
|
@ -77,9 +61,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param memberId 会员编号
|
||||
* @param placeDept 1代表左区极左极下,2代表右区极左极下
|
||||
* @return: CuMemberExt
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/1 20:36
|
||||
*/
|
||||
CuMemberExt queryPlaceSponsorLastLeft(Long memberId, Integer placeDept);
|
||||
|
||||
|
@ -87,9 +68,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 根据订单编号查询订单
|
||||
*
|
||||
* @param saOrder 订单
|
||||
* @return: SaOrder 订单
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/21 17:30
|
||||
*/
|
||||
SaOrder querySaleOrderByOrderCode(SaOrder saOrder);
|
||||
|
||||
|
@ -98,9 +76,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param saOrder 订单
|
||||
* @param itemIdList 订单明细主键
|
||||
* @return: SaOrderExt 订单
|
||||
* @Author: sui q
|
||||
* @Date: 2022/10/10 15:29
|
||||
*/
|
||||
SaOrderExt querySaleOrderExtByOrderCode(SaOrder saOrder, List<Long> itemIdList);
|
||||
|
||||
|
@ -111,9 +86,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* @param pkMember 会员编号
|
||||
* @param orderTypeList 订单类型
|
||||
* @param notOrderType 不处理订单类型
|
||||
* @return: List<SaOrder>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/1 20:24
|
||||
*/
|
||||
List<SaOrder> querySaleOrderByPkMember(Integer pkCountry, Long pkMember, List<Integer> orderTypeList, List<Integer> notOrderType);
|
||||
|
||||
|
@ -124,17 +96,11 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* @param pkCountry 国家
|
||||
* @param pkMember 会员编号
|
||||
* @param notTypeList 排除的订单类型
|
||||
* @return: List<SaOrder>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/1 20:24
|
||||
*/
|
||||
Integer querySaleOrderByPkMember(Integer pkCountry, Long pkMember, List<Integer> notTypeList);
|
||||
|
||||
/*
|
||||
* @description: 查询网体是否存在推荐人
|
||||
* @author: sui q
|
||||
* @date: 2023/9/11 9:53
|
||||
* @param: null null
|
||||
* 查询网体是否存在推荐人
|
||||
**/
|
||||
Integer queryCuMemberByPkMember(Long pkReference);
|
||||
|
||||
|
@ -142,9 +108,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 跟会员端进行交互的查询订单的方法
|
||||
*
|
||||
* @param orderQueryParam 交互参数
|
||||
* @return: List<SaOrder>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/10/19 16:58
|
||||
*/
|
||||
List<SaOrderVO> querySaleOrderByCondition(OrderQueryParam orderQueryParam);
|
||||
|
||||
|
@ -152,10 +115,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 根据key值从redis中获取到会员信息
|
||||
*
|
||||
* @param pkId 会员主键
|
||||
* @Description:
|
||||
* @return: CuMember
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:48
|
||||
*/
|
||||
CuMember getCuMemberByKey(Long pkId);
|
||||
|
||||
|
@ -163,10 +122,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 根据key值从redis中获取到会员信息
|
||||
*
|
||||
* @param code 会员编号
|
||||
* @Description:
|
||||
* @return: CuMember
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:48
|
||||
*/
|
||||
CuMember getCuMemberByCode(String code);
|
||||
|
||||
|
@ -174,10 +129,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 加锁,将键锁定
|
||||
*
|
||||
* @param key 锁定的键
|
||||
* @Description:
|
||||
* @return: Boolean
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/5 9:24
|
||||
*/
|
||||
Boolean lockKey(String key);
|
||||
|
||||
|
@ -185,9 +136,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 查询会员账户状态,账户信息
|
||||
*
|
||||
* @param cuMemberAccount 会员账户条件信息
|
||||
* @return: List<CuMemberAccountExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/5 11:57
|
||||
*/
|
||||
List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount);
|
||||
|
||||
|
@ -309,9 +257,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 计算会员等级
|
||||
*
|
||||
* @param orderParam 商品列表、专区
|
||||
* @return: OrderReturn 返回参数
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/24 14:38
|
||||
*/
|
||||
OrderReturn computeLevel(OrderParam orderParam);
|
||||
|
||||
|
@ -321,18 +266,11 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* @param pkApprove 审核人
|
||||
* @param orderCancelParam 撤单参数
|
||||
* @param validateCancelOrderVO 订单
|
||||
* @return: void
|
||||
* @Author: sui q
|
||||
* @Date: 2022/10/22 15:01
|
||||
*/
|
||||
void revokeSaOrderByOrderCode(Long pkApprove, OrderCancelParam orderCancelParam, ValidateCancelOrderVO validateCancelOrderVO);
|
||||
|
||||
/**
|
||||
* @description: 自助撤单
|
||||
* @author: zhang jing
|
||||
* @date: 2023/11/21 15:28
|
||||
* @param: [pkApprove, orderCancelParam, validateCancelOrderVO]
|
||||
* @return: void
|
||||
**/
|
||||
void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO);
|
||||
|
||||
|
@ -341,9 +279,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param pkCountry 国家
|
||||
* @param pkGrade 等级
|
||||
* @return: R<GradeDTO>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/10/25 14:12
|
||||
*/
|
||||
GradeDTO queryGradeConfigByCondition(Integer pkCountry, Integer pkGrade);
|
||||
|
||||
|
@ -352,9 +287,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param cuMember 会员 需要放(推荐人、国家、新用户姓名、新用户手机号)
|
||||
* @param isFirstAchieve 是否验证首购业绩
|
||||
* @return: SysUser
|
||||
* @Author: sui q
|
||||
* @Date: 2022/3/12 10:42
|
||||
*/
|
||||
CuMember obtainLastResettleByRecommend(CuMember cuMember, Boolean isFirstAchieve, Boolean isFirst);
|
||||
|
||||
|
@ -362,8 +294,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* 生成空单注册
|
||||
*
|
||||
* @param orderBlankRegParams 参数
|
||||
* @return: String
|
||||
* @Date: 2022/11/14 15:10
|
||||
*/
|
||||
String registerEmptyOrder(OrderBlankRegParams orderBlankRegParams);
|
||||
|
||||
|
@ -373,9 +303,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* @param pkParent 推荐人主键
|
||||
* @param pkCountry 国家
|
||||
* @Description: 验证第二部门是否需要验证首单
|
||||
* @return: boolean
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/7 9:29
|
||||
*/
|
||||
boolean validateFirstOrder(Long pkParent, Integer pkCountry);
|
||||
|
||||
|
@ -385,9 +312,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* @param pkPlaceParent 安置位置
|
||||
* @param pkCountry 国家
|
||||
* @Description: 验证第二部门是否需要验证首单
|
||||
* @return: boolean
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/7 9:29
|
||||
*/
|
||||
boolean validateLeftExistMember(Long pkPlaceParent, Integer pkCountry);
|
||||
|
||||
|
@ -396,9 +320,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param startDate 开始时间
|
||||
* @param endDate 结束时间
|
||||
* @return: List<SaOrder>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/4 9:05
|
||||
*/
|
||||
List<SaOrderExt> querySaOrderByTime(Date startDate, Date endDate, String orderCode);
|
||||
|
||||
|
@ -407,9 +328,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param startDate 开始日期
|
||||
* @param endDate 结束日期
|
||||
* @return: R<List < SaOrderExt>>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/2 16:30
|
||||
*/
|
||||
List<SaOrderExt> queryRepeatSaOrderByDay(Date startDate, Date endDate);
|
||||
|
||||
|
@ -434,9 +352,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param startDate 开始日期
|
||||
* @param endDate 结束日期
|
||||
* @return: List<SaOrder>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/1/5 13:57
|
||||
*/
|
||||
List<SaOrder> querySaOrderByTimeForCloud(Date startDate, Date endDate);
|
||||
|
||||
|
@ -448,9 +363,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
* @param orderTypeList 订单类型
|
||||
* @param orderAmount 订单金额
|
||||
* @param orderAchieve 订单业绩
|
||||
* @return: List<SaOrder>
|
||||
* @Author: sui q
|
||||
* @Date: 2023/1/5 13:57
|
||||
*/
|
||||
List<SaOrder> querySaOrderByTimeForCouponShare(Date startDate, Date endDate, List<Integer> orderTypeList,
|
||||
BigDecimal orderAmount, BigDecimal orderAchieve, Integer pkCountry);
|
||||
|
@ -460,9 +372,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
*
|
||||
* @param pkCountry 国家
|
||||
* @param key 键
|
||||
* @return: String
|
||||
* @Author: sui q
|
||||
* @Date: 2022/11/10 14:10
|
||||
*/
|
||||
String querySystemConfigByKey(Integer pkCountry, String key);
|
||||
|
||||
|
@ -521,38 +430,22 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
|
||||
/**
|
||||
* @description: 自助撤单列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/11/21 11:25
|
||||
* @param: [param, memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
List<SaOrderExt> selfRevokeOrderList(MyOrderParam param, Long memberId, Integer pkCountry);
|
||||
|
||||
|
||||
/**
|
||||
* @description: 自助服务-可申请订单列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/4/19 11:30
|
||||
* @param: [param, memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
List<SaOrderExt> selfOrderList(MyOrderParam param, Long memberId, Integer pkCountry);
|
||||
|
||||
/**
|
||||
* @description: 查询最新待发货订单
|
||||
* @author: zhang jing
|
||||
* @date: 2023/11/22 16:28
|
||||
* @param: [memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
String lastOrderList(Long memberId, Integer pkCountry);
|
||||
|
||||
/**
|
||||
* @description: 自助服务-修改收货地址订单列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/5/11 14:16
|
||||
* @param: [param, memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
List<SaOrderExt> selfAddressOrderList(MyOrderParam param, Long memberId, Integer pkCountry);
|
||||
|
||||
|
@ -728,10 +621,6 @@ public interface ISaOrderService extends IService<SaOrder> {
|
|||
|
||||
/**
|
||||
* @description: 查询当天已支付订单信息
|
||||
* @author: zhang jing
|
||||
* @date: 2023/5/17 14:37
|
||||
* @param: [orderType]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.order.SaOrder>
|
||||
**/
|
||||
List<SaOrder> querySaOrderByOrderType(String payTime);
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.hzs.activity.pick.param.AcPickQueryParam;
|
||||
import com.hzs.activity.pick.service.IAcPickService;
|
||||
import com.hzs.common.core.constant.*;
|
||||
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
|
||||
|
@ -20,7 +19,6 @@ import com.hzs.common.core.exception.ServiceException;
|
|||
import com.hzs.common.core.service.RedisService;
|
||||
import com.hzs.common.core.utils.*;
|
||||
import com.hzs.common.core.utils.reflect.ReflectUtils;
|
||||
import com.hzs.common.domain.activity.pick.ext.AcPickExt;
|
||||
import com.hzs.common.domain.member.account.CuMemberAccount;
|
||||
import com.hzs.common.domain.member.base.CuMember;
|
||||
import com.hzs.common.domain.member.base.CuMemberRegister;
|
||||
|
@ -81,7 +79,6 @@ import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
|
|||
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
|
||||
import com.hzs.system.sys.dto.LoginUser;
|
||||
import com.hzs.third.sms.ISmsServiceApi;
|
||||
import com.hzs.third.sms.dto.SmsServiceDTO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
||||
|
@ -97,9 +94,7 @@ import java.util.concurrent.TimeUnit;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: 订单的逻辑类
|
||||
* @Classname: OrderServiceImpl
|
||||
* @PackageName: com.hzs.sale.order.service.impl
|
||||
* 订单的逻辑类
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
|
@ -108,9 +103,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
@DubboReference
|
||||
IMemberServiceApi memberServiceApi;
|
||||
@DubboReference
|
||||
IGradeServiceApi gradeServiceApi;
|
||||
IGradeServiceApi iGradeServiceApi;
|
||||
@DubboReference
|
||||
IAwardsServiceApi awardsServiceApi;
|
||||
IAwardsServiceApi iAwardsServiceApi;
|
||||
@DubboReference
|
||||
IAreaServiceApi areaServiceApi;
|
||||
@DubboReference
|
||||
|
@ -168,8 +163,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
private ISaOrderChargeLogService saOrderChargeLogService;
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@Autowired
|
||||
private IBdWaresDetailService bdWaresDetailService;
|
||||
|
||||
|
||||
@Override
|
||||
|
@ -186,10 +179,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
* 查找安置人伞下
|
||||
*
|
||||
* @param memberId 会员编号
|
||||
* @Description:
|
||||
* @return: List<CuMemberExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:54
|
||||
*/
|
||||
@Override
|
||||
public List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList) {
|
||||
|
@ -197,11 +186,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
}
|
||||
|
||||
/**
|
||||
* 查找安置人伞下
|
||||
*
|
||||
* @param memberId 安置人,编号
|
||||
* @Description: 查找安置人伞下
|
||||
* @return: List<CuMemberExt>
|
||||
* @Author: sui q
|
||||
* @Date: 2022/8/29 20:54
|
||||
*/
|
||||
@Override
|
||||
public List<CuMemberExt> queryPlaceSponsorUnderUmbrella(Long memberId, String placeParent) {
|
||||
|
@ -213,9 +200,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
*
|
||||
* @param memberId 会员编号
|
||||
* @param placeDept 1代表左区极左极下,2代表右区极左极下
|
||||
* @return: CuMemberExt
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/1 20:36
|
||||
*/
|
||||
@Override
|
||||
public CuMemberExt queryPlaceSponsorLastLeft(Long memberId, Integer placeDept) {
|
||||
|
@ -606,10 +590,26 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
cuMember.setPkRegisterGrade(gradeDTO.getPkId());
|
||||
cuMember.setPkSettleGrade(gradeDTO.getPkId());
|
||||
cuMember.setPkSettleGradeValue(gradeDTO.getGradeValue());
|
||||
|
||||
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
|
||||
// 2025.05.13 新添加需求,开网初期报单660给1980等级,报单1980给9900等级
|
||||
if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) {
|
||||
GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), saOrderExt.getPkCountry()).getData();
|
||||
if (null != newGradeDTO) {
|
||||
cuMember.setPkSettleGrade(newGradeDTO.getPkId());
|
||||
}
|
||||
} else if (EGrade.MAKER.getValue() == gradeDTO.getGradeValue()) {
|
||||
GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.VIP.getValue(), saOrderExt.getPkCountry()).getData();
|
||||
if (null != newGradeDTO) {
|
||||
cuMember.setPkSettleGrade(newGradeDTO.getPkId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 判断奖衔,原会员有奖衔的话判断哪个大,使用大的
|
||||
if (pkAwards != null && gradeDTO.getGradeValue() != null) {
|
||||
BdAwards bdAwards = awardsServiceApi.getAwardsOne(pkAwards).getData();
|
||||
BdAwards newAwards = awardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData();
|
||||
BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(pkAwards).getData();
|
||||
BdAwards newAwards = iAwardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData();
|
||||
if (bdAwards.getAwardsValue() < newAwards.getAwardsValue()) {
|
||||
cuMember.setPkAwards(gradeDTO.getPkAwards());
|
||||
}
|
||||
|
@ -888,7 +888,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean payUpgradeSaOrder(SaOrderExt saOrderExt, CuMemberAccountExt cuMemberAccountExt) {
|
||||
CuMember cuMember = getCuMemberByKey(saOrderExt.getPkMember());
|
||||
GradeDTO oldGradeDTO = gradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
|
||||
GradeDTO oldGradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
|
||||
// 封装等级,重新计算会员等级
|
||||
if (setLastCuMemberGrade(cuMember, saOrderExt)) {
|
||||
return false;
|
||||
|
@ -1127,7 +1127,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
if (orderParam.getIsEnough() != null && orderParam.getIsEnough()) {
|
||||
orderReturn.setIsEnough(Boolean.TRUE);
|
||||
CuMember member = getCuMemberByKey(orderParam.getCenterCodeId());
|
||||
GradeDTO grade = gradeServiceApi.getGrade(member.getPkSettleGrade()).getData();
|
||||
GradeDTO grade = iGradeServiceApi.getGrade(member.getPkSettleGrade()).getData();
|
||||
orderReturn.setPkGradeVal(grade.getGradeName());
|
||||
return orderReturn;
|
||||
}
|
||||
|
@ -1140,7 +1140,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
} else {
|
||||
member = getCuMemberByKey(orderParam.getCenterCodeId());
|
||||
}
|
||||
GradeDTO grade = gradeServiceApi.getGrade(member.getPkSettleGrade()).getData();
|
||||
GradeDTO grade = iGradeServiceApi.getGrade(member.getPkSettleGrade()).getData();
|
||||
if (grade.getGradeValue() < gradeDTO.getGradeValue()) {
|
||||
orderReturn.setIsEnough(Boolean.TRUE);
|
||||
} else {
|
||||
|
@ -1723,9 +1723,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
* @param pkParent 推荐人
|
||||
* @param pkCountry 国家
|
||||
* @Description: 验证第二部门是否需要验证首单
|
||||
* @return: boolean
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/7 9:29
|
||||
*/
|
||||
@Override
|
||||
public boolean validateFirstOrder(Long pkParent, Integer pkCountry) {
|
||||
|
@ -1741,9 +1738,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
* @param pkPlaceParent 安置位置
|
||||
* @param pkCountry 国家
|
||||
* @Description: 验证第二部门是否需要验证首单
|
||||
* @return: boolean
|
||||
* @Author: sui q
|
||||
* @Date: 2022/9/7 9:29
|
||||
*/
|
||||
@Override
|
||||
public boolean validateLeftExistMember(Long pkPlaceParent, Integer pkCountry) {
|
||||
|
@ -1833,10 +1827,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
|
||||
/**
|
||||
* @description: 自助撤单列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/11/21 11:24
|
||||
* @param: [param, memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
@Override
|
||||
public List<SaOrderExt> selfRevokeOrderList(MyOrderParam param, Long memberId, Integer pkCountry) {
|
||||
|
@ -1846,10 +1836,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
|
||||
/**
|
||||
* @description: 自助服务-可申请订单列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/4/19 11:29
|
||||
* @param: [param, memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
@Override
|
||||
public List<SaOrderExt> selfOrderList(MyOrderParam param, Long memberId, Integer pkCountry) {
|
||||
|
@ -1858,10 +1844,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
|
||||
/**
|
||||
* @description: 查询最新待发货订单
|
||||
* @author: zhang jing
|
||||
* @date: 2023/11/22 16:28
|
||||
* @param: [memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
@Override
|
||||
public String lastOrderList(Long memberId, Integer pkCountry) {
|
||||
|
@ -1871,10 +1853,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
|
||||
/**
|
||||
* @description: 自助服务- 修改收货地址订单列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/5/11 14:17
|
||||
* @param: [param, memberId, pkCountry]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderExt>
|
||||
**/
|
||||
@Override
|
||||
public List<SaOrderExt> selfAddressOrderList(MyOrderParam param, Long memberId, Integer pkCountry) {
|
||||
|
@ -2112,9 +2090,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
* 支付分享订单
|
||||
*
|
||||
* @param saOrderExt 订单
|
||||
* @return: Boolean
|
||||
* @Author: sui q
|
||||
* @Date: 2023/3/15 17:27
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
|
@ -2283,13 +2258,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description: 查询当天已支付订单信息
|
||||
* @author: zhang jing
|
||||
* @date: 2023/5/17 14:37
|
||||
* @param: [orderType]
|
||||
* @return: java.util.List<com.hzs.common.domain.sale.order.SaOrder>
|
||||
**/
|
||||
@Override
|
||||
public List<SaOrder> querySaOrderByOrderType(String payTime) {
|
||||
return baseMapper.querySaOrderByOrderType(payTime);
|
||||
|
@ -2483,8 +2451,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
|||
// 记录原奖衔与新奖衔
|
||||
BdAwards tmpAwards;
|
||||
// 判断奖衔,原奖衔>新奖衔 不进行变奖衔
|
||||
BdAwards oldAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
|
||||
BdAwards newAwards = awardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData();
|
||||
BdAwards oldAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
|
||||
BdAwards newAwards = iAwardsServiceApi.getAwardsOne(gradeDTO.getPkAwards()).getData();
|
||||
if (oldAwards.getAwardsValue() > newAwards.getAwardsValue()) {
|
||||
cuMember.setPkAwards(gradeDTO.getPkAwards());
|
||||
tmpAwards = newAwards;
|
||||
|
|
|
@ -17,12 +17,13 @@ public class SmsServiceProvider implements ISmsServiceApi {
|
|||
@Override
|
||||
public R<String> sendAliSms(String phone, String code, EAliSmsTemplate aliSmsTemplate) {
|
||||
try {
|
||||
String str = SmsUtil.sendAliSms(phone, code, aliSmsTemplate);
|
||||
if (null == str) {
|
||||
return R.ok();
|
||||
}
|
||||
log.error("发送阿里短信失败: {}", str);
|
||||
return R.fail(str);
|
||||
// String str = SmsUtil.sendAliSms(phone, code, aliSmsTemplate);
|
||||
// if (null == str) {
|
||||
// return R.ok();
|
||||
// }
|
||||
// log.error("发送阿里短信失败: {}", str);
|
||||
// return R.fail(str);
|
||||
return R.fail("功能正在完善中...");
|
||||
} catch (Exception e) {
|
||||
log.error("发送阿里短信异常 phone: {}, code: {}", phone, code, e);
|
||||
return R.fail(e.getMessage());
|
||||
|
|
Loading…
Reference in New Issue