fix:kmall下单流程数据bug

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2532,8 +2532,8 @@ public class OrderServiceImpl implements OrderService {
                     storeMngChangeDao.save(storeMngChangeEntity);
 
                     int validNum = stockNum - sellVolume;
-                    // 园区库存变化记录
-                    MngChangeEntity mngChangeEntity = new MngChangeEntity();
+                    // 园区库存变化记录，不计销售扣减
+                    /*MngChangeEntity mngChangeEntity = new MngChangeEntity();
                     mngChangeEntity.setThirdPartyMerchCode(goodsDto.getThirdPartyMerchCode());
                     mngChangeEntity.setChangeReason("商品销售扣减");
                     mngChangeEntity.setCreateTime(new Date());
@@ -2548,7 +2548,7 @@ public class OrderServiceImpl implements OrderService {
                     mngChangeEntity.setChangeType(Dict.changeType.item_1.getItem());
                     mngChangeEntity.setGoodsId(goodsDto.getId().intValue());
 
-                    mngChangeDao.save(mngChangeEntity);
+                    mngChangeDao.save(mngChangeEntity);*/
 
                     // 如果园区库存数量小于等于0, 则不更新园区库存, 园区库存只做参考
                     int diff = Math.max(goodsNumber - sellVolume, 0);
@@ -2562,7 +2562,7 @@ public class OrderServiceImpl implements OrderService {
                     BeanUtils.copyProperties(goodsDto, productStoreRelaEntity);
                     productStoreRelaEntity.setStockNum(validNum);
                     productStoreRelaEntity.setStoreId(storeId.longValue());
-                    productStoreRelaEntity.setSellVolume(goodsDto.getSellVolume() + sellVolume);
+                    productStoreRelaEntity.setSellVolume(sellVolume);
                     productStoreRelaEntity.setLastSaleTime(new Date());
                     productStoreRelaService.updateStockNumByStoreIdAndSku(productStoreRelaEntity);//修改普通商品库存
 
@@ -2842,12 +2842,6 @@ public class OrderServiceImpl implements OrderService {
             consumptionRecords.setOrderSn(order.getOrder_sn());
             consumptionRecords.setConsumptionTime(new Date());
             consumptionRecords.setShopSn(String.valueOf(storeId));
-            // 判断是否有使用生日优惠
-            /*if (isBirth) {
-                consumptionRecords.setIsUseBirthdayOffer("0"); // 使用生日优惠
-            } else {
-                consumptionRecords.setIsUseBirthdayOffer("1"); // 没使用生日优惠
-            }*/
             // 积分消费记录
             String deductionScoreStr = (String) param.get("deductionScore");
             String scoreDeductionPriceStr = (String) param.get("scoreDeductionPrice");

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -603,7 +603,7 @@
         update mall_product_store_rela a
         <set>
             <if test="stockNum != null">a.`stock_num` = #{stockNum},</if>
-            <if test="sellVolume != null">a.`sell_volume` = #{sellVolume},</if>
+            <if test="sellVolume != null">a.`sell_volume` = a.`sell_volume` + #{sellVolume},</if>
         </set>
         where a.store_id = #{storeId} and a.sku = #{sku}
     </update>