更新订单详情字段

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

@@ -111,4 +111,9 @@ public class GoodsOrderInfoForm extends BaseForm {
      * 订单商品用途
      */
     private String goodsUse;
+
+    /**
+     * 0无效 1有效
+     */
+    private Integer state;
 }

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

@@ -0,0 +1,32 @@
+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.GoodsInfoForm;
+import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Api("详情实体")
+public class GoodsOrderInfoVo extends GoodsOrderInfo {
+
+    /**
+     * 交易方式
+     */
+    @ApiModelProperty("交易方式(1.微信,2.支付宝,3,银联,4.线下支付)")
+    private Integer payChannel;
+
+    /**
+     * 商品订单详情
+     */
+    @ApiModelProperty("商品订单详情")
+    private List<GoodsOrderDetailForm> goodsOrderDetailForm;
+
+    /**
+     * 商品列表
+     */
+    private List<GoodsInfoForm> goodsList;
+}

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

@@ -7,6 +7,7 @@ import com.hcloud.microserver.h5.facade.carbon.entity.from.CreateOrderFrom;
 import com.hcloud.microserver.h5.bo.CredentialInfoBO;
 import com.hcloud.microserver.h5.common.BaseInfoDO;
 import com.hcloud.microserver.h5.common.CarbonBaseController;
+import com.hcloud.microserver.h5.facade.carbon.vo.GoodsOrderInfoVo;
 import com.hcloud.microserver.h5.forms.OrderQueryForm;
 import com.hcloud.microserver.h5.service.*;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
@@ -98,8 +99,8 @@ public class OrderManagerController extends CarbonBaseController {
     @ApiOperation(value = "查询爱心用户订单信息", notes = "分类查询爱心用户订单")
     @GetMapping("/info")
     @AuthCarbonValidate
-    public ResponseBase info(@RequestParam String orderId) {
-        GoodsOrderInfoForm orderInfoBO = orderDetailInfoService.info(orderId);
+    public ResponseBase<GoodsOrderInfoVo> info(@RequestParam String orderId) {
+        GoodsOrderInfoVo orderInfoBO = orderDetailInfoService.info(orderId);
         return resultVOSuccess(orderInfoBO);
     }
 

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

@@ -46,4 +46,6 @@ public interface GoodsOrderInfoMapper extends BaseMapper<GoodsOrderInfo,String>
     int updateOrderBelongInfo(@Param("oldId") String oldCustomerId ,@Param("newId") String newCustomerId);
 
     OrderInfoBO info(@Param("guid")String guid);
+
+    Integer payChannel(@Param("guid")String guid);
 }

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

@@ -4,6 +4,7 @@ import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderDetail;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderInfoForm;
+import com.hcloud.microserver.h5.facade.carbon.vo.GoodsOrderInfoVo;
 
 import java.util.List;
 
@@ -27,5 +28,5 @@ public interface OrderDetailInfoService extends BaseServie<GoodsOrderDetailForm,
 
     List<GoodsOrderDetail> findByGoodsOrderInfoGuid(String goodsOrderInfoGuid);
 
-    GoodsOrderInfoForm info(String guid);
+    GoodsOrderInfoVo info(String guid);
 }

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

@@ -5,14 +5,17 @@ import com.hcloud.microserver.h5.bo.OrderDetailInfoBO;
 import com.hcloud.microserver.h5.bo.OrderInfoBO;
 import com.hcloud.microserver.h5.dao.GoodsOrderDetailMapper;
 import com.hcloud.microserver.h5.dao.GoodsOrderInfoMapper;
+import com.hcloud.microserver.h5.facade.carbon.vo.GoodsOrderInfoVo;
 import com.hcloud.microserver.h5.service.OrderDetailInfoService;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
 import com.hcloud.microserver.commoncore.util.GetUUID;
 import com.hcloud.microserver.h5.facade.carbon.entity.GoodsOrderDetail;
 import com.hcloud.microserver.h5.facade.carbon.forms.GoodsOrderDetailForm;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -113,12 +116,16 @@ public class OrderDetailInfoServiceImpl implements OrderDetailInfoService {
 
 
     @Override
-    public GoodsOrderInfoForm info(String guid) {
+    public GoodsOrderInfoVo info(String guid) {
+        GoodsOrderInfoVo goodsOrderInfoForm=new GoodsOrderInfoVo();
         OrderInfoBO info = goodsOrderInfoMapper.info(guid);
-        GoodsOrderInfoForm goodsOrderInfoForm=new GoodsOrderInfoForm();
-        BeanUtils.copyProperties(info,goodsOrderInfoForm);
-        List<GoodsOrderDetailForm> detailFormList = orderDetailInfoService.getOrderDetailListByOrderId(guid);
-        goodsOrderInfoForm.setGoodsOrderDetailForm(detailFormList);
+        if(!StringUtils.isEmpty(info)){
+            BeanUtils.copyProperties(info,goodsOrderInfoForm);
+            List<GoodsOrderDetailForm> detailFormList = orderDetailInfoService.getOrderDetailListByOrderId(guid);
+            goodsOrderInfoForm.setGoodsOrderDetailForm(detailFormList);
+        }
+        Integer payChannel  = goodsOrderInfoMapper.payChannel(guid);
+        goodsOrderInfoForm.setPayChannel(payChannel);
         return goodsOrderInfoForm;
     }
 

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/GoodsOrderInfoMapper.xml

@@ -317,11 +317,22 @@
         aa.order_status AS orderStatus,
         aa.order_amount AS orderAmount,
         aa.order_carbon_amount AS orderCarbonAmount,
-        aa.pay_no AS payNo
+        aa.pay_no AS payNo,
+        aa.state AS state
         FROM
         t_goods_order_info aa
         WHERE
         1=1
         AND aa.guid = #{guid}
     </select>
+    <select id="payChannel" resultType="java.lang.Integer">
+        SELECT
+            a.pay_channel
+        FROM
+            t_goods_pay_order a
+        WHERE
+            a.pay_status = '2'
+        AND a.fk_order_id = #{guid}
+        LIMIT 1
+    </select>
 </mapper>