新增订单详情状态

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -30,10 +30,6 @@ public class GoodsOrderInfoForm extends BaseForm {
 
     private Integer orderStatus;
 
-    /**
-     * 交易方式
-     */
-    private String tradeType;
     /**
      * 订单支付流水编号
      */

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/vo/CustomerInfoVo.java

@@ -0,0 +1,8 @@
+package com.hcloud.microserver.h5.facade.carbon.vo;
+
+import com.hcloud.microserver.h5.facade.carbon.entity.CustomerInfo;
+import lombok.Data;
+
+@Data
+public class CustomerInfoVo extends CustomerInfo {
+}

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/vo/GoodsOrderDetailVo.java

@@ -0,0 +1,8 @@
+package com.hcloud.microserver.h5.facade.carbon.vo;
+
+import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderDetail;
+import lombok.Data;
+
+@Data
+public class GoodsOrderDetailVo extends GoodsOrderDetail {
+}

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/vo/GoodsOrderInfoVo.java

@@ -1,8 +1,10 @@
 package com.hcloud.microserver.h5.facade.carbon.vo;
 
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderInfo;
+import com.hcloud.microserver.h5.facade.carbon.forms.CustomerInfoForm;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsInfoForm;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
+import com.hcloud.microserver.h5.facade.carbon.forms.GoodsPayOrderForm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,10 +25,17 @@ public class GoodsOrderInfoVo extends GoodsOrderInfo {
      * 商品订单详情
      */
     @ApiModelProperty("商品订单详情")
-    private List<GoodsOrderDetailForm> goodsOrderDetailForm;
+    private List<GoodsOrderDetailVo> goodsOrderDetailForm;
+    /**
+     * 客户信息
+     */
+    @ApiModelProperty("商品订单详情")
+    private CustomerInfoForm customerInfoForm;
 
     /**
-     * 商品列表
+     * 客户信息
      */
-    private List<GoodsInfoForm> goodsList;
+    @ApiModelProperty("商品订单详情")
+    private GoodsPayOrderForm goodsPayOrderForm;
+
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/bo/OrderInfoBO.java

@@ -43,7 +43,7 @@ public class OrderInfoBO {
     /**
      * 订单状态
      */
-    private String orderStatus;
+    private Integer orderStatus;
     /**
      * 购买时间
      */

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/OrderManagerController.java

@@ -100,7 +100,7 @@ public class OrderManagerController extends CarbonBaseController {
     @GetMapping("/info")
     @AuthCarbonValidate
     public ResponseBase<GoodsOrderInfoVo> info(@RequestParam String orderId) {
-        GoodsOrderInfoVo orderInfoBO = orderDetailInfoService.info(orderId);
+        GoodsOrderInfoForm orderInfoBO = orderDetailInfoService.info(orderId);
         return resultVOSuccess(orderInfoBO);
     }
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/OrderDetailInfoService.java

@@ -28,5 +28,5 @@ public interface OrderDetailInfoService extends BaseServie<GoodsOrderDetailForm,
 
     List<GoodsOrderDetail> findByGoodsOrderInfoGuid(String goodsOrderInfoGuid);
 
-    GoodsOrderInfoVo info(String guid);
+    GoodsOrderInfoForm info(String guid);
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/OrderDetailInfoServiceImpl.java

@@ -116,8 +116,8 @@ public class OrderDetailInfoServiceImpl implements OrderDetailInfoService {
 
 
     @Override
-    public GoodsOrderInfoVo info(String guid) {
-        GoodsOrderInfoVo goodsOrderInfoForm=new GoodsOrderInfoVo();
+    public GoodsOrderInfoForm info(String guid) {
+        GoodsOrderInfoForm goodsOrderInfoForm=new GoodsOrderInfoForm();
         OrderInfoBO info = goodsOrderInfoMapper.info(guid);
         if(!StringUtils.isEmpty(info)){
             BeanUtils.copyProperties(info,goodsOrderInfoForm);