bugfix

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -350,7 +350,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
                     if (!strip.contains(s.toString())) {
                         validFlag = 3;
                     } else {
-                        validFlag = 2;
+                        validFlag = Integer.parseInt(null == product.getValidFlag() ? "3" : product.getValidFlag());
                     }
                     cmOrganizeProductInfoMapper.updateNotCmOrganizeProductInfos(s, product.getProductID(), cmOrganizeProductInfo.getCostCheckFlag(), validFlag);
                 }

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

@@ -828,7 +828,20 @@
                  LEFT JOIN cm_shop_order cso ON cror.shopOrderId = cso.shopOrderID
                  LEFT JOIN cm_order co ON cso.orderID = co.orderID
                  LEFT JOIN cm_order cou ON cror.orderID = cou.orderID
-        WHERE cror.receiptID = #{id} AND cror.delFlag = '0'
+        WHERE cror.relationType != '1' and cror.receiptID = #{id} AND cror.delFlag = '0'
+        union
+        SELECT
+          cso.shopOrderId,
+          cso.shopOrderNo,
+          cso.orderId AS orderID,
+          (CASE WHEN cror.relationType = '1'
+                    THEN (SELECT b.orderType FROM cm_shop_order b WHERE cso.shopOrderID =  b.shopOrderID)
+                ELSE (SELECT  c.orderType FROM cm_order c WHERE cso.orderID = c.orderID)
+              END) AS orderType
+        FROM cm_receipt_order_relation cror
+                 LEFT JOIN cm_shop_order cso ON cror.orderID = cso.shopOrderID
+                 LEFT JOIN cm_order cou ON cror.orderID = cou.orderID
+        WHERE cror.relationType = '1' AND cror.receiptID = #{id} AND cror.delFlag = '0'
 	</select>
 
     <select id="getOrderIDStr" parameterType="string" resultType="map">