Browse Source

保存订单逻辑

lijun 5 years ago
parent
commit
1ce0a5f17d

+ 9 - 0
src/main/java/com/caimei/entity/CmOrganizeProducts.java

@@ -35,6 +35,7 @@ public class CmOrganizeProducts implements Serializable {
     private Integer shopID;//
     private String productClassifyName;//商品分类名字
     private Boolean productsChecked = false;  //商品勾选状态
+    private String postageToPay;//邮费是否到付:1是,2否[是为到付,否为不到付并非包邮具体是否包邮参考邮费规则]
 
     public Integer getId() {
         return id;
@@ -283,4 +284,12 @@ public class CmOrganizeProducts implements Serializable {
     public void setShopID(Integer shopID) {
         this.shopID = shopID;
     }
+
+    public String getPostageToPay() {
+        return postageToPay;
+    }
+
+    public void setPostageToPay(String postageToPay) {
+        this.postageToPay = postageToPay;
+    }
 }

+ 3 - 3
src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -335,14 +335,14 @@ public class OrderServiceImpl implements OrderService {
                         if (null == productNum || productNum == 0) return wxJsonModel.error("-1", "商品购买数量异常");
                         Product cmProduct = organizeProductsMapper.selectCmProductById(cmOrganizeProducts.getProductID());
                         Double retailPrice = cmOrganizeProducts.getRetailPrice();//售价
-                        Integer classifyID = cmOrganizeProducts.getClassifyID();
+//                        Integer classifyID = cmOrganizeProducts.getClassifyID();
                         double productFee = retailPrice * productNum;//单个商品的金额
                         //统计商品总金额
                         productTotalFee += productFee;
-                        if (classifyID == 3 && !isIncludedInstruments) {//判断是否存在仪器
+                        if (cmOrganizeProducts.getClassifyID() == 1 && !isIncludedInstruments) {//判断是否存在仪器
                             isIncludedInstruments = true;
                         }
-                        if (classifyID != 3 && !isIncludedProduct) {//判断是否存在商品
+                        if (cmOrganizeProducts.getClassifyID() != 1 && !isIncludedProduct) {//判断是否存在商品
                             isIncludedProduct = true;
                         }
 

+ 2 - 1
src/main/resources/mapper/OrganizeProductsMapper.xml

@@ -25,7 +25,8 @@
 		p.name AS "name",
 		s.name AS "shopName",
 		s.shopID AS "shopID",
-		cmpc.classifyName AS "productClassifyName"
+		cmpc.classifyName AS "productClassifyName",
+		cmpc.postageToPay AS "postageToPay"
 	</sql>
 	
 	<sql id="cmMallOrganizeProductsJoins">