nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/app/ShoppingController.java

@@ -340,13 +340,6 @@ public class ShoppingController extends ControllerBase {
         QuotationShoppingCart cart = shoppingCartService.getById(id);
         VUtils.trueThrowBusinessError(Objects.isNull(cart)).throwMessage("未找到购物车信息");
         ShoppingCartVO vo = Convert.convert(ShoppingCartVO.class, cart);
-        ProductModel model=productModelService.lambdaQuery()
-                .eq(ProductModel::getState, 1)
-                .eq(ProductModel::getBatchNumber, cart.getModelId())
-                .one();
-        if (Objects.nonNull(model)){
-            vo.setModelKeyId(model.getId());
-        }
         //获取部件配置
 //        Long categoryId = getCategoryId();
 //        List<ModelConfigEffectiveDTO> parts = modelConfigService.getEffectives(cart.getConfigId(), cart.getPriceId(), categoryId, MultilingualUtil.getLanguage());
@@ -436,7 +429,7 @@ public class ShoppingController extends ControllerBase {
      */
     @Transactional
     @PostMapping("/quotation/generate")
-    public ApiResult<Long> generateQuotation(@RequestBody @NotEmpty List<Long> cartIds) {
+    public ApiResult<Void> generateQuotation(@RequestBody @NotEmpty List<Long> cartIds) {
         List<QuotationShoppingCart> carts = shoppingCartService.lambdaQuery()
                 .eq(QuotationShoppingCart::getStatus, 0)
                 .eq(QuotationShoppingCart::getCreateByType, AppUserUtil.isAgent() ? 1 : 0)
@@ -491,7 +484,7 @@ public class ShoppingController extends ControllerBase {
                 .eq(QuotationShoppingCart::getStatus, 0)
                 .in(QuotationShoppingCart::getId, cartIds)
                 .update();
-        return ApiResult.success(order.getId());
+        return ApiResult.success();
     }
 
     /**
@@ -888,7 +881,7 @@ public class ShoppingController extends ControllerBase {
         Object pwd = stringRedisTemplate.opsForHash().get("quotation:password", String.valueOf(AppUserUtil.getUserId()));
 //        VUtils.trueThrowBusinessError(Objects.isNull(pwd)).throwMessage("还未设置过查看密码");
         if (Objects.isNull(pwd)) {
-            return ApiResult.success(StrUtil.equals(password, "000000"));
+            pwd = PASSWORDENCODER.encode("000000");
         }
         if (!PASSWORDENCODER.matches(password, pwd.toString())) {
             return ApiResult.error("查看密码不正确");

nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/pojo/vo/ShoppingCartVO.java

@@ -25,11 +25,6 @@ public class ShoppingCartVO {
      */
     private Long modelId;
 
-    /**
-     * 机型自增id
-     */
-    private Integer modelKeyId;
-
     /**
      * 价格id
      */