提交修改
This commit is contained in:
parent
18565b1b91
commit
ef0b74d48d
@ -289,7 +289,6 @@ public class AppOrderController {
|
|||||||
vvTradeOrderLineEntity.setOriginPrice(vvSkuEntity.getOriginPrice());
|
vvTradeOrderLineEntity.setOriginPrice(vvSkuEntity.getOriginPrice());
|
||||||
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
|
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
|
||||||
vvTradeOrderLineEntity.setSalePrice(vvSkuEntity.getSalePrice());
|
vvTradeOrderLineEntity.setSalePrice(vvSkuEntity.getSalePrice());
|
||||||
vvTradeOrderLineEntity.setStatus(OrderStatusEnums.wait_pay.getStatus());
|
|
||||||
vvTradeOrderLineEntity.setProductId(vvSkuEntity.getProductId());
|
vvTradeOrderLineEntity.setProductId(vvSkuEntity.getProductId());
|
||||||
vvTradeOrderLineEntity.setProductName(vvProduct.getTitle());
|
vvTradeOrderLineEntity.setProductName(vvProduct.getTitle());
|
||||||
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
|
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
|
||||||
@ -388,13 +387,13 @@ public class AppOrderController {
|
|||||||
// "signType": "RSA",
|
// "signType": "RSA",
|
||||||
// "paySign": "oR9d",
|
// "paySign": "oR9d",
|
||||||
|
|
||||||
|
|
||||||
String sign = JsapiPrepay.getSign(signatureStr, privateKey);
|
String sign = JsapiPrepay.getSign(signatureStr, privateKey);
|
||||||
vo.setNonceStr(nonceStr);
|
vo.setNonceStr(nonceStr);
|
||||||
vo.setTimeStamp(timeStamp);
|
vo.setTimeStamp(timeStamp);
|
||||||
vo.setMchid(mchid);
|
vo.setMchid(mchid);
|
||||||
vo.setPaySign(sign);
|
vo.setPaySign(sign);
|
||||||
vo.setPrepayId("prepay_id=" + prepay_id);
|
vo.setPrepayId("prepay_id=" + prepay_id);
|
||||||
|
|
||||||
return R.ok().setData(vo);
|
return R.ok().setData(vo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user