Skip to content

O
order-group
Commit 8bf8e95e by ping.wu
Options

会员渠道，微商城渠道去除

parent fee7775e
Showing with 63 additions and 59 deletions
order-application-service/src/main/java/cn/freemud/service/ActivityService.java
......@@ -30,8 +30,8 @@ public interface ActivityService {
* @param goodsBeanDtoList
* @return
*/
ActivityQueryResponseDto queryActivitys(ActivityQueryDto activityQueryDto, ActivityTypeEnum activityTypeEnum,
List<ActivityQueryRequestDto.QueryGoodsBeanDto> goodsBeanDtoList);
// ActivityQueryResponseDto queryActivitys(ActivityQueryDto activityQueryDto, ActivityTypeEnum activityTypeEnum,
// List<ActivityQueryRequestDto.QueryGoodsBeanDto> goodsBeanDtoList);
/**
......
order-application-service/src/main/java/cn/freemud/service/impl/ActivityServiceImpl.java
......@@ -48,43 +48,43 @@ public class ActivityServiceImpl implements ActivityService {
* @param goodsBeanDtoList 商品列表
* @return
*/
@Override
public ActivityQueryResponseDto queryActivitys(ActivityQueryDto activityQueryDto, ActivityTypeEnum activityTypeEnum,
List<ActivityQueryRequestDto.QueryGoodsBeanDto> goodsBeanDtoList) {
// 创建请求Dto
ActivityQueryRequestDto activityQueryRequestDto = new ActivityQueryRequestDto();
activityQueryRequestDto.setVer("1");
activityQueryRequestDto.setPartnerCode(activityQueryDto.getPartnerId());
activityQueryRequestDto.setStoreId(activityQueryDto.getStoreId());
// 添加点餐方式作为入参条件
ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(activityQueryDto.getOrderType());
if(!Objects.isNull(activityChannelEnum)) {
activityQueryRequestDto.setChannel(activityChannelEnum.getCode());
}
activityQueryRequestDto.setUserId(activityQueryDto.getUserId());
activityQueryRequestDto.setActivityType(activityTypeEnum == null ? null : activityTypeEnum.getCode());
activityQueryRequestDto.setGoods(goodsBeanDtoList);
activityQueryRequestDto.setApplication(application);
activityQueryRequestDto.setAppId(activityQueryDto.getAppId());
activityQueryRequestDto.setIsShowBenefit(1);
activityQueryRequestDto.setIsShowCycles(0);
activityQueryRequestDto.setIsShowGoods(1);
activityQueryRequestDto.setIsShowSendCoupon(0);
activityQueryRequestDto.setIsShowSendGoods(0);
activityQueryRequestDto.setIsShowStore(0);
activityQueryRequestDto.setIsShowTime(0);
activityQueryRequestDto.setOrgIds(commonService.getOrgIds(activityQueryDto.getPartnerId(), activityQueryDto.getStoreId()));
ActivityQueryResponseDto activityQueryResponseDto = null;
try {
activityQueryResponseDto = promotionDiscountClient.query(activityQueryRequestDto);
} catch (Exception ignored) {
}
if (activityQueryResponseDto == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(activityQueryResponseDto.getStatusCode())) {
return null;
}else {
return activityQueryResponseDto;
}
}
// @Override
// public ActivityQueryResponseDto queryActivitys(ActivityQueryDto activityQueryDto, ActivityTypeEnum activityTypeEnum,
// List<ActivityQueryRequestDto.QueryGoodsBeanDto> goodsBeanDtoList) {
// // 创建请求Dto
// ActivityQueryRequestDto activityQueryRequestDto = new ActivityQueryRequestDto();
// activityQueryRequestDto.setVer("1");
// activityQueryRequestDto.setPartnerCode(activityQueryDto.getPartnerId());
// activityQueryRequestDto.setStoreId(activityQueryDto.getStoreId());
// // 添加点餐方式作为入参条件
// ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(activityQueryDto.getOrderType());
// if(!Objects.isNull(activityChannelEnum)) {
// activityQueryRequestDto.setChannel(activityChannelEnum.getCode());
// }
// activityQueryRequestDto.setUserId(activityQueryDto.getUserId());
// activityQueryRequestDto.setActivityType(activityTypeEnum == null ? null : activityTypeEnum.getCode());
// activityQueryRequestDto.setGoods(goodsBeanDtoList);
// activityQueryRequestDto.setApplication(application);
// activityQueryRequestDto.setAppId(activityQueryDto.getAppId());
// activityQueryRequestDto.setIsShowBenefit(1);
// activityQueryRequestDto.setIsShowCycles(0);
// activityQueryRequestDto.setIsShowGoods(1);
// activityQueryRequestDto.setIsShowSendCoupon(0);
// activityQueryRequestDto.setIsShowSendGoods(0);
// activityQueryRequestDto.setIsShowStore(0);
// activityQueryRequestDto.setIsShowTime(0);
// activityQueryRequestDto.setOrgIds(commonService.getOrgIds(activityQueryDto.getPartnerId(), activityQueryDto.getStoreId()));
// ActivityQueryResponseDto activityQueryResponseDto = null;
// try {
// activityQueryResponseDto = promotionDiscountClient.query(activityQueryRequestDto);
// } catch (Exception ignored) {
// }
// if (activityQueryResponseDto == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(activityQueryResponseDto.getStatusCode())) {
// return null;
// }else {
// return activityQueryResponseDto;
// }
// }
@Override
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -1895,7 +1895,7 @@ public class OrderServiceImpl implements Orderservice {
}
// 微商城订单
if (Objects.equals(BizTypeEnum.MALL.getBizType() ,orderBean.getBizType()) || Objects.equals(OrderSourceV1.SAASMALL.getClientType().toString(),orderBean.getOrderClient())) {
if (Objects.equals(BizTypeEnum.MALL.getBizType() ,orderBean.getBizType()) || Objects.equals("23",orderBean.getOrderClient())) {
// 微商城因为没有退款原因选项 所以将用户退款说明用户作为退款原因
orderRefundVo.setReason(orderRefundVo.getRemarks());
// 必须选择退款方式
......@@ -3099,7 +3099,7 @@ public class OrderServiceImpl implements Orderservice {
queryOrdersDto.setPageNum(queryOrderVo.getPageNumber() != null ? queryOrderVo.getPageNumber() : 1);
queryOrdersDto.setStartTimestamp(startDate.getTime() / 1000);
queryOrdersDto.setEndTimestamp(endDate.getTime() / 1000);
queryOrdersDto.setOrderClients(Arrays.asList(OrderClientType.I_MEMBER.getIndex()));
queryOrdersDto.setOrderClients(Arrays.asList(13));
queryOrdersDto.setBizType(4);
queryOrdersDto.setOrderStatus(NewOrderStatus.COMPLETE.getIndex());
// queryOrdersDto.setPayStatuses(Arrays.asList(PayStatus.HAVE_PAID.getCode()));
......
order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java
......@@ -19,10 +19,7 @@ import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
import cn.freemud.entities.dto.user.StatisticalScoreResponse;
import cn.freemud.entities.dto.user.UseScoreRequest;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.CouponActiveStateEnum;
import cn.freemud.enums.ChannelEnum;
import cn.freemud.enums.OrderBeanType;
import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.*;
import cn.freemud.enums.integralproduct.ExchangeTypeEnum;
import cn.freemud.enums.integralproduct.IntegralProductStatusEnum;
import cn.freemud.service.CouponService;
......@@ -43,6 +40,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.membercenter.request.ReturnScoreRequest;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.request.OrderAffirmReq;
......@@ -105,12 +103,8 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
@Override
public BaseResponse createOrder(CreateOrderBONew createOrderBO) {
CreateOrderVo createOrderVo = createOrderBO.getCreateOrderVo();
String sessionId = createOrderVo.getSessionId();
//查询会员信息
AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
if (userLoginInfoDto == null || StringUtils.isEmpty(userLoginInfoDto.getMemberId())) {
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
}
//会员信息
AssortmentCustomerInfoVo userLoginInfoDto = createOrderBO.getUserLoginInfoDto();
String partnerId = userLoginInfoDto.getPartnerId();
String memberId = userLoginInfoDto.getMemberId();
String openId = userLoginInfoDto.getOpenId();
......@@ -187,9 +181,13 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
return ResponseUtil.error(statisticalScoreResponse.getCode(), "积分不足");
}
}
Integer orderClient = OrderClientType.SAAS.getIndex();
if (UserLoginChannelEnum.ALIPAY.getCode().equals(userLoginInfoDto.getChannel())) {
orderClient = OrderClientType.ALIPAY.getIndex();
}
//创建订单
CreateOrderRequest createOrderRequest = pointsMallOrderAdapter.convent2NEWCreateOrderRequest(OrderClientType.I_MEMBER.getIndex(), userLoginInfoDto,
storeId, "", "", 4, integralProductType, skuId, active, weixinDeliveryAddress);
CreateOrderRequest createOrderRequest = pointsMallOrderAdapter.convent2NEWCreateOrderRequest(orderClient, userLoginInfoDto,
storeId, "", "", BizTypeEnum.INTEGRAL_MALL.getBizType(), integralProductType, skuId, active, weixinDeliveryAddress);
OrderBaseResp<OrderInfoReqs> createOrderResponseDto = orderSdkService.createOrder(createOrderRequest, "");
if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, createOrderResponseDto.getCode())) {
return ResponseUtil.error(createOrderResponseDto.getCode(), "创建订单异常");
......@@ -351,8 +349,8 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
queryOrdersDto.setPageNum(queryOrderVo.getPageNumber() != null ? queryOrderVo.getPageNumber() : 1);
queryOrdersDto.setStartTimestamp(startDate.getTime() / 1000);
queryOrdersDto.setEndTimestamp(endDate.getTime() / 1000);
queryOrdersDto.setOrderClients(Arrays.asList(OrderClientType.I_MEMBER.getIndex()));
queryOrdersDto.setBizTypes(Arrays.asList(4));
queryOrdersDto.setOrderClients(Arrays.asList(13,OrderClientType.SAAS.getIndex(),OrderClientType.ALIPAY.getIndex()));
queryOrdersDto.setBizTypes(Arrays.asList(BizTypeEnum.INTEGRAL_MALL.getBizType()));
if (queryOrderVo.getQueryOrderStatus() != null) {
if (queryOrderVo.getQueryOrderStatus() == 1) {
queryOrdersDto.setOrderStatus(Arrays.asList(2));
......
order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
......@@ -225,6 +225,8 @@ public class SaasMallOrderService extends UniversalOrderService {
protected BaseResponse createSharedOrder(CreateOrderBo createOrderBo) {
OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(createOrderBo.getStoreResponseDto());
CreateOrderBaseVo createOrderBaseVo = createOrderBo.getCreateOrderBaseVo();
AssortmentCustomerInfoVo userLoginInfoDto = createOrderBo.getUserLoginInfoDto();
ShoppingCartGoodsDto shoppingCartGoodsDto = createOrderBo.getShoppingCartGoodsDto();
//创建普通订单
Function<Object, BaseResponse> createOrder = (var -> {
......@@ -233,7 +235,11 @@ public class SaasMallOrderService extends UniversalOrderService {
baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
//保存门店渠道信息
baseCreateOrderRequest.setOrderExtended(orderExtendedReq);
baseCreateOrderRequest.setOrderClient(OrderClientType.SAASMALL);
OrderClientType orderClient = OrderClientType.SAAS;
if (ChannelEnum.TYPE_2.getCode().equals(userLoginInfoDto.getChannel())) {
orderClient = OrderClientType.ALIPAY;
}
baseCreateOrderRequest.setOrderClient(orderClient);
baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
createOrderBo.setBaseCreateOrderRequest(baseCreateOrderRequest);
......@@ -250,7 +256,7 @@ public class SaasMallOrderService extends UniversalOrderService {
//<!---创建订单公共方法执行逻辑--->
OrderPayResponse orderPayResponse;
AssortmentCustomerInfoVo userLoginInfoDto = createOrderBo.getUserLoginInfoDto();
// AssortmentCustomerInfoVo userLoginInfoDto = createOrderBo.getUserLoginInfoDto();
PaymentRequest paymentRequest = this.orderBodyConvertToPaymentBody(userLoginInfoDto, createOrderBaseVo.getPartnerId());
if (totalAmount < 0) {
throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java
......@@ -30,14 +30,14 @@ public enum OrderClientType {
JD(10, "京东"),
MEITUAN(11, "美团外卖"),
APP(12, "自营APP"),
I_MEMBER(13, "i应用会员"),//废弃,农工商定制继续使用
// I_MEMBER(13, "i应用会员"),//废弃,农工商定制继续使用
I_CARGO(14, "i应用订货"),
POS(15, "POS"),
WAI_MEAL(19, "i围餐"),//废弃
JUBAOPEN(20, "美团服务商"),
DIANPING(21, "美团点评"),
KOUBEI(22, "口碑"),
SAASMALL(23, "微商城"),//废弃
// SAASMALL(23, "微商城"),//废弃
DPZHCT(24, "美团点评智慧餐厅"),
FMWD(25, "非码微店"),
TIKTOKPAY(27, "抖音小程序"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment