sku调整

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -1867,7 +1867,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                         }
                     }
                     log.info("************************订单支付完成消息推送*********************");
-                    if (3 == shopOrderVo.getReceiptStatus()) {
+                    /*if (3 == shopOrderVo.getReceiptStatus()) {
                         List<Integer> productIds = orderClubMapper.getProductShopOrder(shopOrderVo.getShopOrderId());
                         if (0 == shopOrderVo.getSecondHandOrderFlag()&& (null != productIds && !productIds.contains(6060))) {
                             SubmitServiceImpl s = new SubmitServiceImpl();
@@ -1905,7 +1905,7 @@ public class ReceiptServiceImpl implements ReceiptService {
                             messageCenter.setTime(curDateStr);
                             orderClubMapper.addMessageCenter(messageCenter);
                         }
-                    }
+                    }*/
                 }
 
                 if (null != receiptPo.getConfirmType() && 3 == receiptPo.getConfirmType()) {

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -942,6 +942,10 @@ public class SubmitServiceImpl implements SubmitService {
                 CmOrganizeSkuPo organizeSkuInfo = submitMapper.getOrganizeSkuInfo(skuId, organizeId);
                 if ( StringUtils.isNotEmpty(organizeSkuInfo.getCostCheckFlag()) && "1".equals(organizeSkuInfo.getCostCheckFlag())) {
                     // 固定成本
+                    if (taxFlag) {
+                        organizeSkuInfo.setOrganizeCostPrice(MathUtil.add(organizeSkuInfo.getOrganizeCostPrice(), MathUtil.div( MathUtil.mul(organizeSkuInfo.getOrganizeCostPrice(), product.getTaxRate()), 100)).doubleValue());
+                        organizeSkuInfo.setCmCostPrice(MathUtil.add(organizeSkuInfo.getCmCostPrice(), MathUtil.div( MathUtil.mul(organizeSkuInfo.getCmCostPrice(), product.getTaxRate()), 100)).doubleValue());
+                    }
                     product.setOrganizeCostPrice(organizeSkuInfo.getOrganizeCostPrice());
                     product.setCmCostPrice(organizeSkuInfo.getCmCostPrice());
                 }
@@ -2540,6 +2544,10 @@ public class SubmitServiceImpl implements SubmitService {
             CmOrganizeSkuPo organizeSkuInfo = submitMapper.getOrganizeSkuInfo(skuId, orderProduct.getOrganizeId());
             if ( StringUtils.isNotEmpty(organizeSkuInfo.getCostCheckFlag()) && "1".equals(organizeSkuInfo.getCostCheckFlag())) {
                 // 固定成本
+                if (taxFlag) {
+                    organizeSkuInfo.setOrganizeCostPrice(MathUtil.add(organizeSkuInfo.getOrganizeCostPrice(), MathUtil.div( MathUtil.mul(organizeSkuInfo.getOrganizeCostPrice(), product.getTaxRate()), 100)).doubleValue());
+                    organizeSkuInfo.setCmCostPrice(MathUtil.add(organizeSkuInfo.getCmCostPrice(), MathUtil.div( MathUtil.mul(organizeSkuInfo.getCmCostPrice(), product.getTaxRate()), 100)).doubleValue());
+                }
                 product.setOrganizeCostPrice(organizeSkuInfo.getOrganizeCostPrice());
                 product.setCmCostPrice(organizeSkuInfo.getCmCostPrice());
             }

src/main/java/com/caimei365/order/task/ReceiptMsgTask.java

@@ -27,7 +27,7 @@ public class ReceiptMsgTask {
      * 微信收款信息推送
      * 每天九点钟推送
      */
-    @Scheduled(cron = "0 0 09 * * ?")
+    // @Scheduled(cron = "0 0 09 * * ?")
     public void sendWechatMsgTask() {
         log.info("-------->微信收款信息定时推送--start<--------------");
         try {

src/main/resources/mapper/SubmitMapper.xml

@@ -183,7 +183,7 @@
                ifnull(cs.cmPercent, 0) as cmPercent
         FROM cm_sku cs
         LEFT JOIN cm_organize_product_info copi ON cs.productId = copi.productId
-        WHERE cs.skuId = #{skuId} AND cs.organizeId = #{organizeId}
+        WHERE cs.skuId = #{skuId} AND cs.organizeId = #{organizeId} AND copi.organizeId = #{organizeId}
     </select>
     <select id="getOrderInvoice" resultType="com.caimei365.order.model.po.InvoicePo">
         SELECT id,