Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java

@@ -24,6 +24,7 @@ import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -93,13 +94,33 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
     }
 
     @Override
+    @Transactional
     public void saveToday(CanteenDailyMenuEntity canteenDailyMenu) {
-        canteenDailyMenu.getSpuIds().forEach(x -> {
-            CanteenDailyMenuEntity todayDO = new CanteenDailyMenuEntity();
-            BeanUtils.copyProperties(canteenDailyMenu, todayDO);
-            todayDO.setSpuId(x);
-            baseMapper.insert(todayDO);
-        });
+            List<Long> spuIds = Optional.ofNullable(canteenDailyMenu.getSpuIds()).orElse(Collections.emptyList());
+            if (spuIds.isEmpty()) return;
+
+            LambdaQueryWrapper<CanteenDailyMenuEntity> queryWrapper = new LambdaQueryWrapper<CanteenDailyMenuEntity>()
+                    .eq(CanteenDailyMenuEntity::getMerchantId, canteenDailyMenu.getMerchantId())
+                    .eq(CanteenDailyMenuEntity::getStartTime, canteenDailyMenu.getStartTime())
+                    .eq(CanteenDailyMenuEntity::getHourType, canteenDailyMenu.getHourType())
+                    .select(CanteenDailyMenuEntity::getSpuId); // 仅查询必要字段
+
+            List<Long> existSpuIds = baseMapper.selectList(queryWrapper)
+                    .stream()
+                    .map(CanteenDailyMenuEntity::getSpuId)
+                    .collect(Collectors.toList());
+
+            List<CanteenDailyMenuEntity> insertList = spuIds.stream()
+                    .filter(id -> !existSpuIds.contains(id))
+                    .map(id -> {
+                        CanteenDailyMenuEntity entity = new CanteenDailyMenuEntity();
+                        BeanUtils.copyProperties(canteenDailyMenu, entity);
+                        entity.setSpuId(id);
+                        return entity;
+                    })
+                    .collect(Collectors.toList());
+            saveBatch(insertList);
+
         // 发送mq消息
         sendMqttMsg(canteenDailyMenu.getMerchantId());
     }

pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml

@@ -31,7 +31,7 @@
     </resultMap>
     <select id="selectTimeFood" resultType="com.bsd.pjcloud.canteen.vo.DailyMenuVO">
         SELECT
-            sp.id,
+        DISTINCT(sp.id),
             t.id as tid,
                sp.name,
                sp.pic_url,