修复订单状态查询

src/main/java/com/diaoyun/zion/chinafrica/api/ThirdPartyController.java

@@ -65,9 +65,7 @@ public class ThirdPartyController {
     }
 
     /**
-     * 根据订单号获取详细订单数据2
-     *
-     *
+     * 根据订单号获取详细订单数据
      */
     @ApiOperation(value = "根据订单号获取详细订单数据")
     @GetMapping(value ="/order/detail/{orderId}")

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java

@@ -29,6 +29,11 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
      */
     List<TbCfItemDetailEntity> getOrderItemList(String orderId);
 
+    /**
+     *   获取订单内商品
+     * @param orderId
+     * @return
+     */
     List<ItemEntity> getItemList(String orderId);
     /**
      * 获取付款订单
@@ -40,12 +45,15 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
 
     /**
      * 获取某段时间已发货订单数据
-     * @param beginDate
-     * @param endDate
      * @return
      */
     List<TbCfItemShippedEntity> getDeliveryList(Date beginDate, Date endDate);
 
+    /**
+     * 根据订单id获取订单实体
+     * @param orderId
+     * @return
+     */
     OrderEntity getOrder(String orderId);
 
 

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -350,6 +350,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         return new Result<>(resultMap);
     }
 
+    /**
+     * 获取某段时间的付款订单数据
+     * @return
+     */
     @Override
     public Result getOrderListByTime(long beginTime, long endTime, Integer pageNum, Integer pageSize) {
         Result result = new Result<>();
@@ -365,7 +369,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         }
         return result;
     }
-
+    /**
+     * 获取某段时间已发货订单数据
+     * @return
+     */
     @Override
     public Result getDeliveryList(long beginTime, long endTime, Integer pageNum, Integer pageSize) {
         Result result = new Result<>();
@@ -385,7 +392,11 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         }
         return result;
     }
-
+    /**
+     * 根据订单号获取详细订单数据 给第三方的接口
+     * @param orderId
+     * @return
+     */
     @Override
     public Result getOrderDetailThird(String orderId) {
         Result<OrderEntity> result = new Result<>();
@@ -692,6 +703,8 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             definiteOrder.setOrderTime(new Date());
             definiteOrder.setUserId(tbCfUserInfoVo.getUserId());
             definiteOrder.setUserName(tbCfUserInfoVo.getNick());
+            definiteOrder.setOrderStatus(OrderStatusEnum.PENDING_PAY.getValue());
+            definiteOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
             definiteOrder.setPayStatus(OrderStatusEnum.PENDING_PAY.getValue());
             definiteOrder.setEnableFlag(StateConstant.VALID);
         }

src/main/resources/mapper/TbCfOrderDao.xml

@@ -251,7 +251,9 @@
 
 	<!--获取用户订单数据-->
 	<select id="getUserOrderList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
-		select * from tb_cf_order where user_id=#{userId} and enable_flag=1
+		select * from tb_cf_order o
+		left join tb_cf_item_order_r r on o.order_id=r.order_id
+		where o.user_id=#{userId}  and o.enable_flag=1
 		<if test="orderStatus != null"> and order_status = #{orderStatus} </if>
 		 order by order_time desc
 	</select>