|
@@ -67,7 +67,7 @@ public class YppService {
|
|
String orderNo = snowflake.nextIdStr();
|
|
String orderNo = snowflake.nextIdStr();
|
|
AccountDetailVo accountDetailVo = shopSetting.getContent();
|
|
AccountDetailVo accountDetailVo = shopSetting.getContent();
|
|
List<ShopInfoSimpleVo> shops = accountDetailVo.getShops();
|
|
List<ShopInfoSimpleVo> shops = accountDetailVo.getShops();
|
|
- if (shops.isEmpty()){
|
|
|
|
|
|
+ if (shops.isEmpty()) {
|
|
return ResultContent.build(ResultState.Fail, "有票票店铺未创建");
|
|
return ResultContent.build(ResultState.Fail, "有票票店铺未创建");
|
|
}
|
|
}
|
|
// 分账信息
|
|
// 分账信息
|
|
@@ -222,7 +222,7 @@ public class YppService {
|
|
String kfcState = String.valueOf(kfcData.get("orderState"));
|
|
String kfcState = String.valueOf(kfcData.get("orderState"));
|
|
String kfcRefundAmount = String.valueOf(kfcData.get("refundAmount"));
|
|
String kfcRefundAmount = String.valueOf(kfcData.get("refundAmount"));
|
|
String kfcOrderId = String.valueOf(kfcData.get("id"));
|
|
String kfcOrderId = String.valueOf(kfcData.get("id"));
|
|
- ResultContent<GoodsResultModel> kfcChannelGoods = orderService2.findChannelGoods(JobFlowMap.YPP, kfcOrderId);
|
|
|
|
|
|
+ ResultContent<GoodsResultModel> kfcChannelGoods = orderService2.findChannelGoods(JobFlowMap.Kfc, kfcOrderId);
|
|
GoodsResultModel kfcgoodsResultModel = kfcChannelGoods.getContent();
|
|
GoodsResultModel kfcgoodsResultModel = kfcChannelGoods.getContent();
|
|
UpdateGoodsModel kfcupdateGoodsModel = new UpdateGoodsModel();
|
|
UpdateGoodsModel kfcupdateGoodsModel = new UpdateGoodsModel();
|
|
kfcupdateGoodsModel.setId(kfcgoodsResultModel.getId());
|
|
kfcupdateGoodsModel.setId(kfcgoodsResultModel.getId());
|
|
@@ -233,7 +233,7 @@ public class YppService {
|
|
|
|
|
|
case "3":
|
|
case "3":
|
|
kfcupdateGoodsModel.setGoodsState(OrderType.USED);
|
|
kfcupdateGoodsModel.setGoodsState(OrderType.USED);
|
|
- break;
|
|
|
|
|
|
+ break;
|
|
case "6":
|
|
case "6":
|
|
case "8":
|
|
case "8":
|
|
ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
|
|
ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
|
|
@@ -249,8 +249,12 @@ public class YppService {
|
|
refundParam2Model.setPlatformAmount(BigDecimal.ZERO);
|
|
refundParam2Model.setPlatformAmount(BigDecimal.ZERO);
|
|
refundParam2Model.setOrderType(OrderType.PASS_WITHDRAW);
|
|
refundParam2Model.setOrderType(OrderType.PASS_WITHDRAW);
|
|
|
|
|
|
|
|
+ try {
|
|
|
|
+ paymentService2.auditRefund(refundParam2Model);
|
|
|
|
+
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ }
|
|
|
|
|
|
- paymentService2.auditRefund(refundParam2Model);
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
orderService2.updateGoods(kfcupdateGoodsModel);
|
|
orderService2.updateGoods(kfcupdateGoodsModel);
|