Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1014,7 +1014,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             newOrder.setRebateOrder("0");
         }
         if (null != newOrder) {
-            if (newOrder.getCouponAmount() > 0) {
+            if (newOrder.getCouponAmount() != null && newOrder.getCouponAmount() > 0) {
                 CmCouponOrderRecord couponRecord = newOrderDao.findOrderCouponRecord(newOrder.getOrderID());
                 if (couponRecord != null) {
                     newOrder.setClubCouponId(couponRecord.getClubCouponId());

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

@@ -195,6 +195,7 @@
     <select id="exportRebate" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
         SELECT
         so.orderID,
+        (select group_concat(distinct p.name) from product p left join cm_order_product cop on p.productID = cop.productID where cop.orderID = so.orderID group by cop.orderID) as productNames,
         IF(u.userIdentity = 2,u.name,u.userName) AS userName,
         d.receiptDate,
         d.payType,