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

Skip to content

L
liquidnet-bus-v1
Commit bd4a7d65 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

下单接口 迁移 goblin->order

parent 877cc4a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 825 additions and 109 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinOrderAppService.java
View file @ bd4a7d65
......@@ -2,10 +2,7 @@ package com.liquidnet.service.goblin.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderDetailsVo;
import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderListVo;
import com.liquidnet.service.goblin.dto.vo.GoblinBackOrderVo;
import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.param.GoblinAppOrderRefundParam;
import javax.servlet.http.HttpServletRequest;
......@@ -28,4 +25,6 @@ public interface IGoblinOrderAppService {
ResponseDto<List<GoblinBackOrderVo>> refundDetails(String orderId);
String huiFuSync(HttpServletRequest request);
ResponseDto<List<GoblinMailVo>> getMail(String orderId, String mailId);
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinOrderService.java
View file @ bd4a7d65
......@@ -24,6 +24,4 @@ public interface IGoblinOrderService {
ResponseDto<Integer> checkOrderResultMaterCode(String materCode);
ResponseDto<List<GoblinMailVo>> getMail(String orderId,String mailId);
}
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ bd4a7d65
......@@ -104,8 +104,8 @@ liquidnet:
pay: http://ttestdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://ttestdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl: http://ttestorder.zhengzai.tv/order/order/syncOrder
goblinUrl: http://ttestgoblin.zhengzai.tv/goblin/order/pay/syncOrder
goblinRefundUrl: http://ttestgoblin.zhengzai.tv/goblin/order/pay/refundSyncOrder
goblinUrl: http://ttestorder.zhengzai.tv/order/goblin/syncOrder
goblinRefundUrl: http://ttestorder.zhengzai.tv/order/goblin/refundSyncOrder
dragon:
notifyUrl: https://ttestdragon.zhengzai.tv/dragon
urls:
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml
View file @ bd4a7d65
......@@ -105,10 +105,9 @@ global-auth:
- ${liquidnet.info.context}/zhengzai/app/market/list
- ${liquidnet.info.context}/zhengzai/app/spu/list
- ${liquidnet.info.context}/zhengzai/app/store/list
- ${liquidnet.info.context}/order/pay/syncOrder
- ${liquidnet.info.context}/store/coupon/backCoupon
- ${liquidnet.info.context}/store/coupon/useCoupon
- ${liquidnet.info.context}/order/pay/refundSyncOrder
oncheck-url-pattern:
-
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml
View file @ bd4a7d65
......@@ -100,6 +100,8 @@ global-auth:
# - ${liquidnet.info.context}/swagger-resources/**
# - ${liquidnet.info.context}/v2/api-docs*
- ${liquidnet.info.context}/order/syncOrder
- ${liquidnet.info.context}/order/pay/syncOrder
- ${liquidnet.info.context}/order/pay/refundSyncOrder
# -----------------------------------------------------------
# -----------------------------------------------------------
......
liquidnet-bus-feign/liquidnet-api-feign-candy/pom.xml
View file @ bd4a7d65
......@@ -17,6 +17,12 @@
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-goblin-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
......
liquidnet-bus-feign/liquidnet-api-feign-candy/src/main/java/com/liquidnet/service/feign/candy/api/FeignGoblinBaseClient.java 0 → 100644
View file @ bd4a7d65
package com.liquidnet.service.feign.candy.api;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.candy.param.BackCouponParam;
import com.liquidnet.service.candy.vo.CandyCouponPreviewVo;
import com.liquidnet.service.goblin.dto.vo.GoblinUseResultVo;
import feign.hystrix.FallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
@Component
@FeignClient(name = "liquidnet-service-goblin",
contextId = "FeignGoblinBaseClient", path = "",
url = "${liquidnet.service.goblin.url}",
fallback = FallbackFactory.Default.class)
public interface FeignGoblinBaseClient {
//使用券 [券id] [消费内容] [价格] [spuId逗号隔开]
@PostMapping(value = "goblin/store/coupon/useCoupon")
ResponseDto<GoblinUseResultVo> useCoupon(@RequestParam("ucouponId") String ucouponId, @RequestParam("content") String content, @RequestParam("totalPrice") BigDecimal totalPrice, @RequestParam("spuId") String spuId, @RequestParam("uid") String uid);
//回退券 [list<Data>] [券id ， 用户id]
@PostMapping(value = "goblin/store/coupon/backCoupon")
ResponseDto<Boolean> backCoupon(@RequestBody List<BackCouponParam> params);
}
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinAppZhengzaiController.java
View file @ bd4a7d65
......@@ -6,7 +6,6 @@ import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
import com.liquidnet.service.goblin.service.IGoblinOrderService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -23,8 +22,8 @@ public class GoblinAppZhengzaiController {
@Autowired
IGoblinAppZhengzaiService goblinAppZhengzaiService;
@Autowired
IGoblinOrderService goblinOrderService;
// @Autowired
// IGoblinOrderService goblinOrderService;
@Autowired
IGoblinOrderAppService goblinOrderAppService;
......@@ -54,25 +53,6 @@ public class GoblinAppZhengzaiController {
return ResponseDto.success(goblinAppZhengzaiService.getSpuList(marketId, storeId));
}
@PostMapping("fc7bce6d6c2213b866f76493f92224b7")
@ApiOperation("正在下单-下单")
public ResponseDto<GoblinPayInnerResultVo> checkOrder(@RequestBody GoblinOrderParam param) {
if (param.getUid() == null) {
param.setUid("zhengzai");
}
return goblinOrderService.checkOrder(param, param.getUid());
}
@PostMapping("checkPayment")
@ApiOperation("订单状态")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "masterCode", example = "1"),
})
public ResponseDto<Integer> checkOrderResultMasterCode(@RequestParam("masterCode") @Valid String masterCode) {
return goblinOrderService.checkOrderResultMaterCode(masterCode);
}
@PostMapping("listByCode")
@ApiOperation("列表[根据masterCode]")
@ApiImplicitParams({
......@@ -137,6 +117,6 @@ public class GoblinAppZhengzaiController {
})
public ResponseDto<List<GoblinMailVo>> getMail(@RequestParam("orderId") @Valid String orderId,
@RequestParam("mailId") @Valid String mailId) {
return goblinOrderService.getMail(orderId, mailId);
return goblinOrderAppService.getMail(orderId, mailId);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinOrderAppController.java
View file @ bd4a7d65
......@@ -92,4 +92,16 @@ public class GoblinOrderAppController {
public ResponseDto<List<GoblinBackOrderVo>> refundDetails(@RequestParam("orderId") @Valid String orderId) {
return goblinOrderAppService.refundDetails(orderId);
}
@PostMapping("mailData")
@ApiOperation("快递详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "orderId", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mailId", value = "mailId", example = "1"),
})
public ResponseDto<List<GoblinMailVo>> getMail(@RequestParam("orderId") @Valid String orderId,
@RequestParam("mailId") @Valid String mailId) {
return goblinOrderAppService.getMail(orderId, mailId);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinStoreZhengzaiController.java
View file @ bd4a7d65
......@@ -3,9 +3,7 @@ package com.liquidnet.service.goblin.controller;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.param.SyncOrderParam;
import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
import com.liquidnet.service.goblin.service.IGoblinOrderService;
import com.liquidnet.service.goblin.service.IGoblinStoreZhengzaiService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
......@@ -24,8 +22,8 @@ public class GoblinStoreZhengzaiController {
@Autowired
IGoblinStoreZhengzaiService goblinStoreZhengzaiService;
@Autowired
IGoblinOrderService goblinOrderService;
// @Autowired
// IGoblinOrderService goblinOrderService;
@Autowired
IGoblinOrderAppService goblinOrderAppService;
......@@ -44,15 +42,6 @@ public class GoblinStoreZhengzaiController {
return goblinStoreZhengzaiService.getSpuList(marketId);
}
@PostMapping("fc7bce6d6c2213b866f76493f92224b7")
@ApiOperation("正在下单-下单")
public ResponseDto<GoblinPayInnerResultVo> checkOrder(@RequestBody GoblinOrderParam param) {
if (param.getUid() == null) {
param.setUid("zhengzai");
}
return goblinOrderService.checkOrder(param, param.getUid());
}
@PostMapping("list")
@ApiOperation("订单列表[商铺]")
@ApiImplicitParams({
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreOrderController.java
View file @ bd4a7d65
......@@ -27,8 +27,8 @@ import java.util.List;
public class GoblinStoreOrderController {
@Autowired
IGoblinStoreOrderService goblinStoreOrderService;
@Autowired
IGoblinOrderService goblinOrderService;
// @Autowired
// IGoblinOrderService goblinOrderService;
@ApiOperation(value = "订单列表")
@ApiImplicitParams({
......@@ -150,15 +150,4 @@ public class GoblinStoreOrderController {
return goblinStoreOrderService.changeExpressMailNo(orderId, mailId, mailNo);
}
@PostMapping("mailData")
@ApiOperation("快递详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "orderId", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mailId", value = "mailId", example = "1"),
})
public ResponseDto<List<GoblinMailVo>> getMail(@RequestParam("orderId") @Valid String orderId,
@RequestParam("mailId") @Valid String mailId) {
return goblinOrderService.getMail(orderId, mailId);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java
View file @ bd4a7d65
......@@ -643,6 +643,22 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
mongoUtils.insertGoblinOrderLogVo(logVo);
}
@Override
public ResponseDto<List<GoblinMailVo>> getMail(String orderId, String mailId) {
List<GoblinMailVo> voList = redisUtils.getGoblinMail(orderId);
for (GoblinMailVo vo : voList) {
if (mailId.equals(vo.getMailId())) {
List<GoblinOrderSkuVo> orderSkuVos = ObjectUtil.getGoblinOrderSkuVoArrayList();
for (String orderSkuId : vo.getOrderSkuVoIds()) {
GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
orderSkuVos.add(orderSkuVo);
}
vo.setOrderSkuVos(orderSkuVos);
}
}
return ResponseDto.success(voList);
}
//获取 订单剩余可支付时间[S]
private long getRestTime(GoblinStoreOrderVo orderVo) {
long restTime = 0L;
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java
View file @ bd4a7d65
......@@ -544,6 +544,13 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
if (orderVo.getStatus() != GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
return ResponseDto.failure("无法发货");
}
List<String> backOrderIds = redisUtils.getBackOrderByOrderId(orderId);
for (String backOrderId:backOrderIds) {
GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
if (!(backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_3.getValue()) || backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_5.getValue()) || backOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_BACK_STATUS_9.getValue()))) {
return ResponseDto.failure("申请失败");
}
}
List<String> skuIds;
if (orderSkuIds == null) {
skuIds = orderVo.getOrderSkuVoIds();
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java
View file @ bd4a7d65
......@@ -214,7 +214,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
//排序
priceList = priceList.stream().sorted().collect(Collectors.toList());
spuVo.setPriceGe(priceList.get(0));
spuVo.setSpecMode("2");
// spuVo.setSpecMode("2");
spuVo.setPriceLe(priceList.get(priceList.size() - 1));
spuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId()));
spuVo.setDelFlg("0");
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/pom.xml
View file @ bd4a7d65
......@@ -31,6 +31,16 @@
<artifactId>liquidnet-service-candy-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-goblin-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-api-feign-candy</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-common-sms</artifactId>
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinOrderController.java → liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/GoblinOrderController.java
View file @ bd4a7d65
package com.liquidnet.service.goblin.controller;
package com.liquidnet.service.order.controller;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.base.ResponseDto;
......@@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@Slf4j
@Api(tags = "订单相关-支付相关")
@Api(tags = "商城-支付相关")
@RestController
@RequestMapping("/order/pay")
@RequestMapping("/goblin")
public class GoblinOrderController {
@Autowired
......@@ -79,4 +79,25 @@ public class GoblinOrderController {
public ResponseDto<Integer> checkOrderResultMasterCode(@RequestParam("masterCode") @Valid String masterCode) {
return goblinAppOrderService.checkOrderResultMaterCode(masterCode);
}
@PostMapping("zhengzai/fc7bce6d6c2213b866f76493f92224b7")
@ApiOperation("正在下单-下单")
public ResponseDto<GoblinPayInnerResultVo> checkOrderZhengzai(@RequestBody GoblinOrderParam param) {
if (param.getUid() == null) {
param.setUid("zhengzai");
}
return goblinAppOrderService.checkOrder(param, param.getUid());
}
@PostMapping("zhengzai/checkPayment")
@ApiOperation("订单状态")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "masterCode", example = "1"),
})
public ResponseDto<Integer> checkOrderResultMasterCodeZhengzai(@RequestParam("masterCode") @Valid String masterCode) {
return goblinAppOrderService.checkOrderResultMaterCode(masterCode);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java → liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @ bd4a7d65
package com.liquidnet.service.goblin.service.impl;
package com.liquidnet.service.order.service.impl;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
import com.liquidnet.service.base.*;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.feign.candy.api.FeignGoblinBaseClient;
import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
import com.liquidnet.service.goblin.dto.manage.GoblinOrderSkuParam;
import com.liquidnet.service.goblin.dto.manage.GoblinOrderStoreParam;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.param.*;
import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
import com.liquidnet.service.goblin.entity.GoblinOrderSku;
import com.liquidnet.service.goblin.entity.GoblinStoreOrder;
import com.liquidnet.service.goblin.service.GoblinCouponService;
import com.liquidnet.service.goblin.param.*;
import com.liquidnet.service.candy.param.BackCouponParam;
import com.liquidnet.service.goblin.service.IGoblinOrderService;
import com.liquidnet.service.goblin.util.*;
import com.liquidnet.service.order.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -31,7 +35,10 @@ import org.springframework.util.MultiValueMap;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
import static com.liquidnet.commons.lang.util.DateUtil.getNowTime;
......@@ -49,7 +56,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
@Autowired
GoblinOrderUtils orderUtils;
@Autowired
GoblinCouponService goblinCouponService;
FeignGoblinBaseClient feignGoblinBaseClient;
@Value("${liquidnet.service.order.url-pay.pay}")
private String payUrl;
......@@ -186,7 +193,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
params.add(backCouponParam);
}
if (params.size() > 0) {
goblinCouponService.backCoupon(params);
feignGoblinBaseClient.backCoupon(params);
}
if (e.getMessage() == null) {
......@@ -300,7 +307,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
//优惠券
BigDecimal voucherPrice = BigDecimal.ZERO;
if (platVoucherCode != null && !platVoucherCode.equals("")) {
TempCouponVo tempCouponVo = redisUtils.getTempCoupon(platVoucherCode);
String spuIds = "";
for (GoblinOrderSkuParam item : storeParam.getGoblinOrderSkuParamArrayList()) {
String pre = GoblinStatusConst.MarketPreStatus.getPre(item.getSpuId());
......@@ -310,15 +316,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
spuIds = spuIds.concat(item.getSpuId() + ",");
}
}
if (tempCouponVo != null) {
for (String spuId : spuIds.split(",")) {
if (tempCouponVo.getSpuIdList().contains(spuId)) {
voucherPrice = tempCouponVo.getValue();
break;
}
}
} else {
HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds, uid);
HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds, uid);
if (hashMap != null) {
voucherPrice = (BigDecimal) hashMap.get("voucher");
Integer typeVoucher = (Integer) hashMap.get("type");
if (typeVoucher.equals(-1)) {
......@@ -340,13 +339,16 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
spuIds = spuIds.concat(item.getSpuId() + ",");
}
}
GoblinUseResultVo storeCouponVo = goblinCouponService.useCoupon(storeVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds, uid);
storeVoucherPrice = storeCouponVo.getValue();
String typeVoucher = storeCouponVo.getCouType();
if (typeVoucher.equals("-1")) {
throw new Exception("店铺券不可用");
} else {
storeCodeList.add(storeVoucherCode);
ResponseDto<GoblinUseResultVo> storeCouponVo = feignGoblinBaseClient.useCoupon(storeVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds, uid);
String typeVoucher;
if (!(storeCouponVo == null || storeCouponVo.getData() == null)) {
storeVoucherPrice = storeCouponVo.getData().getValue();
typeVoucher = storeCouponVo.getData().getCouType();
if (typeVoucher.equals("-1")) {
throw new Exception("店铺券不可用");
} else {
storeCodeList.add(storeVoucherCode);
}
}
}
......@@ -882,7 +884,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
backCouponParam.setuCouponIds(orderVo.getStoreCouponId());
backCouponParam.setUid(orderVo.getUserId());
params.add(backCouponParam);
goblinCouponService.backCoupon(params);
feignGoblinBaseClient.backCoupon(params);
}
}
backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue());
......@@ -948,22 +950,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
return "success";
}
@Override
public ResponseDto<List<GoblinMailVo>> getMail(String orderId, String mailId) {
List<GoblinMailVo> voList = redisUtils.getGoblinMail(orderId);
for (GoblinMailVo vo : voList) {
if (mailId.equals(vo.getMailId())) {
List<GoblinOrderSkuVo> orderSkuVos = ObjectUtil.getGoblinOrderSkuVoArrayList();
for (String orderSkuId : vo.getOrderSkuVoIds()) {
GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
orderSkuVos.add(orderSkuVo);
}
vo.setOrderSkuVos(orderSkuVos);
}
}
return ResponseDto.success(voList);
}
private boolean noZhengzaiOrder(String uid) {
return !uid.equals("zhengzai");
}
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinMongoUtils.java 0 → 100644
View file @ bd4a7d65
package com.liquidnet.service.order.utils;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCouponFilterParam;
import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsFilterParam;
import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtNoticeFilterParam;
import com.liquidnet.service.goblin.dto.manage.vo.GoblinMgtCategorySpecVo;
import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtCouponListVo;
import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
import com.liquidnet.service.goblin.entity.GoblinFrontHotWord;
import com.liquidnet.service.goblin.entity.GoblinFrontNavigation;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.UpdateOneModel;
import com.mongodb.client.model.WriteModel;
import com.mongodb.client.result.DeleteResult;
import com.mongodb.client.result.UpdateResult;
import org.apache.commons.lang3.StringUtils;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@Component
public class GoblinMongoUtils {
@Autowired
MongoTemplate mongoTemplate;
@Autowired
MongoConverter mongoConverter;
@Autowired
GoblinRedisUtils redisUtils;
public GoblinStoreInfoVo getStoreInfoVo(String storeId) {
return mongoTemplate.findOne(Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0")),
GoblinStoreInfoVo.class, GoblinStoreInfoVo.class.getSimpleName());
}
// SPU信息
public GoblinGoodsInfoVo getGoodsInfoVo(String spuId) {
// return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0").and("shelvesStatus").is("3")),
// return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0")),
return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId)),
GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
}
// SKU信息
public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
// return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId).and("delFlg").is("0").and("shelvesStatus").is("3")),
// return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId).and("delFlg").is("0")),
return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId)),
GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
}
//添加 订单vo全量
public GoblinStoreOrderVo insertGoblinStoreOrderVo(GoblinStoreOrderVo vo) {
return mongoTemplate.insert(vo, GoblinStoreOrderVo.class.getSimpleName());
}
public UpdateResult updateGoblinStoreOrderVo(String orderId, GoblinStoreOrderVo data) {
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
return mongoTemplate.getCollection(GoblinStoreOrderVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderId").is(orderId)).getQueryObject(),
object);
}
//添加 订单SkuVo全量
public GoblinOrderSkuVo insertGoblinOrderSkuVo(GoblinOrderSkuVo vo) {
return mongoTemplate.insert(vo, GoblinOrderSkuVo.class.getSimpleName());
}
public UpdateResult updateGoblinOrderSkuVo(String orderSkuId, GoblinOrderSkuVo data) {
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
return mongoTemplate.getCollection(GoblinOrderSkuVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderSkuId").is(orderSkuId)).getQueryObject(),
object);
}
//添加 操作日志
public GoblinOrderLogVo insertGoblinOrderLogVo(GoblinOrderLogVo vo) {
return mongoTemplate.insert(vo, GoblinOrderLogVo.class.getSimpleName());
}
//修改 订单退款数据
public UpdateResult updateGoblinBackOrderVo(String backOrderId, GoblinBackOrderVo data) {
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(data));
return mongoTemplate.getCollection(GoblinBackOrderVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("backOrderId").is(backOrderId)).getQueryObject(),
object);
}
//获取 订单退款数据根据orderCode
public GoblinBackOrderVo getGoblinBackOrderVoByBackCode(String backCode) {
return mongoTemplate.findOne(Query.query(Criteria.where("backCode").is(backCode)), GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
}
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinOrderUtils.java 0 → 100644
View file @ bd4a7d65
package com.liquidnet.service.order.utils;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.candy.param.BackCouponParam;
import com.liquidnet.service.candy.vo.CandyCouponVo;
import com.liquidnet.service.candy.vo.CandyUseResultVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
@Component
@Slf4j
public class GoblinOrderUtils {
@Value("${liquidnet.service.adam.url}")
private String adamUrl;
@Value("${liquidnet.service.candy.url}")
private String candyUrl;
@Value("${liquidnet.service.stone.url}")
private String stoneUrl;
@Autowired
GoblinRedisUtils redisUtils;
public AdamRscPolymer01Vo adamAddressEnterMember(String uid, String enterIds, String addressId) {
try {
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8");
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("addressId", addressId);
params.add("entersIds", enterIds);
params.add("uid", uid);
String resultData = HttpUtil.post(adamUrl + "/adam/rsc/inquire/of_buy_ticket", params, header);
ResponseDto<AdamRscPolymer01Vo> vo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamRscPolymer01Vo>>() {
});
if (null != vo.getData()) {
return vo.getData();
} else {
return null;
}
} catch (Exception e) {
log.error("获取用户信息,e:{}", e);
e.printStackTrace();
return null;
}
}
//判断 数量限购
public String judgeOrderLimit(String uid, String skuId, int number, int limitCount) {
int buyCount = redisUtils.getSkuCountByUid(uid, skuId);
if (buyCount + number > limitCount) {
return "已超出限购数量";
} else {
int a = redisUtils.incrSkuCountByUid(uid, skuId, number);
return "";
}
}
//判断指定人群购买
public Boolean judgeOrderRose(Boolean isMember, String skuId, String mobile, int buyFactor) {
Boolean result = false;
switch (buyFactor) {
case 0:
result = true;
break;
case 1:
result = isMember;
break;
case 2:
result = redisUtils.getSkuCanBuyByUid(mobile, skuId);
break;
}
return result;
}
/**
* 使用优惠券
*
* @param uCouponId 券id
* @param content 消费内容
* @param totalPrice 订单总价
* @return
*/
public HashMap<String, Object> useCoupon(String uCouponId, String content, BigDecimal totalPrice, String spuId, String uid) {
HashMap<String, Object> hashMap = CollectionUtil.mapStringObject();
try {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uCouponId", uCouponId);
params.add("content", content);
params.add("totalPrice", totalPrice.toString());
params.add("goodId", spuId);
params.add("performanceId", "null");
params.add("timeId", "null");
params.add("ticketId", "null");
params.add("uid", uid);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Authorization", "Bearer " + CurrentUtil.getToken());
header.add("Accept", "application/json;charset=UTF-8");
log.debug("url=" + candyUrl + "/candy-coupon/use");
String returnData = HttpUtil.post(candyUrl + "/candy-coupon/use", params, header);
ResponseDto<CandyUseResultVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<CandyUseResultVo>>() {
});
CandyUseResultVo candyUseResultVo = innerReturnVo.getData();
Integer type = candyUseResultVo.getCouType();
BigDecimal value = candyUseResultVo.getValue();
BigDecimal voucher = BigDecimal.ZERO;
switch (type) {
case -1:
voucher = BigDecimal.valueOf(-1);
break;
case 1:
voucher = voucher.add(value);
break;
case 2:
voucher = voucher.add(value);
break;
case 3:
voucher = voucher.add(totalPrice);
break;
case 4:
voucher = totalPrice.subtract(totalPrice.multiply(value));
break;
default:
voucher = BigDecimal.ZERO;
break;
}
hashMap.put("type", type);
hashMap.put("voucher", voucher.setScale(2, BigDecimal.ROUND_HALF_UP));
return hashMap;
} catch (Exception e) {
log.error("用券ERROR:{}", e);
return null;
}
}
public void backCoupon(String uCouponId, String uid) {
try {
BackCouponParam param = BackCouponParam.getNew();
param.setuCouponIds(uCouponId);
param.setUid(uid);
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Authorization", "Bearer " + CurrentUtil.getToken());
header.add("Accept", "application/json;charset=UTF-8");
ArrayList<BackCouponParam> params = new ArrayList();
params.add(param);
String jsonString = JSON.toJSONString(params);
String returnData = HttpUtil.postRaw(candyUrl + "/candy-coupon/useBack", jsonString, header);
} catch (Exception e) {
log.error("回退券ERROR:{}", e);
}
}
public CandyCouponVo getCouponDetails(String uCouponId) {
try {
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Authorization", "Bearer " + CurrentUtil.getToken());
header.add("Accept", "application/json;charset=UTF-8");
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uCouponIds", uCouponId);
String returnData = HttpUtil.post(candyUrl + " /candy-coupon/receive/ListById", params, header);
ResponseDto<CandyCouponVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<CandyCouponVo>>() {
});
return innerReturnVo.getData();
} catch (Exception e) {
log.error("回退券ERROR:{}", e);
CandyCouponVo vo = CandyCouponVo.getNew();
vo.setUcouponId(uCouponId);
vo.setTitle("");
return vo;
}
}
public void doTask(String uid, BigDecimal price) {
try {
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8");
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("score", price.intValue() + "");
params.add("content", "购买商品:");
params.add("uid", uid);
String resultData = HttpUtil.post(stoneUrl + "/user/logs/in2111", params, header);
} catch (Exception e) {
log.error("添加积分失败,e:{}", e);
e.printStackTrace();
}
}
public void desTask(String uid, BigDecimal price) {
try {
MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
header.add("Accept", "application/json;charset=UTF-8");
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("score", price.intValue() + "");
params.add("content", "购买商品:");
params.add("uid", uid);
String resultData = HttpUtil.post(stoneUrl + "/user/logs/de2111", params, header);
} catch (Exception e) {
log.error("添加积分失败,e:{}", e);
e.printStackTrace();
}
}
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/ObjectUtil.java
View file @ bd4a7d65
package com.liquidnet.service.order.utils;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.goblin.dto.vo.GoblinMailVo;
import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
import com.liquidnet.service.goblin.entity.GoblinOrderSku;
import com.liquidnet.service.candy.param.BackCouponParam;
import com.liquidnet.service.goblin.param.GoblinOrderSqlParam;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
import com.mongodb.BasicDBObject;
......@@ -34,10 +39,29 @@ public class ObjectUtil {
private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
private static final BasicDBObject basicDBObject = new BasicDBObject();
private static final ArrayList<KylinOrderCoupons> kylinOrderCouponsArrayList = new ArrayList<>();
private static final ArrayList<GoblinOrderSqlParam> goblinOrderSqlParamArrayList = new ArrayList<>();
private static final ArrayList<GoblinOrderSku> goblinOrderSkuArrayList = new ArrayList<>();
private static final ArrayList<BackCouponParam> backCouponParam = new ArrayList<>();
private static final ArrayList<GoblinMailVo> goblinMailVo = new ArrayList<>();
private static final ArrayList<GoblinOrderSkuVo> goblinOrderSkuVoArrayList = new ArrayList<>();
public static Object[] objectsArray;
public static final Integer[] integerArray2 = new Integer[2];
public static ArrayList<GoblinOrderSqlParam> getGoblinOrderSqlParamArrayListList() {
return (ArrayList<GoblinOrderSqlParam>) goblinOrderSqlParamArrayList.clone();
}
public static ArrayList<GoblinOrderSkuVo> getGoblinOrderSkuVoArrayList() {
return (ArrayList<GoblinOrderSkuVo>) goblinOrderSkuVoArrayList.clone();
}
public static ArrayList<GoblinMailVo> goblinMailVo() {
return (ArrayList<GoblinMailVo>) goblinMailVo.clone();
}
public static LinkedList<Object[]> cloneLinkedListObj() {
return (LinkedList<Object[]>) linkedListObj.clone();
}
......@@ -54,10 +78,18 @@ public class ObjectUtil {
return (HashMap<String, Object>) hashMapStringAndObject.clone();
}
public static ArrayList<BackCouponParam> getBackCouponParam() {
return (ArrayList<BackCouponParam>) backCouponParam.clone();
}
public static HashMap<String, Integer> cloneHashMapStringAndInteger() {
return (HashMap<String, Integer>) hashMapStringAndInteger.clone();
}
public static ArrayList<GoblinOrderSku> getGoblinOrderSkuArrayList() {
return (ArrayList<GoblinOrderSku>) goblinOrderSkuArrayList.clone();
}
public static ArrayList<AdamEntersVo> cloneArrayListObject() {
return (ArrayList<AdamEntersVo>) arrayListObject.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