|
@@ -81,7 +81,6 @@ public class Video2ServiceImpl implements Video2Service {
|
|
|
|
|
|
String orderNo = snowflake.nextIdStr();
|
|
|
|
|
|
-
|
|
|
// 平台订单
|
|
|
|
|
|
String shopId = accountDetailVo.getAccountId();
|
|
@@ -94,8 +93,7 @@ public class Video2ServiceImpl implements Video2Service {
|
|
|
createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
|
|
|
createOrder2Model.setShopId(shopId);
|
|
|
JSONObject shopInfo = JSONUtil.parseObj(shopSetting);
|
|
|
-// shopInfo.set("hotelIdPic", addOrderRequest.getHotelIdPic());
|
|
|
-// shopInfo.set("shopName", shopSetting.getContent().getContactName());
|
|
|
+ shopInfo.set("shopName", "会员充值");
|
|
|
createOrder2Model.setShopInfo(shopInfo);
|
|
|
createOrder2Model.setTotalAmount(totalPrice);
|
|
|
createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
|
|
@@ -195,6 +193,7 @@ public class Video2ServiceImpl implements Video2Service {
|
|
|
createOrder2Model.setUserId(rechargeRequest.getUserId());
|
|
|
createOrder2Model.setShopId(shopId);
|
|
|
JSONObject shopInfo = JSONUtil.parseObj(shopSetting);
|
|
|
+ shopInfo.set("shopName", "会员充值");
|
|
|
createOrder2Model.setShopInfo(shopInfo);
|
|
|
createOrder2Model.setTotalAmount(totalPrice);
|
|
|
createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
|