新增订单商品的单个状态

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

@@ -84,4 +84,5 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
      */
     TbCfExchangeEntity currencyConversion(String currency);
 
+    Integer findOrderStatus(String ordersId);
 }

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

@@ -236,6 +236,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
                         TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo();
                         BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo);
                         tbCfCartItemDetailVo.setOrdersId(tbCfOrderDao.getOrdersId(orderVo.getOrderId(), tbCfItemDetail.getItemId()));
+                        tbCfCartItemDetailVo.setOrderStatus(tbCfOrderDao.findOrderStatus(tbCfOrderDao.getOrdersId(orderVo.getOrderId(), tbCfItemDetail.getItemId())));
                         itemDetailVoList.add(tbCfCartItemDetailVo);
                     }
                     orderVo.setItemDetailList(itemDetailVoList);
@@ -786,7 +787,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             BigDecimal itemSourcePrice = tbCfCartItemDetailVo.getItemPrice();
             itemsPrice = itemsPrice.add(itemSourcePrice.multiply(itemNum));
             //计算运费
-            BigDecimal expressCost = getExpressTemplate(tbCfCartItemDetailVo.getItemCategory());
+            /*BigDecimal expressCost = getExpressTemplate(tbCfCartItemDetailVo.getItemCategory());
             BigDecimal continuationFee = getContinuationFee(tbCfCartItemDetailVo.getItemCategory());
             //expressCost = expressCost.multiply(itemNum);
             if ("1".equals(itemNum)) {
@@ -796,7 +797,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
                 BigDecimal dj = continuationFee.multiply(itemNum.subtract(a));
                 expressCost = dj.add(expressCost);
             }
-            totalExpressCost = totalExpressCost.add(expressCost);
+            totalExpressCost = totalExpressCost.add(expressCost);*/
         }
         //计算手续费
         BigDecimal fee = countFee(itemsPrice);

src/main/java/com/diaoyun/zion/chinafrica/vo/TbCfCartItemDetailVo.java

@@ -108,7 +108,7 @@ public class TbCfCartItemDetailVo implements Serializable {
 
 
     @ApiModelProperty("订单商品状态")
-    private String orderStatus;
+    private Integer orderStatus;
 
     public String getOrdersId() {
         return ordersId;
@@ -309,11 +309,11 @@ public class TbCfCartItemDetailVo implements Serializable {
         this.checkFlag = checkFlag;
     }
 
-    public String getOrderStatus() {
+    public Integer getOrderStatus() {
         return orderStatus;
     }
 
-    public void setOrderStatus(String orderStatus) {
+    public void setOrderStatus(Integer orderStatus) {
         this.orderStatus = orderStatus;
     }
 }

src/main/resources/mapper/TbCfOrderDao.xml

@@ -273,6 +273,10 @@
         </foreach>
     </delete>
 
+	<select id="findOrderStatus" resultType="int">
+			select order_status from tb_cf_item_order_r where order_item_id=#{ordersId}
+	</select>
+
     <!--获取用户订单数据-->
     <select id="getUserOrderList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
         select