20240118-1调整

src/main/java/com/sqx/modules/chats/service/ChatsServiceImpl.java

@@ -107,7 +107,9 @@ public class ChatsServiceImpl implements ChatsService {
             if(entity.getIsShop()!=null){
                 chat.setIsShop(entity.getIsShop());
             }
-            chat = jpaRepository.save(chat);
+            entity.setChatId(chat.getChatId());
+            entity.setCreateTime(chat.getCreateTime());
+            chat = jpaRepository.save(entity);
             return ResultUtil.success(chat);
         }else {
             //不存在会话，创建会话

src/main/java/com/sqx/modules/goods/service/impl/GoodsServiceImpl.java

@@ -107,6 +107,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
         }else{
             for (GoodsSku v : sku) {
                 v.setGoodsId(goods.getGoodsId());
+                if(v.getSkuOriginalPrice()==null){
+                    v.setSkuOriginalPrice(goods.getOriginalMoney());
+                }
+                if(v.getSkuPrice()==null){
+                    v.setSkuPrice(goods.getGoodsMoney());
+                }
                 goodsSkuService.save(v);
             }
         }
@@ -188,6 +194,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
         }else{
             for (GoodsSku goodsSku : sku) {
                 goodsSku.setGoodsId(goods.getGoodsId());
+                if(goodsSku.getSkuOriginalPrice()==null){
+                    goodsSku.setSkuOriginalPrice(goods.getOriginalMoney());
+                }
+                if(goodsSku.getSkuPrice()==null){
+                    goodsSku.setSkuPrice(goods.getGoodsMoney());
+                }
                 goodsSkuService.save(goodsSku);
             }
         }
@@ -196,8 +208,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
         GoodsShopRelevancy goodsShopRelevancy = new GoodsShopRelevancy();
         goodsShopRelevancy.setInventory(goods.getInventory());
         goodsShopRelevancy.setStatus(goods.getStatus());
-        QueryWrapper<GoodsShopRelevancy> wrapper = new QueryWrapper<>();
-        wrapper.eq("shop_id", goods.getShopId()).eq("goods_id", goods.getGoodsId());
+        goodsShopRelevancy.setSales(goods.getSales());
+        QueryWrapper<GoodsShopRelevancy> wrapper = new QueryWrapper<GoodsShopRelevancy>().eq("goods_id", goods.getGoodsId());
+        if (goods.getShopId()!=null){
+            wrapper.eq("shop_id", goods.getShopId());
+        }
         goodsShopRelevancyDao.update(goodsShopRelevancy, wrapper);
         return Result.success();
     }

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -269,6 +269,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
     @Override
     public Result deleteOrder(Long userId, Long orderId) {
+        TbOrder order = appOrderDao.selectById(orderId);
+        if(order.getIsPay()==1){
+            return Result.error("拼单已经支付，无法取消！");
+        }
         appOrderDao.delete(new QueryWrapper<TbOrder>().eq("user_id", userId).eq("order_id", orderId));
         return Result.success();
     }