Merge branch 'master' of zcb/kmall-pt-general into master

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

@@ -370,22 +370,22 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
 //        goods.setMarketPrice(productStoreRela.getMarketPrice());
 //        goods.setId(goodsEntity.getId());
 //        goodsDao.update(goods);
-        ProductEntity product = productDao.queryObjectByGoodsIdAndStoreId(goodsId, storeId);
-        if(product == null){
-            throw new RRException("该商品规格信息为空！请完善商品数据");
-        }
-        productStoreRela.setProductId(product.getId());
-        if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
-            // 添加商品规格
-            GoodsSpecificationEntity goodsSpecification = goodsSpecificationDao.queryByGoodsId(goodsEntity.getId());
-            goodsSpecification.setValue(productStoreRela.getSpecification());
-            goodsSpecificationDao.update(goodsSpecification);
-
-            // 修改产品
-            product.setGoodsSpecificationIds(goodsSpecification.getId().toString());
-            product.setGoodsSpecificationNameValue(goodsSpecification.getValue());
-            productDao.update(product);
-        }
+//        ProductEntity product = productDao.queryObjectByGoodsIdAndStoreId(goodsId, storeId);
+//        if(product == null){
+//            throw new RRException("该商品规格信息为空！请完善商品数据");
+//        }
+//        productStoreRela.setProductId(product.getId());
+//        if (Dict.orderBizType.item_11.getItem().equals(goodsEntity.getGoodsBizType())) {
+//            // 添加商品规格
+//            GoodsSpecificationEntity goodsSpecification = goodsSpecificationDao.queryByGoodsId(goodsEntity.getId());
+//            goodsSpecification.setValue(productStoreRela.getSpecification());
+//            goodsSpecificationDao.update(goodsSpecification);
+//
+//            // 修改产品
+//            product.setGoodsSpecificationIds(goodsSpecification.getId().toString());
+//            product.setGoodsSpecificationNameValue(goodsSpecification.getValue());
+//            productDao.update(product);
+//        }
 
         // 修改商品参数
         List<GoodsAttributeEntity> attributeEntityList = productStoreRela.getAttributeEntityList();

kmall-admin/src/main/java/com/kmall/admin/service/impl/compared/OrderComparedErrorServiceImpl.java

@@ -130,6 +130,7 @@ public class OrderComparedErrorServiceImpl implements OrderComparedErrorService
         List<String> merchOrderSns = payOrderInfoEntities.stream().map(PayOrderInfoEntity::getMerchOrderSn).collect(Collectors.toList());
 
         QueryOrderDto queryOrderDto = new QueryOrderDto();
+//        queryOrderDto.setQueryDate("2021-02-01");
         queryOrderDto.setQueryDate(comparedDate);
         queryOrderDto.setThirdSn(omsMerchProperties.getThirdSn());
 

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

@@ -457,7 +457,7 @@
 			#{retailPrice},
 			#{marketPrice},
 			#{stockPrice},
-			#{sellVolume},
+			0,
             #{supplierThirdId},
 
         <if test="sku != null" >
@@ -573,9 +573,7 @@
             <if test="lastSaleTime != null" >
                 last_sale_time = #{lastSaleTime,jdbcType=TIMESTAMP},
             </if>
-            <if test="toBeRestored != null" >
-                to_be_restored = #{toBeRestored,jdbcType=VARCHAR}
-            </if>
+            0
         </set>
         where id = #{id}
     </update>