Skip to content

O
order-group
Commit 447d6b92 by ping.wu
Options

Merge branches 'feature/20220524_新商城_wuping' and 'master' of… 

Merge branches 'feature/20220524_新商城_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
parents e94c8266 ef352fce
Showing with 520 additions and 11 deletions
order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java
......@@ -94,4 +94,13 @@ public class ExposureOrderController {
return ResponseUtil.success();
}
/**
* 新商城支付门店配置
*/
@ApiAnnotation(logMessage = "新商城支付门店配置")
@PostMapping("/getMallPayConfig")
public BaseResponse<PayConfigVo> getMallPayConfig(@Validated @LogParams @RequestBody GetMallPayConfigVo req) {
return ResponseUtil.success(exposureOrderService.getMallPayConfig(req));
}
}
order-application-service/src/main/java/cn/freemud/controller/delivery/DeliveryController.java
......@@ -3,6 +3,7 @@ package cn.freemud.controller.delivery;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
import cn.freemud.entities.dto.delivery.MacCafeCallbackUrlRequestDto;
import cn.freemud.entities.dto.delivery.MallCallbackRequestDto;
import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
import cn.freemud.service.ThirdDeliveryService;
import com.freemud.application.sdk.api.log.ApiAnnotation;
......@@ -59,7 +60,7 @@ public class DeliveryController {
@ApiAnnotation(logMessage = "商城配送回调")
@ApiOperation(value = "商城配送回调", notes = "商城配送回调", produces = "application/json")
@PostMapping("/delivery/mallCallbackUrl")
public BaseResponse mallCallbackUrl(@Valid @LogParams @RequestBody CallbackUrlRequestDto request) {
public BaseResponse mallCallbackUrl(@Valid @LogParams @RequestBody MallCallbackRequestDto request) {
return deliveryService.mallCallbackUrl(request);
}
......
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java
......@@ -31,7 +31,7 @@ public class CallbackUrlRequestDto {
*/
private String channelDeliveryId;
/**
* 订单状态枚举值
* 状态枚举值
*/
private int deliveryStatus;
/**
......
order-application-service/src/main/java/cn/freemud/entities/dto/delivery/MallCallbackRequestDto.java 0 → 100644
package cn.freemud.entities.dto.delivery;
import lombok.Data;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: MallCallbackRequestDto
* @Package cn.freemud.entities.dto.delivery
* @Description:
* @author: ping.wu
* @date: 22-5-31 下午2:54
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class MallCallbackRequestDto {
//商户号
private String partnerId;
//订单号
private String tid;
//物流状态：0-未发货 1-已发货
private Integer logisticsStatus;
//物流单号
private String logisticsNo;
//物流公司名称
private String logisticsName;
//子商品物流状态集合
private List<LogisticsDetail> goodsList;
@Data
public static class LogisticsDetail {
//原始单id
private String tid;
//原始子单id
private String oid;
//三方平台唯一编号
private String specId;
//非码spuId
private String spuId;
//非码skuId
private String skuId;
//物流状态：0-未发货 1-已发货
private Integer logisticsStatus;
//非码商品编号
private String productId;
//限购数量
private Integer limitNumber;
//物流单号
private String logisticsNo;
//物流公司名称
private String logisticsName;
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/GetMallPayConfigVo.java 0 → 100644
package cn.freemud.entities.vo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: GetMallPayConfigVo
* @Package cn.freemud.entities.vo
* @Description:
* @author: ping.wu
* @date: 22-5-24 下午5:51
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class GetMallPayConfigVo {
@NotBlank(message = "商户号不能为空")
private String partnerId;
@NotBlank(message = "小程序id不能为空")
private String appId;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/DirectDeliveryReq.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: DirectDeliveryReq
* @Package cn.freemud.entities.vo.order
* @Description:
* @author: ping.wu
* @date: 22-5-30 上午10:06
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class DirectDeliveryReq {
private String orderCode;
private String partnerId;
private String operator;
/**
* 自动收货任务执行时间毫秒时间戳
*/
private Long taskTime;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/EditLogisticsReq.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: EditLogisticsReq
* @Package cn.freemud.entities.vo
* @Description:
* @author: ping.wu
* @date: 22-5-26 下午10:24
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class EditLogisticsReq {
/**
* 【必填】订单编号
*/
private String orderCode;
/**
* 【必填】物流接入渠道 1.人工 2.旺店通ERP
*/
private Integer logisticsAccessChannel;
/**
* 【非必填】操作人
*/
private String operator;
/**
* 【必填】商户编号
*/
private String partnerId;
/**
* 物流
*/
private List<LogisticsList> logisticsList;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/LogisticsList.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: LogisticsList
* @Package cn.freemud.entities.vo.order
* @Description:
* @author: ping.wu
* @date: 22-5-30 上午11:12
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class LogisticsList {
/**
* 【非必填】物流公司编号
*/
private String logisticsCompanyCode;
/**
* 【必填】物流公司名称
*/
private String logisticsCompanyName;
/**
* 【必填】物流单号
*/
private String expressNo;
/**
* 【必填】物流状态 1:已发货 2:已签收 4:异常 5:取消
*/
private Integer state;
/**
* 物流商品
*/
private List<OrderPack> orderPackList;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/OrderPack.java 0 → 100644
package cn.freemud.entities.vo.order;
import lombok.Data;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: OrderPack
* @Package cn.freemud.entities.vo.order
* @Description:
* @author: ping.wu
* @date: 22-5-30 上午11:13
* @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
*/
@Data
public class OrderPack {
/**
* 订单商品明细ID
*/
private Long orderItemId;
/**
* 商品编号
*/
private String productId;
/**
* 商品序号
*/
private Integer productSeq;
}
order-application-service/src/main/java/cn/freemud/entities/vo/order/PayConfigVo.java
......@@ -24,4 +24,9 @@ public class PayConfigVo {
* 门店支付编号
*/
private String payCode;
/**
* 支付门店
*/
private String storeId;
}
order-application-service/src/main/java/cn/freemud/service/ExposureOrderService.java
package cn.freemud.service;
import cn.freemud.entities.vo.GetMallPayConfigVo;
import cn.freemud.entities.vo.GetPayConfigVo;
import cn.freemud.entities.vo.GetPaySuccessDataRequest;
import cn.freemud.entities.vo.order.PayConfigVo;
import cn.freemud.entities.vo.order.PaySuccessDataVo;
import cn.freemud.enums.AggregationTypeEnum;
import cn.freemud.enums.OrderTackCodeFactory;
import cn.freemud.enums.TakeCodeOrderType;
import cn.freemud.manager.OrderTackCodeManager;
import cn.freemud.service.business.impl.OrderBusinessServiceImpl;
import cn.freemud.service.impl.PayServiceImpl;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
......@@ -52,4 +55,21 @@ public class ExposureOrderService {
vo.setTimeout(timeout);
return vo;
}
/**
* 新商城支付门店配置
*/
public PayConfigVo getMallPayConfig(GetMallPayConfigVo req) {
PayConfigVo vo = new PayConfigVo();
vo.setPrincipalName(payService.getPaymentPrincipalName(req.getPartnerId(), req.getAppId()));
vo.setPayTimeOut(payService.getPartnerPayOvertime(req.getPartnerId()));
AssortmentOpenPlatformIappWxappStore wxAppStore = payService.getIappWxappStoreInfo(req.getAppId(), AggregationTypeEnum.TYPE_7.getCode());
if (wxAppStore == null) {
wxAppStore = new AssortmentOpenPlatformIappWxappStore();
}
vo.setPayCode(wxAppStore.getClientCode());
vo.setStoreId(wxAppStore.getStoreId());
return vo;
}
}
order-application-service/src/main/java/cn/freemud/service/ThirdDeliveryService.java
......@@ -3,6 +3,7 @@ package cn.freemud.service;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
import cn.freemud.entities.dto.delivery.MacCafeCallbackUrlRequestDto;
import cn.freemud.entities.dto.delivery.MallCallbackRequestDto;
import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
......@@ -25,7 +26,7 @@ public interface ThirdDeliveryService {
/**
* 商城配送回调
*/
BaseResponse mallCallbackUrl(CallbackUrlRequestDto request);
BaseResponse mallCallbackUrl(MallCallbackRequestDto request);
/**
* 查询微信配送地址配送费
......
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
......@@ -3,10 +3,15 @@ package cn.freemud.service.delivery;
import cn.freemud.adapter.MessageNoticeAdapter;
import cn.freemud.amp.service.ProduceMQService;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.base.util.DateUtil;
import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.ecology.*;
import cn.freemud.entities.dto.pos.PosBaseRequestDto;
import cn.freemud.entities.vo.order.EditLogisticsReq;
import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
import cn.freemud.entities.vo.order.DirectDeliveryReq;
import cn.freemud.entities.vo.order.LogisticsList;
import cn.freemud.entities.vo.order.OrderPack;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
......@@ -16,6 +21,7 @@ import cn.freemud.management.service.adapter.OrderManagerAdapter;
import cn.freemud.service.ThirdDeliveryService;
import cn.freemud.service.thirdparty.DeliveryFeiginClient;
import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
import cn.freemud.service.thirdparty.OrderServiceClient;
import cn.freemud.service.thirdparty.PosClient;
import cn.freemud.utils.AppLogUtil;
import cn.freemud.utils.DateTimeUtil;
......@@ -36,6 +42,9 @@ import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.request.OrderCollectReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
......@@ -57,9 +66,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -92,6 +100,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
@Autowired
private OrderSdkService orderSdkService;
@Autowired
private OrderServiceClient orderServiceClient;
@Autowired
private MessageNoticeAdapter messageNoticeAdapter;
@Autowired
private MessageCenterClient messageNoticeClient;
......@@ -307,7 +317,55 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
}
@Override
public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
public BaseResponse mallCallbackUrl(MallCallbackRequestDto request) {
QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null);
if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
OrderInfoReqs orderInfoReqs = responseDto.getResult();
if (NewOrderStatus.ACCEPTED.getIndex() == orderInfoReqs.getOrderState()){
DirectDeliveryReq directDeliveryReq = new DirectDeliveryReq();
directDeliveryReq.setOrderCode(request.getTid());
directDeliveryReq.setPartnerId(request.getPartnerId());
directDeliveryReq.setOperator("");
directDeliveryReq.setTaskTime(DateUtil.addDays(new Date(),15).getTime());
BaseResponse response = orderServiceClient.directDelivery(directDeliveryReq);
if (response == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), response.getCode())) {
return ResponseUtil.error(ResponseResult.SYSTEM_BUSINESS_ERROR);
}
}
EditLogisticsReq editLogisticsReq = new EditLogisticsReq();
editLogisticsReq.setOrderCode(orderInfoReqs.getOrderCode());
editLogisticsReq.setLogisticsAccessChannel(2);
editLogisticsReq.setPartnerId(orderInfoReqs.getPartnerId());
editLogisticsReq.setOperator("");
List<LogisticsList> logisticsList = new ArrayList<>();
LogisticsList logistics = new LogisticsList();
logistics.setExpressNo(request.getLogisticsNo());
logistics.setLogisticsCompanyName(request.getLogisticsName());
logistics.setLogisticsCompanyCode("");
logistics.setState(1);
if (CollectionUtils.isNotEmpty(request.getGoodsList())){
Map<Long, OrderItemResp> maps = orderInfoReqs.getOrderItemList().stream().collect(Collectors.toMap(OrderItemResp::getId, orderItemResp -> orderItemResp, (key1, key2) -> key2));
List<OrderPack> orderPackList = new ArrayList<>();
for(MallCallbackRequestDto.LogisticsDetail logisticsDetail: request.getGoodsList()){
OrderPack orderPack = new OrderPack();
orderPack.setOrderItemId(Long.valueOf(logisticsDetail.getOid()));
orderPack.setProductId(logisticsDetail.getSpuId());
OrderItemResp orderItemResp = maps.get(Long.valueOf(logisticsDetail.getOid()));
orderPack.setProductSeq(orderItemResp == null ? 0 : orderItemResp.getProductSeq());
orderPackList.add(orderPack);
}
logistics.setOrderPackList(orderPackList);
}
logisticsList.add(logistics);
editLogisticsReq.setLogisticsList(logisticsList);
BaseResponse editLogistics = orderServiceClient.editLogistics(editLogisticsReq);
if (editLogistics == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), editLogistics.getCode())) {
return ResponseUtil.error(ResponseResult.SYSTEM_BUSINESS_ERROR);
}
return ResponseUtil.success();
}
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/OrderServiceClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.entities.vo.order.EditLogisticsReq;
import cn.freemud.entities.vo.order.DirectDeliveryReq;
import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.QueryInvoiceRepDto;
......@@ -65,4 +67,18 @@ public interface OrderServiceClient {
@PostMapping(value = "/order/v2/refundFailures/successful")
BaseResponse refundFailuresSuccessful(@RequestBody RefundFailuresSuccessfulReq refundFailuresSuccessfulReq);
/**
* 订单物流推送订单
*/
@LogIgnoreFeign(logMessage="editLogistics")
@PostMapping(value = "/order/v2/editLogistics")
BaseResponse editLogistics(@RequestBody EditLogisticsReq editLogisticsReq);
/**
* 订单发货
*/
@LogIgnoreFeign(logMessage="directDelivery")
@PostMapping(value = "/order/v2/directDelivery")
BaseResponse directDelivery(@RequestBody DirectDeliveryReq DeditLogisticsReq);
}
order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java
package cn.freemud.management.service.adapter;
import cn.freemud.management.service.OrderManagerService;
import cn.freemud.management.service.impl.MallOrderMangerServiceImpl;
import cn.freemud.management.service.impl.McCafeMangerServiceImpl;
import cn.freemud.management.service.impl.SaasOrderMangerServiceImpl;
import cn.freemud.management.service.impl.WaimaiOrderMangerServiceImpl;
import cn.freemud.management.service.impl.*;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -54,6 +51,11 @@ public class OrderBeanFactory {
return applicationContext.getBean(MallOrderMangerServiceImpl.class);
}
//商城不能根据渠道，根据业务类型
if(Objects.equals(BizTypeEnum.FM_MALL.getBizType(),orderBean.getBizType())){
return applicationContext.getBean(NewMallOrderMangerServiceImpl.class);
}
return applicationContext.getBean(SaasOrderMangerServiceImpl.class);
}
}
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
......@@ -173,6 +173,8 @@ public class OrderManagerAdapter {
BaseResponse verifyResponse;
if(BizTypeEnum.MALL.getBizType()==orderBean.getBizType()){
verifyResponse = orderVerifyHandle.mallOrderAgreeRefund(orderBean, request);
}else if(BizTypeEnum.FM_MALL.getBizType()==orderBean.getBizType()){//新版saas商城同意退款校验
verifyResponse = orderVerifyHandle.fmMallOrderAgreeRefund(orderBean, request);
}else{
verifyResponse = orderVerifyHandle.orderAgreeRefund(orderBean, request);
}
......
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
......@@ -685,4 +685,39 @@ public class OrderVerifyHandle {
return false;
}
}
/**
* 新版saas商城同意退款校验
*
* @param orderBean
* @param request
* @return
*/
public BaseResponse fmMallOrderAgreeRefund(OrderBeanV1 orderBean, OrderManagerRequest request) {
//已取消的订单不能操作
if (ObjectUtils.equals(OrderStatusV1.CANCEL.getV2Code(), orderBean.getStatusV2())) {
return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED);
}
//判断订单是否有申请退款
if (orderBean.getHasRefund() == null || !orderBean.getHasRefund()) {
return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
}
// //订单是否支持退款
// boolean isCanRefund = false;
// //订单
// boolean isRefundDeliveryFee=false;
// //saas渠道订单，已完成的订单不能操作, 商户配置已完成订单可退款可退款
// if (ObjectUtils.equals(orderBean.getBizType(), BizTypeEnum.MALL.getBizType())) {
// isCanRefund = getRefundConfig(orderBean);
// if (!isCanRefund) {
// return ResponseUtil.error(ResponseResult.ORDER_HAD_AFFIRM_CAN_NOT_REFUND);
// }
// }
// if (isCanRefund) {
// orderBean.setAmount(getRefundAmount(orderBean,isRefundDeliveryFee).longValue());
// }
return ResponseUtil.success();
}
}
\ No newline at end of file
order-management/src/main/java/cn/freemud/management/service/impl/NewMallOrderMangerServiceImpl.java 0 → 100644
package cn.freemud.management.service.impl;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
import cn.freemud.management.enums.OperateType;
import cn.freemud.management.enums.ResponseResult;
import cn.freemud.management.intercept.OrderServiceException;
import cn.freemud.management.service.OrderBaseService;
import cn.freemud.management.service.OrderManagerService;
import cn.freemud.management.service.handle.*;
import cn.freemud.management.util.ResponseUtil;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.constant.ResponseConstant;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Objects;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: rrr
* @Package cn.freemud.management.service.impl
* @Description: 新版商城订单履单操作
* @author:
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Service
public class NewMallOrderMangerServiceImpl implements OrderManagerService {
@Autowired
private MallOrderHandle mallOrderHandle;
@Autowired
private PaymentHandle paymentHandle;
@Autowired
private StockHandle stockHandle;
@Autowired
private ActivityHandle activityHandle;
/**
* 同意退款
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
Byte refundMode = RefundModeEnum.UN_REFUND_GOODS.getIndex();
if(null != orderBean.getAfterSalesOrderResp() && StringUtils.isNotEmpty(orderBean.getAfterSalesOrderResp().getExtInfo())){
AfterOrderExtInfoDto afterOrderExtInfoDto = JSONObject.parseObject(orderBean.getAfterSalesOrderResp().getExtInfo(),AfterOrderExtInfoDto.class);
if(null !=afterOrderExtInfoDto) {
refundMode = afterOrderExtInfoDto.getRefundMode();
}
}
if (Objects.equals(RefundModeEnum.REFUND_ALL.getIndex(), refundMode) && Objects.nonNull(orderBean.getAfterSalesOrderResp()) && Objects.equals(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
// 修改售后单状态为退货中
mallOrderHandle.mallOrderAgreeApply(request, orderBean);
} else {
//支付退款
PayRefundResponse refundResponse = new PayRefundResponse();
try {
refundResponse = paymentHandle.refund(request, orderBean);
} catch (OrderServiceException orderEx) {
return ResponseUtil.error(orderEx.getResult());
}
//订单同意退款
mallOrderHandle.refundAgree(request, refundResponse, orderBean);
//冲正库存
stockHandle.revert(request, orderBean);
}
return ResponseUtil.success();
}
/**
* 拒绝退款
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderRejectRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
//拒绝退款
mallOrderHandle.mallRefundReject(request,orderBean);
return ResponseUtil.success();
}
/**
* 拒单
*
* @param request
* @param orderBean
* @return
*/
@Override
public BaseResponse<OrderManagerResponse> orderReject(OrderManagerRequest request, OrderBeanV1 orderBean) {
return ResponseUtil.error("501","暂无");
}
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/BizTypeEnum.java
......@@ -22,6 +22,8 @@ public enum BizTypeEnum {
ADVANCE_ORDER(7, "预定业务"),
MALL(8, "微商城业务"),
FM_MALL(12, "商城业务"),
// CASHIER(10, "收款业务"),
LGS_SELF_HELP_PARKING(97, "农工商停车自助积分订单"),
LGS_MANUAL_RECORD_PARKING(98, "农工商停车手工录单"),
......
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