浏览代码

超级会员价不写入复购价格库

Aslee 3 年之前
父节点
当前提交
a1316707b0
共有 3 个文件被更改,包括 13 次插入14 次删除
  1. 12 2
      backup.sql
  2. 1 1
      src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java
  3. 0 11
      src/main/resources/backup.sql

+ 12 - 2
backup.sql

@@ -54,7 +54,7 @@ ADD COLUMN `updateTime` varchar(50) DEFAULT NULL COMMENT '更新时间' AFTER `c
 -- =========== 超级会员S_VIP
 -- 修改 cm_order_pay_link 支付链接
 ALTER TABLE `cm_order_pay_link`
-    ADD COLUMN `vipId` bigint(11) DEFAULT NULL COMMENT '超级会员套餐id' AFTER `orderId`;
+    ADD COLUMN `vipId` bigint(11) DEFAULT NULL COMMENT '超级会员套餐id' AFTER `orderId`,
     ADD COLUMN `userId` bigint(11) DEFAULT NULL COMMENT '机构用户id' AFTER `vipId`;
 
 -- 修改 cm_discern_receipt,cm_receipt_order_relation 收款表
@@ -63,4 +63,14 @@ ALTER TABLE `cm_discern_receipt`
     COMMENT '收款款项类型:1订单款,2非订单款,3返佣款,5供应商退款,6超级会员款';
 ALTER TABLE `cm_receipt_order_relation`
     ADD COLUMN `vipId` bigint(11) DEFAULT NULL COMMENT '超级会员套餐id' AFTER `orderId`,
-    ADD COLUMN `userId` bigint(11) DEFAULT NULL COMMENT '超级会员用户id' AFTER `orderId`;
+    ADD COLUMN `userId` bigint(11) DEFAULT NULL COMMENT '超级会员用户id' AFTER `orderId`;
+
+ALTER TABLE `caimei`.`cm_order`
+    ADD COLUMN `svipFullReduction` DECIMAL(15,2) NULL COMMENT '订单超级会员优惠' DEFAULT 0.00 AFTER `couponAmount`;
+ALTER TABLE `caimei`.`cm_shop_order`
+    ADD COLUMN `svipShopReduction` DECIMAL(15,2) NULL COMMENT '店铺超级会员优惠' DEFAULT 0.00 AFTER `differencePrice`;
+ALTER TABLE `caimei`.`cm_order_product`
+    ADD COLUMN `svipPriceFlag` INT NULL DEFAULT 0 COMMENT '超级会员优惠价格标识:0不是,1是' AFTER `heUserId`,
+    ADD COLUMN `svipPriceType` INT NULL DEFAULT NULL COMMENT '超级会员优惠价类型:1折扣价,2直接优惠价' AFTER `svipPriceFlag`,
+    ADD COLUMN `svipDiscount` DECIMAL(20,2) NULL DEFAULT '0.00' COMMENT '超级会员折扣' AFTER `svipPriceFlag`,
+    ADD COLUMN `svipReduction` DECIMAL(20,2) NULL DEFAULT 0.00 COMMENT '超级会员优惠' AFTER `svipDiscount`;

+ 1 - 1
src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1080,7 +1080,7 @@ public class SubmitServiceImpl implements SubmitService {
             /*
              * 机构用户 写入价格库
              */
-            if (3 != orderParamBo.getCartType()) {
+            if (3 != orderParamBo.getCartType() && 1 != orderProduct.getSvipPriceFlag()) {
                 // 写入复购价格库
                 productService.savePurchasePrice(mainOrder, orderProduct, secondHandOrderFlag, "【提交订单】");
             }

+ 0 - 11
src/main/resources/backup.sql

@@ -1,11 +0,0 @@
--- =================================== 2021年9月 超级会员S_VIP start =====================================
-ALTER TABLE `caimei`.`cm_order`
-    ADD COLUMN `svipFullReduction` DECIMAL(15,2) NULL COMMENT '订单超级会员优惠' DEFAULT 0.00 AFTER `couponAmount`;
-ALTER TABLE `caimei`.`cm_shop_order`
-    ADD COLUMN `svipShopReduction` DECIMAL(15,2) NULL COMMENT '店铺超级会员优惠' DEFAULT 0.00 AFTER `differencePrice`;
-ALTER TABLE `caimei`.`cm_order_product`
-    ADD COLUMN `svipPriceFlag` INT NULL DEFAULT 0 COMMENT '超级会员优惠价格标识:0不是,1是' AFTER `heUserId`,
-    ADD COLUMN `svipPriceType` INT NULL DEFAULT NULL COMMENT '超级会员优惠价类型:1折扣价,2直接优惠价' AFTER `svipPriceFlag`,
-    ADD COLUMN `svipDiscount` DECIMAL(20,2) NULL DEFAULT '0.00' COMMENT '超级会员折扣' AFTER `svipPriceFlag`,
-    ADD COLUMN `svipReduction` DECIMAL(20,2) NULL DEFAULT 0.00 COMMENT '超级会员优惠' AFTER `svipDiscount`;
--- =================================== 2021年9月 超级会员S_VIP end =====================================