bugfix

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -530,7 +530,7 @@ public class NewOrderController extends BaseController {
             newOrderProductService.updateShopConfigFlag(newOrder.getOrderID());
         }
         addMessage(redirectAttributes, "保存订单成功");
-        return "redirect:" + Global.getAdminPath() + "/order/orderList";
+        return "redirect:" + Global.getAdminPath() + "/order/secondhandOrderList";
     }
 
     @RequiresPermissions("order:order:edit")

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -408,7 +408,19 @@
                             productDetail,
                             announType,
 							newProductType,
-							showFlag)
+		<if test="qualificationNo != null and  qualificationNo != ''">
+			qualificationNo,
+		</if>
+		<if test="productName != null and  productName != ''">
+			productName,
+		</if>
+		<if test="qualificationTime != null and  qualificationTime != ''">
+			qualificationTime,
+		</if>
+		<if test="qualificationLink != null and  qualificationLink != ''">
+			qualificationLink,
+		</if>
+		showFlag)
         VALUES (#{brandID},
         #{bigTypeID},
         #{smallTypeID},
@@ -423,7 +435,9 @@
         #{priceFlag},
         #{beautyActFlag},
         #{ladderPriceFlag},
-        #{stock},
+		<if test="stock !=''">
+			#{stock},
+		</if>
         #{hasSkuFlag},
         #{mainImage},
         #{propertiesInfo},