Merge branch 'exchange_zhihu_func' into pre

netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -259,7 +259,6 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 			orderDon.setUserId(userId);
 			orderDon.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
 			orderDon.setYhsId(yhsId);
-			orderDon.setExCode(exCodeOrderDon.getExCode());
 			orderDonMapper.updateById(orderDon);
 			if (orderDon.getIsDp()) {
 				//是否已经发送优惠加购车票
@@ -305,6 +304,7 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 			//默认数量为1
 			orderDon.setNum(1);
 			orderDon.setGoodsId(sku.getGoodsId());
+			orderDon.setExCode(exCodeOrderDon.getExCode());
 			orderDon.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
 			if (relation.getStartTime() == null || relation.getExpiryTime() == null) {
 				orderDon.setStatus(OrderDon.Status.hasPayment);

netflix-web/src/main/java/com/cyksj/web/controller/external/ExternalController.java

@@ -94,6 +94,7 @@ public class ExternalController {
 			orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
 					.eq(OrderDon::getUserId, exchangeCode.getUserId())
 					.eq(OrderDon::getType, OrderDon.Type.EX_CODE)
+					.eq(OrderDon::getSkuId, exchangeCode.getSkuId())
 					.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
 					.last("limit 1"));
 		}
@@ -106,16 +107,19 @@ public class ExternalController {
 			exchangeCodeMapper.updateById(exchangeCode);
 
 			//虚物订单退款,清出车队,车票变为已过期
-			GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
-			GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
-			orderCommonService.clearUnrealGoodsDetail(orderDon, goodsDon.getType(), sku);
+			try {
+				GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
+				GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+				orderCommonService.clearUnrealGoodsDetail(orderDon, goodsDon.getType(), sku);
 
-			//重新生成兑换码
-			ExchangeCodeReq exchangeCodeReq = new ExchangeCodeReq();
-			exchangeCodeReq.setNumber(1);
-			exchangeCodeReq.setGoodsId(orderDon.getGoodsId());
-			exchangeCodeReq.setSkuId(orderDon.getSkuId());
-			exchangeCodeService.createExchangeCode(exchangeCodeReq);
+				//重新生成兑换码
+				ExchangeCodeReq exchangeCodeReq = new ExchangeCodeReq();
+				exchangeCodeReq.setNumber(1);
+				exchangeCodeReq.setGoodsId(orderDon.getGoodsId());
+				exchangeCodeReq.setSkuId(orderDon.getSkuId());
+				exchangeCodeService.createExchangeCode(exchangeCodeReq);
+			} catch (Exception e) {
+			}
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}