记得上下班打卡 | git大法好,push需谨慎

Commit 133c8c63 authored by 胡佳晨's avatar 胡佳晨

增加退款订单详情

parent 03e6c6ff
......@@ -19,5 +19,5 @@ public interface IGoblinOrderAppService {
ResponseDto<Boolean> applyRefund(GoblinAppOrderRefundParam param);
ResponseDto<GoblinBackOrderVo> refundDetails(String orderId);
ResponseDto<List<GoblinBackOrderVo>> refundDetails(String orderId);
}
......@@ -4,10 +4,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.codec.vo.EncryptedReq;
import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderDetailsVo;
import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderListVo;
import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.param.GoblinAppOrderRefundParam;
import com.liquidnet.service.goblin.param.PayAgainParam;
import com.liquidnet.service.goblin.param.SyncOrderParam;
......@@ -55,7 +52,7 @@ public class GoblinOrderAppController {
})
public ResponseDto<GoblinAppOrderDetailsVo> orderDetails(@RequestParam("orderId") @Valid String orderId) {
String uid = CurrentUtil.getCurrentUid();
return goblinOrderAppService.orderDetails(orderId,uid);
return goblinOrderAppService.orderDetails(orderId, uid);
}
@PostMapping("applyRefund")
......@@ -64,4 +61,13 @@ public class GoblinOrderAppController {
return goblinOrderAppService.applyRefund(param);
}
@PostMapping("refundDetails")
@ApiOperation("退款详情")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
})
public ResponseDto<List<GoblinBackOrderVo>> refundDetails(@RequestParam("orderId") @Valid String orderId) {
return goblinOrderAppService.refundDetails(orderId);
}
}
......@@ -264,8 +264,14 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
}
@Override
public ResponseDto<GoblinBackOrderVo> refundDetails(String orderId) {
return null;
public ResponseDto<List<GoblinBackOrderVo>> refundDetails(String orderId) {
List<GoblinBackOrderVo> vos = ObjectUtil.goblinBackOrderVoArrayList();
List<String> backOrderList = redisUtils.getBackOrderByOrderId(orderId);
for (String backOrderId : backOrderList) {
GoblinBackOrderVo vo = redisUtils.getBackOrderVo(backOrderId);
vos.add(vo);
}
return ResponseDto.success(vos);
}
private GoblinBackOrderLog initBackLog(String orderId, String uid, LocalDateTime now) {
......
......@@ -15,6 +15,7 @@ import com.mongodb.client.model.WriteModel;
import org.bson.Document;
import java.util.ArrayList;
import java.util.List;
public class ObjectUtil {
private static final PagedResult<GoblinStoreMgtGoodsListVo> goblinStoreMgtGoodsVoPagedResult = new PagedResult<>();
......@@ -57,12 +58,11 @@ public class ObjectUtil {
private static final ArrayList<GoblinStoreBackOrderListVo> goblinStoreBackOrderListVoArrayList = new ArrayList<>();
private static final ArrayList<GoblinAppOrderListVo> goblinAppOrderListVoArrayList = new ArrayList<>();
private static final ArrayList<GoblinBackOrderSkuVo> goblinBackOrderSkuVoArrayList = new ArrayList<>();
private static final ArrayList<GoblinBackOrderVo> goblinBackOrderVoArrayList = new ArrayList<>();
private static final ArrayList<GoblinFrontNavigationVo> goblinFrontNavigationVoArrayList = new ArrayList<>();
private static final BasicDBObject basicDBObject = new BasicDBObject();
private static final ArrayList<WriteModel<Document>> writeModelDocumentArrayList = new ArrayList<>();
public static PagedResult<GoblinStoreMgtGoodsListVo> getGoblinStoreMgtGoodsVoPagedResult() {
return goblinStoreMgtGoodsVoPagedResult.clone();
}
......@@ -71,6 +71,10 @@ public class ObjectUtil {
return goblinStoreNoticeVoPagedResult.clone();
}
public static ArrayList<GoblinBackOrderVo> goblinBackOrderVoArrayList() {
return (ArrayList<GoblinBackOrderVo>) goblinBackOrderVoArrayList.clone();
}
public static ArrayList<GoblinBackOrderSkuVo> goblinBackOrderSkuVoArrayList() {
return (ArrayList<GoblinBackOrderSkuVo>) goblinBackOrderSkuVoArrayList.clone();
}
......
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