下单调整

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

@@ -462,7 +462,12 @@ public class NewOrderController extends BaseController {
                             o.setSingleShouldPayTotalTax(o.getAddedValueTax());
                             o.setShouldPayTotalTax(o.getTotalAddedValueTax());
                         }
-
+                        o.setPresentNum(0);
+                        o.setNotOutStore(o.getNum());
+                        o.setStatus(0);//订单商品待付款
+                        if (o.getPayStatus() == null) {
+                            o.setPayStatus("0"); //默认值为未付款(0 未进账 1 待财务审核 2 已进账)
+                        }
                         orderProductList.add(o);
                         String productCategory = o.getProductCategory();
                         if (StringUtils.equals(productCategory, "2")) {
@@ -476,7 +481,6 @@ public class NewOrderController extends BaseController {
                             for (Integer sku : skuIdByPromotionsId) {
                                 o.setSkuId(sku);
 
-                                orderProductList.add(o);
                                 String productCategory = o.getProductCategory();
                                 if (StringUtils.equals(productCategory, "2")) {
                                     isSecondHandOrder = true;
@@ -495,12 +499,17 @@ public class NewOrderController extends BaseController {
                         o.setTotalAddedValueTax(0d);
                         o.setAddedValueTax(0d);
                         o.setTaxRate(0d);
-                    }
-                    o.setPresentNum(0);
-                    o.setNotOutStore(o.getNum());
-                    o.setStatus(0);//订单商品待付款
-                    if (o.getPayStatus() == null) {
-                        o.setPayStatus("0"); //默认值为未付款(0 未进账 1 待财务审核 2 已进账)
+                        o.setPresentNum(0);
+                        o.setNotOutStore(o.getNum());
+                        o.setStatus(0);//订单商品待付款
+                        if (o.getPayStatus() == null) {
+                            o.setPayStatus("0"); //默认值为未付款(0 未进账 1 待财务审核 2 已进账)
+                        }
+                        orderProductList.add(o);
+                        String productCategory = o.getProductCategory();
+                        if (StringUtils.equals(productCategory, "2")) {
+                            isSecondHandOrder = true;
+                        }
                     }
                 }
             }

src/main/webapp/WEB-INF/views/modules/product/cmSecondDetailForm.jsp

@@ -184,7 +184,7 @@
         }
 
         .upload-content {
-            margin-top: -70px;
+            /*margin-top: -70px;*/
             display: inline-block;
         }
 

src/main/webapp/WEB-INF/views/modules/product/cmSecondHandDetailForm.jsp

@@ -187,7 +187,7 @@
         }
 
         .upload-content {
-            margin-top: -70px;
+            /*margin-top: -70px;*/
             display: inline-block;
         }