bugfix

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Integer onlineFlag;    //是否线上支付过1是，0否
-    private Double couponAmount;   //母订单使用优惠券金额
+    private Double couponAmount;   //子订单使用优惠券金额
     private Integer shopOrderID;//        int(11) not null auto_increment comment '子订单ID',
     private Integer organizeID;//        组织Id
     private String shopOrderNo;//       varchar(30) comment '子订单编号',

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -83,6 +83,7 @@
     		a.differencePrice AS differencePrice,
     		a.proportional AS proportional,
     		ifnull(a.promotionFullReduction, 0) As promotionFullReduction,
+    		ifnull(a.couponAmount, 0) As couponAmount,
     		a.zeroCostFlag AS zeroCostFlag
     </sql>
 
@@ -271,7 +272,8 @@
         SELECT<include refid="shopOrderColumns"/>,
         b.name as shopName,
         oa.id as orderArchiveId,
-        co.receiptStatus
+        co.receiptStatus,
+        (SELECT SUM(num) FROM cm_order_product WHERE shoporderid=29760 AND productType = 2) as presentNum
         FROM cm_shop_order a
         left join shop b on a.shopID = b.shopID
         left join cm_order_archive oa on a.shopOrderID = oa.shopOrderId