5月4日晚

springboot/src/main/java/com/example/controller/OrdersController.java

@@ -50,7 +50,7 @@ public class OrdersController {
     public Result setOrdersArrived(@RequestBody Orders orders){
         orders.setOrderState(String.valueOf(OrderStatus.ARRIVED));
         ordersService.updateById(orders);
-        return Result.success();
+        return Result.success(ordersService.selectById(orders.getId()));
     }
 
     /**
@@ -62,7 +62,8 @@ public class OrdersController {
     public Result setOrdersState(@RequestBody Orders orders){
         orders.setOrderState(String.valueOf(OrderStatus.DONE));
         ordersService.updateById(orders);
-        return Result.success();
+        ordersService.updateById(orders);
+        return Result.success(ordersService.selectById(orders.getId()));
     }
 
     /**

springboot/src/main/java/com/example/service/OrdersService.java

@@ -48,19 +48,23 @@ public class OrdersService {
      * 小程序下单新增，点击下单
      */
     public Orders add(Orders orders) {
-        Account currentUser = TokenUtils.getCurrentUser();
-        User user = userMapper.selectById(currentUser.getId());
-        BigDecimal account = user.getAccount(); // 获取余额
-        BigDecimal cost = new BigDecimal(0),t_cost; //记录花费了多少钱
-
-        // 扣除钱包余额
-        if(account.doubleValue() < cost.doubleValue()){
-            throw new CustomException(ResultCodeEnum.ACCOUNT_LIMIT_ERROR);
-        }
-        user.setAccount(account.subtract(cost));
-        userMapper.updateById(user); //更新扣费
+//        Account currentUser = TokenUtils.getCurrentUser();
+//        if(currentUser== null){
+//            currentUser = new User();
+//            currentUser.setId(orders.getUserId());
+//        }
+//        User user = userMapper.selectById(currentUser.getId());
+//        BigDecimal account = user.getAccount(); // 获取余额
+//        BigDecimal cost = new BigDecimal(0),t_cost; //记录花费了多少钱
+//
+//        // 扣除钱包余额
+//        if(account.doubleValue() < cost.doubleValue()){
+//            throw new CustomException(ResultCodeEnum.ACCOUNT_LIMIT_ERROR);
+//        }
+//        user.setAccount(account.subtract(cost));
+//        userMapper.updateById(user); //更新扣费
         orders.setOrderState("待送达");
-        orders.setUserId(currentUser.getId()); // 设置用户id
+//        orders.setUserId(currentUser.getId()); // 设置用户id
         orders.setTransCode(IdUtil.getSnowflakeNextIdStr()); // 随机创建一个交易单号
         orders.setTimeOrder(DateUtil.now()); // 创建订单时间
 
@@ -92,7 +96,7 @@ public class OrdersService {
      * 修改
      */
     public void updateById(Orders orders) {
-        ordersMapper.updateById(orders);
+         ordersMapper.updateById(orders);
     }
 
     /**

springboot/src/main/java/com/example/service/ProductService.java

@@ -1,6 +1,7 @@
 package com.example.service;
 
 import com.example.entity.Product;
+import com.example.entity.ProductType;
 import com.example.entity.Store;
 import com.example.mapper.ProductMapper;
 import com.github.pagehelper.Page;
@@ -8,6 +9,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -20,6 +23,8 @@ public class ProductService {
     private ProductMapper productMapper;
     @Resource
     private StoreService storeService;
+    @Resource
+    private ProductTypeService productTypeService;
     /**
      * 新增
      */
@@ -83,6 +88,13 @@ public class ProductService {
     public PageInfo<Product> getStorePdPage(Integer storeId, Integer pageNum , Integer pageSize){
         PageHelper.startPage(pageNum,pageSize);
         List<Product> list = productMapper.selectByStoreId(storeId);
+        list.forEach(product ->{
+            Integer[] productTypeIds = product.getProductTypeIds();
+            if(productTypeIds!=null&& productTypeIds.length>0){
+                List<ProductType> productTypes = productTypeService.selectByIdBatch(productTypeIds);
+                product.setProductTypes(productTypes);
+            }
+        });
         return PageInfo.of(list);
     }
 

springboot/src/main/java/com/example/service/ProductTypeService.java

@@ -6,6 +6,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,7 +55,16 @@ public class ProductTypeService {
     public ProductType selectById(Integer id) {
         return productTypeMapper.selectById(id);
     }
-
+    public List<ProductType> selectByIdBatch(Integer[] ids){
+        List<ProductType> res = new ArrayList<>();
+        for (int i = 0; i < ids.length; i++) {
+            ProductType productType = selectById(ids[i]);
+            if(productType!=null){
+                res.add(productType);
+            }
+        }
+        return  res;
+    }
     /**
      * 查询所有
      */

springboot/src/main/java/com/example/typeHandler/ArrayIntegerTypeHadnler.java

@@ -23,15 +23,18 @@ public class ArrayIntegerTypeHadnler extends BaseTypeHandler<Integer[]> {
     public void setNonNullParameter(PreparedStatement ps, int i, Integer[] params, JdbcType jdbcType) throws SQLException {
         StringBuffer sb = new StringBuffer();
         sb.append("[");
-        for(Integer param : params){
-            sb.append(param+",");
+        if (params.length > 0) { // 检查是否有元素需要拼接
+            for(Integer param : params){
+                sb.append(param+",");
+            }
+            sb.deleteCharAt(sb.length()-1);
         }
-        sb.deleteCharAt(sb.length()-1);
         sb.append("]");
         log.warn(sb.toString());
-        ps.setString(i,sb.toString());
+        ps.setString(i, sb.toString());
     }
 
+
     @Override
     public Integer[] getNullableResult(ResultSet resultSet, String columnName) throws SQLException {
         return convertToArray(resultSet.getString(columnName));
@@ -53,8 +56,8 @@ public class ArrayIntegerTypeHadnler extends BaseTypeHandler<Integer[]> {
      * @return
      */
     private Integer[] convertToArray(String stringValue) {
-        if (stringValue == null || stringValue.isEmpty()) {
-            return null;
+        if (stringValue == null || stringValue.isEmpty() || "[]".equals(stringValue)) {
+            return new Integer[0]; // 返回空数组
         }
         // 假设数据库中的格式是类似 "[1,2,3]" 的字符串，需要去除首尾的方括号，然后按逗号分割
         stringValue = stringValue.substring(1, stringValue.length() - 1);

springboot/src/main/java/com/example/typeHandler/JsonTypeHandler.java

@@ -12,6 +12,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 
+import java.io.IOException;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
 import java.io.IOException;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -24,28 +34,28 @@ public class JsonTypeHandler<T> extends BaseTypeHandler<List<T>> {
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, List<T> parameter, JdbcType jdbcType) throws SQLException {
+    public void setNonNullParameter(PreparedStatement preparedStatement, int i, List<T> list, JdbcType jdbcType) throws SQLException {
         try {
-            String json = objectMapper.writeValueAsString(parameter);
-            ps.setString(i, json);
+            String json = objectMapper.writeValueAsString(list);
+            preparedStatement.setString(i, json);
         } catch (JsonProcessingException e) {
-            throw new SQLException("Error converting object to JSON string", e);
+            throw new SQLException("Error converting object to JSON", e);
         }
     }
 
     @Override
-    public List<T> getNullableResult(ResultSet rs, String columnName) throws SQLException {
-        return parseJson(rs.getString(columnName));
+    public List<T> getNullableResult(ResultSet resultSet, String s) throws SQLException {
+        return parseJson(resultSet.getString(s));
     }
 
     @Override
-    public List<T> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-        return parseJson(rs.getString(columnIndex));
+    public List<T> getNullableResult(ResultSet resultSet, int i) throws SQLException {
+        return parseJson(resultSet.getString(i));
     }
 
     @Override
-    public List<T> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-        return parseJson(cs.getString(columnIndex));
+    public List<T> getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
+        return parseJson(callableStatement.getString(i));
     }
 
     private List<T> parseJson(String json) throws SQLException {
@@ -55,7 +65,7 @@ public class JsonTypeHandler<T> extends BaseTypeHandler<List<T>> {
         try {
             return objectMapper.readValue(json, List.class);
         } catch (IOException e) {
-            throw new SQLException("Error converting JSON string to object", e);
+            throw new SQLException("Error converting JSON to object", e);
         }
     }
 }

springboot/src/main/resources/mapper/OrdersMapper.xml

@@ -39,17 +39,17 @@
             <result property="recipientName" column="recipient_name"/>
         </association>
 
-        <collection property="orderProductsLists" column="order_products_lists" javaType="list"  ofType="com.example.entity.Product">
+        <collection property="orderProductsLists"  javaType="list" ofType="com.example.entity.Product"  column="order_products_lists"  typeHandler="com.example.typeHandler.JsonTypeHandler">
             <id property="id" column="product_id"/>
             <result property="productName" column="product_name"/>
             <result property="count" column="count"/>
         </collection>
     </resultMap>
-
-    <!--    <include refid="Base_Column_List" />-->
+<!--    javaType="list"  ofType="com.example.entity.Product"-->
     <select id="selectAll" resultMap="ForProductList">
         select
             orders.*,address.*,user.*,
+            orders.order_products_lists,
             address.id as addressId, user.id as userId
         from orders
         left join address on address.id = orders.address_id

springboot/src/main/resources/mapper/ProductMapper.xml

@@ -15,11 +15,12 @@
         <result property="productBidPrice" column="product_bid_price"/>
         <result property="productSellPrice" column="product_sell_price"/>
         <result property="productTypeIds" column="product_type_ids" jdbcType="VARCHAR" typeHandler="com.example.typeHandler.ArrayIntegerTypeHadnler" />
-<!--        店铺产品联合属性 List -->
+<!--        店铺产品联合属性 ListType -->
         <collection property="productTypes" javaType="list" ofType="com.example.entity.ProductType">
             <id property="id" column="productTypeId"/>
             <result property="productTypeName" column="productTypeName"/>
         </collection>
+
     </resultMap>
 
     <select id="selectAll" resultMap="productWithProductType">
@@ -47,10 +48,26 @@
         where id = #{id}
     </select>
 
-    <select id="selectByStoreId" resultType="com.example.entity.Product">
-        select product.*, store.id as storeId
+<!--    <select id="selectByStoreId" resultType="com.example.entity.Product">-->
+<!--        select product.*, store.id as storeId-->
+<!--        from store-->
+<!--        left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')-->
+<!--        where  store.id = #{storeId}-->
+<!--    </select>-->
+<!--    <select id="selectByStoreId" resultMap="productWithProductType">-->
+<!--        select  product.*,-->
+<!--                store.id as storeId,-->
+<!--                product_type.id as productTypeId, product_type.product_type_name   as productTypeName-->
+<!--        from store-->
+<!--                 left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')-->
+<!--                 left join product_type on JSON_CONTAINS(product.product_type_ids,CAST(product_type.id as JSON),'$')-->
+<!--        where  store.id = #{storeId}-->
+<!--    </select>-->
+    <select id="selectByStoreId" resultMap="productWithProductType">
+        select  product.*,
+                store.id as storeId
         from store
-        left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')
+                 left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')
         where  store.id = #{storeId}
     </select>
 
@@ -75,7 +92,7 @@
             <if test="productState != null">#{productState},</if>
             <if test="productName != null">#{productName},</if>
             <if test="productIcons != null">#{productIcons},</if>
-            <if test="productTypeIds != null">#{productTypeIds},</if>
+            <if test="productTypeIds != null">#{productTypeIds,jdbcType=VARCHAR,typeHandler=com.example.typeHandler.ArrayIntegerTypeHadnler},</if>
             <if test="productBidPrice != null">#{productBidPrice},</if>
             <if test="productSellPrice != null">#{productSellPrice},</if>
         </trim>

springboot/src/main/resources/mapper/ProductTypeMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.example.mapper.ProductTypeMapper">
 
     <sql id="Base_Column_List">
-        id,product_name
+        id,product_type_name
     </sql>
 <!--    联合属性    -->
 <!--    <resultMap id="productTypeWithAssociate" type="com.example.entity.ProductType">-->

springboot/src/main/resources/mapper/StoreMapper.xml

@@ -45,8 +45,8 @@
             <result property="productBidPrice" column="product_bid_price"/>
         </collection>
         <collection property="productTypes" javaType="list" ofType="com.example.entity.ProductType">
-            <id property="id" column="productId"/>
-            <result property="productTypeName" column="productTypeName"/>
+            <!-- 这里使用 productTypeName 作为 id -->
+            <id property="productTypeName" column="productTypeName"/>
         </collection>
     </resultMap>
 
@@ -67,23 +67,38 @@
         </where>
     </select>
 
-        <select id="selectAll" resultMap="storeWithType">
-            select
-            store.*, product.*,address.*,adminstore.*,
-            adminstore.id as adminstoreId ,
-            address.id as addressId,
-            product.id as productId,
-            product_type.id as productId, product_type.product_type_name as productTypeName
-            from store
-            left join product_type on JSON_CONTAINS(store.product_type_ids,CAST(product_type.id as JSON),'$')
-            left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')
-            left join address on address.id = store.address_id
-            left join adminstore on adminstore.id = store.owner_id
-            <where>
-                <if test="id!=null" >and store.id = #{id}</if>
-            </where>
-        </select>
-
+<!--        <select id="selectAll" resultMap="storeWithType">-->
+<!--            select-->
+<!--            store.*, product.*,address.*,adminstore.*,-->
+<!--            adminstore.id as adminstoreId ,-->
+<!--            address.id as addressId,-->
+<!--            product.id as productId,-->
+<!--            product_type.id as productId, product_type.product_type_name as productTypeName-->
+<!--            from store-->
+<!--            left join product_type on JSON_CONTAINS(store.product_type_ids,CAST(product_type.id as JSON),'$')-->
+<!--            left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')-->
+<!--            left join address on address.id = store.address_id-->
+<!--            left join adminstore on adminstore.id = store.owner_id-->
+<!--            <where>-->
+<!--                <if test="id!=null" >and store.id = #{id}</if>-->
+<!--            </where>-->
+<!--        </select>-->
+    <select id="selectAll" resultMap="storeWithType">
+        select
+        store.*, product.*,address.*,adminstore.*,
+        adminstore.id as adminstoreId ,
+        address.id as addressId,
+        product.id as productId,
+        product_type.id as productId, product_type.product_type_name as productTypeName
+        from store
+        left join product_type on JSON_CONTAINS(store.product_type_ids,CAST(product_type.id as JSON),'$')
+        left join product on JSON_CONTAINS(store.products_ids,CAST(product.id as JSON),'$')
+        left join address on address.id = store.address_id
+        left join adminstore on adminstore.id = store.owner_id
+        <where>
+            <if test="id!=null" >and store.id = #{id}</if>
+        </where>
+    </select>
 
 
     <select id="selectById" resultMap="storeWithType">