Commit 5f03c0df by 徐康

保存随单购券的键位

parent 0402e85c
...@@ -392,6 +392,7 @@ public class OrderSdkAdapter { ...@@ -392,6 +392,7 @@ public class OrderSdkAdapter {
orderCostCreateReq.setProductSeq(accountRequest.getSequence()); orderCostCreateReq.setProductSeq(accountRequest.getSequence());
//1=订单,2=订单商品,3=售后单 //1=订单,2=订单商品,3=售后单
orderCostCreateReq.setBillType(1); orderCostCreateReq.setBillType(1);
orderCostCreateReq.setProductId(accountRequest.getProductId());
orderCostCreateReqs.add(orderCostCreateReq); orderCostCreateReqs.add(orderCostCreateReq);
} else { } else {
OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq(); OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();
......
...@@ -246,13 +246,14 @@ public class OrderAdapter { ...@@ -246,13 +246,14 @@ public class OrderAdapter {
.build(); .build();
orderAccountDtos.add(createOrderAccountDto); orderAccountDtos.add(createOrderAccountDto);
} }
if(null != shoppingCartGoodsDto.getPayCardFee() && 0l != shoppingCartGoodsDto.getPayCardFee()) { if(null != shoppingCartGoodsDto.getPayCardFee() && 0l != shoppingCartGoodsDto.getPayCardFee() && StringUtils.isNotBlank(createOrderVo.getCardKeyCode())) {
CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder() CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
.accountId("") .accountId("")
.name("啡常月享卡") .name("啡常月享卡")
.price(shoppingCartGoodsDto.getPayCardFee()) .price(shoppingCartGoodsDto.getPayCardFee())
.accountType(QueryOrderAccountType.MCCAFE_MONTH_CARD) .accountType(QueryOrderAccountType.MCCAFE_MONTH_CARD)
.sequence(orderAccountIndex++) .sequence(orderAccountIndex++)
.productId(createOrderVo.getCardKeyCode())
.build(); .build();
orderAccountDtos.add(createOrderAccountDto); orderAccountDtos.add(createOrderAccountDto);
} }
......
...@@ -195,6 +195,11 @@ public class CreateOrderVo { ...@@ -195,6 +195,11 @@ public class CreateOrderVo {
*/ */
private String faceCode; private String faceCode;
/**
* 随单购啡常月享卡键位
*/
private String cardKeyCode;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
private String sessionKey; // 存储sessionKey,异常补退使用 private String sessionKey; // 存储sessionKey,异常补退使用
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
......
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