|
@@ -8,11 +8,7 @@ import com.ruoyi.app.user.dto.StoreOutput;
|
|
|
import com.ruoyi.common.annotation.Anonymous;
|
|
import com.ruoyi.common.annotation.Anonymous;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
-import com.ruoyi.system.domain.PosCollect;
|
|
|
|
|
-import com.ruoyi.system.domain.PosFood;
|
|
|
|
|
-import com.ruoyi.system.domain.PosOrder;
|
|
|
|
|
-import com.ruoyi.system.domain.PosReview;
|
|
|
|
|
-import com.ruoyi.system.domain.PosStore;
|
|
|
|
|
|
|
+import com.ruoyi.system.domain.*;
|
|
|
import com.ruoyi.system.mapper.PosFoodMapper;
|
|
import com.ruoyi.system.mapper.PosFoodMapper;
|
|
|
import com.ruoyi.system.mapper.PosStoreMapper;
|
|
import com.ruoyi.system.mapper.PosStoreMapper;
|
|
|
import com.ruoyi.system.service.IPosCollectService;
|
|
import com.ruoyi.system.service.IPosCollectService;
|
|
@@ -28,11 +24,11 @@ import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 用户端夜市Controller
|
|
|
|
|
|
|
+ * 用户端夜市摊位Controller
|
|
|
*/
|
|
*/
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/nightmarket")
|
|
@RequestMapping("/nightmarket")
|
|
|
-public class NightMarketController extends BaseController {
|
|
|
|
|
|
|
+public class NightMarketStoreController extends BaseController {
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PosStoreMapper posStoreMapper;
|
|
private PosStoreMapper posStoreMapper;
|
|
@@ -129,7 +125,6 @@ public class NightMarketController extends BaseController {
|
|
|
return error("摊位不存在");
|
|
return error("摊位不存在");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 判断是否已关注
|
|
|
|
|
boolean collected = false;
|
|
boolean collected = false;
|
|
|
if (token != null && !token.isEmpty()) {
|
|
if (token != null && !token.isEmpty()) {
|
|
|
try {
|
|
try {
|
|
@@ -141,22 +136,19 @@ public class NightMarketController extends BaseController {
|
|
|
} catch (Exception ignored) {}
|
|
} catch (Exception ignored) {}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 评分
|
|
|
|
|
QueryWrapper<PosReview> reviewQw = new QueryWrapper<>();
|
|
QueryWrapper<PosReview> reviewQw = new QueryWrapper<>();
|
|
|
reviewQw.eq("md_id", storeId);
|
|
reviewQw.eq("md_id", storeId);
|
|
|
List<PosReview> reviews = posReviewService.list(reviewQw);
|
|
List<PosReview> reviews = posReviewService.list(reviewQw);
|
|
|
double rating = reviews.isEmpty() ? 4.5d :
|
|
double rating = reviews.isEmpty() ? 4.5d :
|
|
|
Math.round(reviews.stream().mapToDouble(PosReview::getScore).average().orElse(4.5d) * 2.0) / 2.0;
|
|
Math.round(reviews.stream().mapToDouble(PosReview::getScore).average().orElse(4.5d) * 2.0) / 2.0;
|
|
|
|
|
|
|
|
- // 月售
|
|
|
|
|
QueryWrapper<PosOrder> orderQw = new QueryWrapper<>();
|
|
QueryWrapper<PosOrder> orderQw = new QueryWrapper<>();
|
|
|
orderQw.eq("md_id", storeId).apply("DATE_FORMAT(cretim,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
|
|
orderQw.eq("md_id", storeId).apply("DATE_FORMAT(cretim,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
|
|
|
long monthlySales = posOrderService.count(orderQw);
|
|
long monthlySales = posOrderService.count(orderQw);
|
|
|
|
|
|
|
|
- // 商品列表
|
|
|
|
|
- List<PosFood> foods = posFoodMapper.selectFoodsByStoreId(storeId, language);
|
|
|
|
|
|
|
+ String langCode = "zh-CN".equals(language) ? "2" : ("en-US".equals(language) ? "1" : "3");
|
|
|
|
|
+ List<PosFood> foods = posFoodMapper.selectFoodsByStoreId(storeId, langCode);
|
|
|
|
|
|
|
|
- // 组装返回
|
|
|
|
|
JSONObject result = new JSONObject();
|
|
JSONObject result = new JSONObject();
|
|
|
result.put("id", store.getId());
|
|
result.put("id", store.getId());
|
|
|
result.put("posName", store.getPosName());
|
|
result.put("posName", store.getPosName());
|