|
|
@@ -17,9 +17,7 @@ import com.xiaoju.open.oil.core.executor.ResponseDTO;
|
|
|
import com.xiaoju.open.oil.interfaces.domain.*;
|
|
|
import com.xiaoju.open.oil.interfaces.request.*;
|
|
|
import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniCancelOrderStatusRequest;
|
|
|
-import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniProgramQueryNewOrderRequest;
|
|
|
import com.xiaoju.open.oil.interfaces.response.*;
|
|
|
-import com.xiaoju.open.oil.interfaces.response.miniprogram.MiniQueryNewOrderResponse;
|
|
|
import com.xiaoju.open.oil.security.secret.SecurityService;
|
|
|
import com.zhongshu.payment.client.model.order.v2.*;
|
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
|
@@ -385,7 +383,7 @@ public class XiaoJuService {
|
|
|
|
|
|
XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(xiaoJuQueryNewOrderModel.getStoreId());
|
|
|
|
|
|
- MiniProgramQueryNewOrderRequest queryNewOrderRequest = new MiniProgramQueryNewOrderRequest();
|
|
|
+ QueryNewOrderRequest queryNewOrderRequest = new QueryNewOrderRequest();
|
|
|
queryNewOrderRequest.setOutUserId(userId);
|
|
|
queryNewOrderRequest.setMobile(phone);
|
|
|
queryNewOrderRequest.setLat(byStoreId.getLat());
|
|
|
@@ -393,10 +391,12 @@ public class XiaoJuService {
|
|
|
queryNewOrderRequest.setStoreId(byStoreId.getStoreId());
|
|
|
queryNewOrderRequest.setItemId(xiaoJuQueryNewOrderModel.getItemId());
|
|
|
queryNewOrderRequest.setGunNo(xiaoJuQueryNewOrderModel.getGunNo());
|
|
|
- queryNewOrderRequest.setOrderAmount(xiaoJuQueryNewOrderModel.getOriginalAmount());
|
|
|
- queryNewOrderRequest.setRealAmount(xiaoJuQueryNewOrderModel.getPaymentAmount());
|
|
|
+ queryNewOrderRequest.setOriginalAmount(xiaoJuQueryNewOrderModel.getOriginalAmount());
|
|
|
+ queryNewOrderRequest.setPaymentAmount(xiaoJuQueryNewOrderModel.getPaymentAmount());
|
|
|
queryNewOrderRequest.setServiceFee(xiaoJuQueryNewOrderModel.getServiceFee());
|
|
|
queryNewOrderRequest.setLitre(xiaoJuQueryNewOrderModel.getLitre());
|
|
|
+ queryNewOrderRequest.setVipPrice(xiaoJuQueryNewOrderModel.getVipPrice());
|
|
|
+ queryNewOrderRequest.setStorePrice(xiaoJuQueryNewOrderModel.getStorePrice());
|
|
|
queryNewOrderRequest.setPromotionInfo(xiaoJuQueryNewOrderModel.getPromotionInfo());
|
|
|
queryNewOrderRequest.setOutOrderId(orderNo);
|
|
|
|
|
|
@@ -408,7 +408,7 @@ public class XiaoJuService {
|
|
|
apiLog.setRequest(JSONUtil.toJsonStr(queryNewOrderRequest));
|
|
|
apiLog.setSystem("xiaoju");
|
|
|
try {
|
|
|
- MiniQueryNewOrderResponse queryNewOrderResponse = queryClient.apiMini().queryNewOrder(queryNewOrderRequest);
|
|
|
+ QueryNewOrderResponse queryNewOrderResponse = queryClient.api().queryNewOrder(queryNewOrderRequest);
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
@@ -468,7 +468,7 @@ public class XiaoJuService {
|
|
|
|
|
|
UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
|
|
|
updateGoodsModel.setExtend(JSONUtil.toJsonStr(queryNewOrderResponse));
|
|
|
- updateOrder(orderNo, updateGoodsModel);
|
|
|
+ updateOrder(queryNewOrderResponse.getOutOrderId(), updateGoodsModel);
|
|
|
return ResultContent.buildContent(queryNewOrderResponse);
|
|
|
} catch (Exception e) {
|
|
|
|
