Selaa lähdekoodia

修复订单管理查询失败!

赵冬冬 4 vuotta sitten
vanhempi
commit
98b7826c23

+ 2 - 5
carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/OrderDetailController.java

@@ -7,10 +7,7 @@ import com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -23,7 +20,7 @@ public class OrderDetailController extends BaseController {
     private OrderDetailInfoService orderDetailInfoService;
     private OrderDetailInfoService orderDetailInfoService;
 
 
     @ApiOperation("分页查询订单详细信息")
     @ApiOperation("分页查询订单详细信息")
-    @PostMapping("/searchByOrderGuid")
+    @GetMapping("/searchByOrderGuid")
     public ResponseBase searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
     public ResponseBase searchByOrderGuid(@RequestParam(name = "orderGuid") String orderGuid) {
         List<GoodsOrderDetail> goodsOrderDetails = this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid);
         List<GoodsOrderDetail> goodsOrderDetails = this.orderDetailInfoService.findByGoodsOrderInfoGuid(orderGuid);
         return responseResultSuccess(goodsOrderDetails);
         return responseResultSuccess(goodsOrderDetails);

+ 7 - 7
carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderDetailMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderDetailMapper">
 <mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderDetailMapper">
-  <resultMap id="BaseResultMap" type="GoodsOrderDetail">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid" />
     <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid" />
     <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid" />
     <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid" />
@@ -26,7 +26,7 @@
     where guid = #{guid,jdbcType=CHAR}
     where guid = #{guid,jdbcType=CHAR}
   </select>
   </select>
     <select id="getOrderDetailListByOrderId" parameterType="java.lang.String"
     <select id="getOrderDetailListByOrderId" parameterType="java.lang.String"
-            resultType="OrderDetailInfoBO">
+            resultType="com.hcloud.microserver.system.bank.bo.OrderDetailInfoBO">
       SELECT
       SELECT
           aa.fk_goods_guid AS fkGoodsGuid,
           aa.fk_goods_guid AS fkGoodsGuid,
           aa.fk_order_guid AS fkOrderGuid,
           aa.fk_order_guid AS fkOrderGuid,
@@ -52,7 +52,7 @@
     delete from t_goods_order_detail
     delete from t_goods_order_detail
     where guid = #{guid,jdbcType=CHAR}
     where guid = #{guid,jdbcType=CHAR}
   </delete>
   </delete>
-  <insert id="insert" parameterType="GoodsOrderDetail">
+  <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     insert into t_goods_order_detail (guid, fk_order_guid, fk_goods_guid, 
     insert into t_goods_order_detail (guid, fk_order_guid, fk_goods_guid, 
       goods_name, goods_price, sale_num, 
       goods_name, goods_price, sale_num, 
       amount, state, create_user, 
       amount, state, create_user, 
@@ -72,7 +72,7 @@
         #{bean.amount,jdbcType=DECIMAL}, #{bean.state,jdbcType=INTEGER},#{bean.createTime,jdbcType=TIMESTAMP})
         #{bean.amount,jdbcType=DECIMAL}, #{bean.state,jdbcType=INTEGER},#{bean.createTime,jdbcType=TIMESTAMP})
       </foreach>
       </foreach>
   </insert>
   </insert>
-  <insert id="insertSelective" parameterType="GoodsOrderDetail">
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     insert into t_goods_order_detail
     insert into t_goods_order_detail
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="guid != null">
       <if test="guid != null">
@@ -140,7 +140,7 @@
     </trim>
     </trim>
   </insert>
   </insert>
 
 
-  <update id="updateByPrimaryKeySelective" parameterType="GoodsOrderDetail">
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     update t_goods_order_detail
     update t_goods_order_detail
     <set>
     <set>
       <if test="fkOrderGuid != null">
       <if test="fkOrderGuid != null">
@@ -173,7 +173,7 @@
     </set>
     </set>
     where guid = #{guid,jdbcType=CHAR}
     where guid = #{guid,jdbcType=CHAR}
   </update>
   </update>
-  <update id="updateByPrimaryKey" parameterType="GoodsOrderDetail">
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderDetail">
     update t_goods_order_detail
     update t_goods_order_detail
     set fk_order_guid = #{fkOrderGuid,jdbcType=CHAR},
     set fk_order_guid = #{fkOrderGuid,jdbcType=CHAR},
       fk_goods_guid = #{fkGoodsGuid,jdbcType=CHAR},
       fk_goods_guid = #{fkGoodsGuid,jdbcType=CHAR},
@@ -195,7 +195,7 @@
     and fk_order_guid = #{goodsOrderInfoGuid,jdbcType=VARCHAR}
     and fk_order_guid = #{goodsOrderInfoGuid,jdbcType=VARCHAR}
   </select>
   </select>
   <!-- 根据订单guid查询订单项 -->
   <!-- 根据订单guid查询订单项 -->
-  <select id="queryOrderDetail" parameterType="String" resultType="OfflineOrderItemBO">
+  <select id="queryOrderDetail" parameterType="String" resultType="com.hcloud.microserver.system.bank.bo.OfflineOrderItemBO">
     SELECT g.goods_code AS goodsCode,
     SELECT g.goods_code AS goodsCode,
 			 g.goods_type AS goodsType,
 			 g.goods_type AS goodsType,
 			 d.goods_name AS goodsName,
 			 d.goods_name AS goodsName,

+ 9 - 9
carbon-back/carbon-back-service/src/main/resources/carbon/GoodsOrderInfoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper">
 <mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper">
-  <resultMap id="BaseResultMap" type="GoodsOrderInfo">
+  <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_guid" jdbcType="CHAR" property="fkCustomerGuid" />
     <result column="fk_customer_guid" jdbcType="CHAR" property="fkCustomerGuid" />
     <result column="order_no" jdbcType="CHAR" property="orderNo" />
     <result column="order_no" jdbcType="CHAR" property="orderNo" />
@@ -30,7 +30,7 @@
     where guid = #{guid,jdbcType=CHAR}
     where guid = #{guid,jdbcType=CHAR}
   </select>
   </select>
   <select id="searchOrderInfoByPage" parameterType="com.hcloud.microserver.commoncore.base.PageBean"
   <select id="searchOrderInfoByPage" parameterType="com.hcloud.microserver.commoncore.base.PageBean"
-          resultType="OrderInfoBO">
+          resultType="com.hcloud.microserver.system.bank.bo.OrderInfoBO">
       SELECT
       SELECT
       aa.guid,
       aa.guid,
       aa.order_no AS orderNo,
       aa.order_no AS orderNo,
@@ -98,7 +98,7 @@
       </if>
       </if>
       order by aa.create_time desc
       order by aa.create_time desc
   </select>
   </select>
-  <select id="searchOrderInfoByCustomerId" resultType="OrderInfoBO">
+  <select id="searchOrderInfoByCustomerId" resultType="com.hcloud.microserver.system.bank.bo.OrderInfoBO">
         SELECT
         SELECT
             aa.guid,
             aa.guid,
             aa.order_no AS orderNo,
             aa.order_no AS orderNo,
@@ -129,7 +129,7 @@
     delete from t_goods_order_info
     delete from t_goods_order_info
     where guid = #{guid,jdbcType=CHAR}
     where guid = #{guid,jdbcType=CHAR}
   </delete>
   </delete>
-  <insert id="insert" parameterType="GoodsOrderInfo">
+  <insert id="insert" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
     insert into t_goods_order_info (guid, fk_customer_guid, order_no, 
     insert into t_goods_order_info (guid, fk_customer_guid, order_no, 
       customer_name,customer_type,order_amount, order_carbon_amount, order_status,
       customer_name,customer_type,order_amount, order_carbon_amount, order_status,
       state, create_user, create_time, 
       state, create_user, create_time, 
@@ -140,7 +140,7 @@
       #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{state,jdbcType=INTEGER}, #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR},#{orderType,jdbcType=INTEGER})
       #{modifiedUser,jdbcType=CHAR}, #{modifiedTime,jdbcType=TIMESTAMP},#{payNo,jdbcType=VARCHAR},#{orderType,jdbcType=INTEGER})
   </insert>
   </insert>
-  <insert id="insertSelective" parameterType="GoodsOrderInfo">
+  <insert id="insertSelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
     insert into t_goods_order_info
     insert into t_goods_order_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="guid != null">
       <if test="guid != null">
@@ -237,7 +237,7 @@
       </if>
       </if>
     </trim>
     </trim>
   </insert>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="GoodsOrderInfo">
+  <update id="updateByPrimaryKeySelective" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
     update t_goods_order_info
     update t_goods_order_info
     <set>
     <set>
       <if test="fkCustomerGuid != null">
       <if test="fkCustomerGuid != null">
@@ -285,7 +285,7 @@
     </set>
     </set>
     where guid = #{guid,jdbcType=CHAR}
     where guid = #{guid,jdbcType=CHAR}
   </update>
   </update>
-  <update id="updateByPrimaryKey" parameterType="GoodsOrderInfo">
+  <update id="updateByPrimaryKey" parameterType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
     update t_goods_order_info
     update t_goods_order_info
     set fk_customer_guid = #{fkCustomerGuid,jdbcType=CHAR},
     set fk_customer_guid = #{fkCustomerGuid,jdbcType=CHAR},
       order_no = #{orderNo,jdbcType=CHAR},
       order_no = #{orderNo,jdbcType=CHAR},
@@ -309,7 +309,7 @@
      where fk_customer_guid = #{oldId}
      where fk_customer_guid = #{oldId}
     </update>
     </update>
     <!-- 线下认购订单列表 -->
     <!-- 线下认购订单列表 -->
-    <select id="offlineOrderList" parameterType="com.hcloud.microserver.commoncore.base.PageBean" resultType="OfflineOrderBO">
+    <select id="offlineOrderList" parameterType="com.hcloud.microserver.commoncore.base.PageBean" resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
         SELECT 	o.guid,
         SELECT 	o.guid,
         o.order_no AS orderNo,
         o.order_no AS orderNo,
         o.order_amount AS orderAmount,
         o.order_amount AS orderAmount,
@@ -357,7 +357,7 @@
         ORDER BY o.create_time DESC
         ORDER BY o.create_time DESC
     </select>
     </select>
     <!-- 查询线下认购订单详情-->
     <!-- 查询线下认购订单详情-->
-    <select id="queryOfflineOrderDetial" parameterType="String" resultType="OfflineOrderDetailBO">
+    <select id="queryOfflineOrderDetial" parameterType="String" resultType="com.hcloud.microserver.system.facade.carbon.entity.GoodsOrderInfo">
         SELECT 	o.guid,
         SELECT 	o.guid,
 				o.order_no AS orderNo,
 				o.order_no AS orderNo,
 				o.order_amount AS orderAmount,
 				o.order_amount AS orderAmount,