Skip to content

O
order-group
Commit d3cf7a83 by hanghang.wang
Options

华莱士

parent dffd4be9
Showing with 40 additions and 43 deletions
order-application-service/src/main/java/cn/freemud/entities/dto/CreateSpellGroupOrderDto.java
......@@ -37,6 +37,12 @@ public class CreateSpellGroupOrderDto extends CreateSpellGroupOrderReq {
private String nickName;
/**
* 虚拟门店id
*/
private String storeId;
/**
*存储送货地址信息
*/
List<DeliveryContactInfoCreateReq> deliveryContactInfoCreateReqList;
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreateSpellGroupOrderReq.java
......@@ -33,9 +33,9 @@ public class CreateSpellGroupOrderReq {
@ApiModelProperty(value = "参与拼团编号")
private String spellGroupCode;
@NotEmpty(message = "门店ID 不能为空")
@ApiModelProperty(value = "门店ID")
private String storeId;
@NotEmpty(message = "appId 不能为空")
@ApiModelProperty(value = "appId")
private String appId;
/**
* 渠道类型 OrderChannelType
......
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
......@@ -254,6 +254,7 @@ public enum ResponseResult {
SPELL_GROUP_QUERY_GROUP_STATUS_IS_NOT_NORMAL("80008", "团状态非正常"),
SPELL_GROUP_QUERY_DELIVERYTEMPLATE_ERROR("80009", "查询配送费异常"),
SPELL_GROUP_ISJOIN_ERROR("80010", "用户已经参与此团，不能再次参与"),
SPELL_GROUP_QUERY_BIND_STORE_ERROR("80011", "查询虚拟门店失败"),
SPELL_GROUP_REFUND_ERROR("80015", "取消拼团失败"),
;
......
order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java
......@@ -4,14 +4,15 @@ import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateResponse;
import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
import cn.freemud.entities.dto.product.ProductInfo;
import cn.freemud.entities.dto.promotion.*;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.QuerySpellGroupRequest;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.thirdparty.CustomerClient;
import cn.freemud.service.thirdparty.DeliveryFeiginClient;
import cn.freemud.service.thirdparty.PromotionDiscountClient;
import cn.freemud.service.thirdparty.StoreItemClient;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.thirdparty.*;
import com.alibaba.fastjson.JSON;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
......@@ -23,6 +24,7 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -57,11 +59,10 @@ public class SpellGroupOrderDataManager {
@Autowired
private DeliveryFeiginClient deliveryFeiginClient;
@Autowired
private AssortmentCustomerInfoManager customerInfoManager;
@Autowired
private CustomerClient customerClient;
private EcologyAdminApplicationClient ecologyAdminApplicationClient;
/**
* 查询门店信息
*/
......@@ -133,20 +134,6 @@ public class SpellGroupOrderDataManager {
}
/**
* 查询团信息
*
* @param groupWorkQueryRequest
* @return
*/
// public GroupWorkQueryResponse groupWorkQuery(GroupWorkQueryRequest groupWorkQueryRequest) {
// GroupWorkQueryResponse groupWorkQueryResponse = promotionDiscountClient.groupWorkQuery(groupWorkQueryRequest);
// if (!ResponseResult.SUCCESS.getCode().equals(groupWorkQueryResponse.getCode()) || groupWorkQueryResponse.getResult() == null) {
// return null;
// }
// return groupWorkQueryResponse;
// }
/**
* 查询配送费
*
* @param queryDeliveryTemplateRequest
......@@ -160,22 +147,6 @@ public class SpellGroupOrderDataManager {
return queryDeliveryTemplateResponse;
}
/**
* 通过用户id查询用户信息
* @param userId
* @param partnerId
* @return
*/
public GetMemberInfoByIdResponseDto getMemberInfoById(String userId,String partnerId) {
GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto = new GetMemberInfoByIdRequestDto();
getMemberInfoByIdRequestDto.setMemberId(userId);
getMemberInfoByIdRequestDto.setPartnerId(partnerId);
GetMemberInfoByIdResponseDto memberInfoResp = customerClient.getMemberInfoById(getMemberInfoByIdRequestDto);
if (!ResponseResult.SUCCESS.getCode().equals(memberInfoResp.getCode().toString()) || memberInfoResp.getData() == null) {
return null;
}
return memberInfoResp;
}
public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,AssortmentCustomerInfoVo userLoginInfoDto){
GroupWorkJoinRequest groupWorkJoinRequest = new GroupWorkJoinRequest();
......@@ -212,7 +183,19 @@ public class SpellGroupOrderDataManager {
return querySpellGroupVoResponse.getResult();
}
/**
* 获取商城门店id
*/
public VirtualBindStoreResponse change2BindMallShopId(String appId) {
VirtualStoreRequest virtualStoreRequest = new VirtualStoreRequest();
virtualStoreRequest.setPlatformAppId(appId);
virtualStoreRequest.setType("microMall");
cn.freemud.base.entity.BaseResponse<VirtualBindStoreResponse> virtualBindStoreResponse = ecologyAdminApplicationClient.getBuyBindVirtualStore(virtualStoreRequest);
if(virtualBindStoreResponse == null || virtualBindStoreResponse.getResult() == null || StringUtils.isBlank(virtualBindStoreResponse.getResult().getStoreId())) {
return null;
}
return virtualBindStoreResponse.getResult();
}
/**
......
order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
......@@ -11,6 +11,7 @@ import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
import cn.freemud.entities.dto.CreateSpellGroupOrderDto;
import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateResponse;
import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.product.ProductInfo;
import cn.freemud.entities.dto.promotion.*;
......@@ -133,11 +134,17 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
return ResponseUtil.error(ResponseResult.SPELL_GROUP_ISJOIN_ERROR);
}
}
/*获取门店信息,拼单虚拟门店，无需校验。方便后续取值门店名称以及门店英文名称*/
StoreResponse storeResponse = spellGroupOrderDataManager.getStoreInfo(createSpellGroupOrderReq.getPartnerId(), createSpellGroupOrderReq.getStoreId(), trackingNo);
/*获取虚拟门店id,拼单虚拟门店，无需校验。方便后续取值门店名称以及门店英文名称*/
VirtualBindStoreResponse virtualBindStoreResponse = spellGroupOrderDataManager.change2BindMallShopId(createSpellGroupOrderReq.getAppId());
if(virtualBindStoreResponse == null){
return ResponseUtil.error(ResponseResult.SPELL_GROUP_QUERY_BIND_STORE_ERROR);
}
createSpellGroupOrderDto.setStoreId(virtualBindStoreResponse.getStoreId());
StoreResponse storeResponse = spellGroupOrderDataManager.getStoreInfo(createSpellGroupOrderReq.getPartnerId(), virtualBindStoreResponse.getStoreId(), trackingNo);
if(storeResponse == null || storeResponse.getBizVO() == null){
return ResponseUtil.error(ResponseResult.STORE_ITEM_QUERY_ERROR);
}
/*门店信息->转换至DTO*/
createSpellGroupOrderDto.setStoreResponse(storeResponse);
/*前端传入地址等信息->转换至DTO*/
......
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