Merge branch 'developer' into developerB

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

@@ -1803,8 +1803,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             orderIdsInApplyReturn = cmReturnedPurchaseDao.findOrderIDsInApplyReturnFlag(oId);
         }
         for (NewOrder order : results) {
+            Double ableUserMoney = 0d;
             CmUser user = cmUserDao.get(order.getUserID().toString());
-            Double ableUserMoney = user.getAbleUserMoney() == null ? 0d : user.getAbleUserMoney();
+            if (null != user && null != user.getAbleUserMoney()){
+                ableUserMoney = user.getAbleUserMoney();
+            }
             order.setAbleUserMoney(ableUserMoney);
             if ((orderIds != null && orderIds.contains(order.getOrderID())) || "1".equals(order.getRebateFlag())) {
                 order.setRebateOrder("1");

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

@@ -726,7 +726,7 @@
         on cror.orderID = cso.shopOrderID
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         where cror.relationType = '1' and cror.delFlag = '0' AND cdr.receiptStatus = '2'
-        and cso.orderID in
+        and cdr.receiptType = '3' and cso.orderID in
         <foreach collection="orderIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>