baolei 8 mesi fa
parent
commit
870d11583f
23 ha cambiato i file con 0 aggiunte e 1862 eliminazioni
  1. 0 24
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreBrandStoryMapper.xml
  2. 0 59
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreChangeOrderMapper.xml
  3. 0 16
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreExpressInfoMapper.xml
  4. 0 312
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreGroupMapper.xml
  5. 0 88
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreInvoiceMapper.xml
  6. 0 84
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreMaterialMapper.xml
  7. 0 61
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreMerchantMapper.xml
  8. 0 215
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreOrderMapper.xml
  9. 0 117
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStorePaymentInfoMapper.xml
  10. 0 46
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStorePopuCostsMapper.xml
  11. 0 385
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreProductMapper.xml
  12. 0 17
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreProtMapper.xml
  13. 0 60
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreRecommendProductMapper.xml
  14. 0 21
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreReturnOrderMapper.xml
  15. 0 34
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreShopBannerMapper.xml
  16. 0 26
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreShopDecoMapper.xml
  17. 0 61
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreShoppingCartsMapper.xml
  18. 0 38
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreStockMapper.xml
  19. 0 32
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreSysOperLogMapper.xml
  20. 0 37
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserAddressMapper.xml
  21. 0 14
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserInvoiceInfoMapper.xml
  22. 0 103
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserProdMapper.xml
  23. 0 12
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserWithdrawMapper.xml

+ 0 - 24
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreBrandStoryMapper.xml

@@ -1,24 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreBrandStoryMapper">
-
-
-    <resultMap id="ShopBrandStoryDTOResult" type="ShopBrandStoryDTO" >
-        <result property="description"    column="brandStory"    />
-        <result property="imageUrl"    column="fileUrl"    />
-    </resultMap>
-
-    <select id="selectShopBrandStoryByMercId" parameterType="String" resultMap="ShopBrandStoryDTOResult">
-        SELECT t_shop_brandstory.brandStory, t_attch_file.fileUrl
-        FROM t_shop_brandstory
-        INNER JOIN t_attch_file ON t_shop_brandstory.brandStoryImg = t_attch_file.fileId
-        WHERE t_shop_brandstory.delFlag = '0'
-          AND t_shop_brandstory.mercId = #{mercId}
-        LIMIT 1
-    </select>
-
-
-
-</mapper>

+ 0 - 59
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreChangeOrderMapper.xml

@@ -1,59 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreChangeOrderMapper">
-
-    <select id="selectChangeOrderListByStatus" resultType="ChangeOrderDTO">
-        SELECT t_change_order.*,t_change_order_detail.expressName,
-               t_change_order_detail.expressNo,
-               t_change_order_detail.returnExpressNo
-        FROM t_change_order
-        INNER JOIN t_order ON t_order.orderId = t_change_order.orderId
-        INNER JOIN t_change_order_detail ON t_change_order_detail.changeId = t_change_order.changeId
-        <where>
-            t_change_order.delFlag = '0'
-            AND t_order.buyerId = #{userId}
-            AND t_order.sellerId = #{mercId}
-            <if test="status !=null and status != ''">
-                AND t_change_order.changeStatus = #{status}
-            </if>
-        </where>
---         GROUP BY t_change_order.changeId
-        ORDER BY t_change_order.changeTime desc
-    </select>
-
-
-
-    <update id="updateChangeOrderDetailByChangeId" parameterType="ChangeOrderDetail">
-        update t_change_order_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderId != null">orderId = #{orderId},</if>
-            <if test="orderNo != null and orderNo != ''">orderNo = #{orderNo},</if>
-            <if test="orderDetailId != null">orderDetailId = #{orderDetailId},</if>
-            <if test="suiteId != null and suiteId != ''">suiteId = #{suiteId},</if>
-            <if test="prodId != null">prodId = #{prodId},</if>
-            <if test="prodName != null and prodName != ''">prodName = #{prodName},</if>
-            <if test="pprId != null">pprId = #{pprId},</if>
-            <if test="pprName != null and pprName != ''">pprName = #{pprName},</if>
-            <if test="prodType != null and prodType != ''">prodType = #{prodType},</if>
-            <if test="vendorId != null">vendorId = #{vendorId},</if>
-            <if test="changeQty != null">changeQty = #{changeQty},</if>
-            <if test="changeDetailStatus != null and changeDetailStatus != ''">changeDetailStatus = #{changeDetailStatus},</if>
-            <if test="expressName != null and expressName != ''">expressName = #{expressName},</if>
-            <if test="expressNo != null and expressNo != ''">expressNo = #{expressNo},</if>
-            <if test="returnExpressName != null and returnExpressName != ''">returnExpressName = #{returnExpressName},</if>
-            <if test="returnExpressNo != null and returnExpressNo != ''">returnExpressNo = #{returnExpressNo},</if>
-            <if test="sendTime != null">sendTime = #{sendTime},</if>
-            <if test="returnId != null">returnId = #{returnId},</if>
-            <if test="returnNo != null and returnNo != ''">returnNo = #{returnNo},</if>
-            <if test="returnDetailId != null">returnDetailId = #{returnDetailId},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="createUser != null and createUser != ''">createUser = #{createUser},</if>
-            <if test="createTime != null">createTime = #{createTime},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where changeId = #{changeId}
-    </update>
-</mapper>

+ 0 - 16
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreExpressInfoMapper.xml

@@ -1,16 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreExpressInfoMapper">
-
-    <select id="selectExprInfoListByExprNo" parameterType="String" resultType="ExpressInfoDTO">
-        select id, expressNo, exprTime,
-               exprContext, exprCode, returnCode,
-               returnState, returnMsg,
-               exprName, exprSite, exprPhone, exprLogo, exprCourier, courierPhone, createTime from t_express_info
-        where expressNo = #{exprNo}
-       order by exprTime desc
-    </select>
-
-</mapper>

+ 0 - 312
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreGroupMapper.xml

@@ -1,312 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreGroupMapper">
-
-
-    <resultMap id="selectYdtGroupByGroupIdResult" type="YdtGroupDTO">
-        <result property="groupId"    column="groupId"    />
-        <result property="groupTitle"    column="groupTitle"    />
-        <result property="groupContent"    column="groupContent"    />
-        <result property="groupUserId"    column="groupUserId"    />
-        <result property="groupRoleKey"    column="groupRoleKey"    />
-        <result property="groupStatus"    column="groupStatus"    />
-        <result property="startTime"    column="startTime"    />
-        <result property="successTime"    column="successTime"    />
-        <result property="endTime"    column="endTime"    />
-        <result property="minQty"    column="minQty"    />
-        <result property="sameAddrFlag"    column="sameAddrFlag"    />
-        <result property="sameAddrProvName"    column="sameAddrProvName"    />
-        <result property="sameAddrCityName"    column="sameAddrCityName"    />
-        <result property="sameAddrAreaName"    column="sameAddrAreaName"    />
-        <result property="sameAddrAddress"    column="sameAddrAddress"    />
-        <result property="buildingFlag"    column="buildingFlag"    />
-        <result property="roomFlag"    column="roomFlag"    />
-        <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-        <collection property="ydtGroupDetailDTOS" ofType="YdtGroupDetailDTO">
-            <result property="groupDetailId"    column="groupDetailId"    />
-            <result property="groupId"    column="groupId"    />
-            <result property="prodId"    column="prodId"    />
-            <result property="pprId"    column="pprId"    />
-            <result property="salesPrice"    column="salesPrice"    />
-            <result property="linePrice"    column="linePrice"    />
-            <result property="stockQty"    column="stockQty"    />
-            <result property="soldQty"    column="soldQty"    />
-            <result property="delFlag"    column="delFlag"    />
-            <result property="createUser"    column="createUser"    />
-            <result property="createTime"    column="createTime"    />
-            <result property="updateUser"    column="updateUser"    />
-            <result property="updateTime"    column="updateTime"    />
-        </collection>
-    </resultMap>
-
-
-
-    <resultMap id="selectFlowGroupOrderListResult" type="OrderDTO" >
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="orderTime"    column="orderTime"    />
-        <result property="orderStatus"    column="orderStatus"    />
-        <result property="orderType"    column="orderType"    />
-        <result property="groupId"    column="groupId"    />
-        <result property="buildingNo"    column="buildingNo"    />
-        <result property="roomNo"    column="roomNo"    />
-        <result property="groupNo"    column="groupNo"    />
-        <result property="orderAmount"    column="orderAmount"    />
-        <result property="payAmount"    column="payAmount"    />
-        <result property="prodQuantity"    column="prodQuantity"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerName" column="buyerName"/>
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="payeeId"    column="payeeId"    />
-        <result property="payeeRole"    column="payeeRole"    />
-        <result property="referrerId"    column="referrerId"    />
-        <result property="referrerRole"    column="referrerRole"    />
-        <result property="referrerRate"    column="referrerRate"    />
-        <result property="serviceRate"    column="serviceRate"    />
-        <result property="cancelTime"    column="cancelTime"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="recProvId"    column="recProvId"    />
-        <result property="recProvName"    column="recProvName"    />
-        <result property="recCityId"    column="recCityId"    />
-        <result property="recCityName"    column="recCityName"    />
-        <result property="recAreaId"    column="recAreaId"    />
-        <result property="recAreaName"    column="recAreaName"    />
-        <result property="recAddress"    column="recAddress"    />
-        <result property="recName"    column="recName"    />
-        <result property="recPhone"    column="recPhone"    />
-        <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-        <collection property="orderDetailDTOS" ofType="OrderDetailDTO">
-            <result property="orderDetailId"    column="orderDetailId"    />
-            <result property="orderId"    column="orderId"    />
-            <result property="suiteId"    column="suiteId"    />
-            <result property="prodId"    column="prodId"    />
-            <result property="prodName"    column="prodName"    />
-            <result property="pprId"    column="pprId"    />
-            <result property="pprName"    column="pprName"    />
-            <result property="upId"    column="upId"    />
-            <result property="orgProdId"    column="orgProdId"    />
-            <result property="prodType"    column="prodType"    />
-            <result property="mateId"    column="mateId"    />
-            <result property="mateName"    column="mateName"    />
-            <result property="mateType"    column="mateType"    />
-            <result property="vendorId"    column="vendorId"    />
-            <result property="surfaceQty"    column="surfaceQty"    />
-            <result property="unitQty"    column="unitQty"    />
-            <result property="buyQty"    column="buyQty"    />
-            <result property="afterQty"    column="afterQty"    />
-            <result property="returnQty"    column="returnQty"    />
-            <result property="buyPrice"    column="buyPrice"    />
-            <result property="salePrice"    column="salePrice"    />
-            <result property="confirmTime"    column="confirmTime"    />
-            <result property="finishTime"    column="finishTime"    />
-            <result property="orderDetailStatus"    column="orderDetailStatus"    />
-            <result property="delFlag"    column="delFlag"    />
-            <result property="createUser"    column="createUser"    />
-            <result property="createTime"    column="createTime"    />
-            <result property="updateUser"    column="updateUser"    />
-            <result property="updateTime"    column="updateTime"    />
-
-        </collection>
-    </resultMap>
-
-
-
-
-    <resultMap id="selectYdtGroupDetailByGroupIdResult" type="YdtGroupDTO">
-        <result property="groupId"    column="groupId"    />
-        <result property="groupTitle"    column="groupTitle"    />
-        <result property="groupContent"    column="groupContent"    />
-        <result property="groupUserId"    column="groupUserId"    />
-        <result property="groupRoleKey"    column="groupRoleKey"    />
-        <result property="groupStatus"    column="groupStatus"    />
-        <result property="startTime"    column="startTime"    />
-        <result property="successTime"    column="successTime"    />
-        <result property="endTime"    column="endTime"    />
-        <result property="minQty"    column="minQty"    />
-        <result property="sameAddrFlag"    column="sameAddrFlag"    />
-        <result property="sameAddrProvName"    column="sameAddrProvName"    />
-        <result property="sameAddrCityName"    column="sameAddrCityName"    />
-        <result property="sameAddrAreaName"    column="sameAddrAreaName"    />
-        <result property="sameAddrAddress"    column="sameAddrAddress"    />
-        <result property="buildingFlag"    column="buildingFlag"    />
-        <result property="roomFlag"    column="roomFlag"    />
-        <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-        <collection property="ydtGroupDetailDTOS" select="selectYdgGroupDetailListByGroupId" column="groupId"/>
-    </resultMap>
-
-
-    <resultMap id="selectYdgGroupDetailListByGroupIdResult" type="YdtGroupDetailDTO">
-        <result property="groupDetailId"    column="groupDetailId"    />
-        <result property="groupId"    column="groupId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodName" column="prodName"/>
-        <result property="subTitle" column="subTitle"/>
-        <result property="description" column="prodContent"/>
-        <result property="flowGroupCount" column="flowGroupCount"/>
-        <result property="pprId"    column="pprId"    />
-        <result property="salesPrice"    column="salesPrice"    />
-        <result property="linePrice"    column="linePrice"    />
-        <result property="stockQty"    column="stockQty"    />
-        <result property="soldQty"    column="soldQty"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-        <collection property="imageDTOS" select="selectProductImagesByProductId" column="prodId"/>
-    </resultMap>
-
-    <resultMap id="selectSkusByProductIdResult" type="ProductSkuDTO">
-        <result property="id"    column="pprId"/>
-        <result property="name"    column="pprName"/>
-        <result property="attrs"    column="propIds"/>
-    </resultMap>
-
-
-    <resultMap id="selectAttrByProductIdResult" type="ProductAttrDTO">
-        <id property="id"    column="propId"/>
-        <result property="label"    column="propName"/>
-        <collection property="values" javaType="java.util.List" ofType="ProductAttrDTO">
-            <result property="id"    column="ppvId"/>
-            <result property="label"    column="prodPropValueName"/>
-        </collection>
-    </resultMap>
-
-    <resultMap id="ImagesResult" type="ImageDTO">
-        <id property="imageId"    column="fileId"/>
-        <result property="imageUrl"    column="fileUrl"/>
-    </resultMap>
-
-
-
-    <select id="selectYdtGroupListByUserId" parameterType="Long" resultType="YdtGroupDTO">
-        SELECT t_group.*,
-               (SELECT COUNT(1)
-                   FROM t_order
-                   WHERE t_order.orderStatus = 'PAYED' AND t_order.groupId = t_group.groupId) AS flowGroupOrderCnt,
-               (SELECT COUNT(1)
-                   FROM t_order
-                   WHERE t_order.orderStatus = 'CANCELLED' AND t_order.groupId = t_group.groupId) AS cancelFlowGroupOrderCnt,
-               (SELECT IFNULL(SUM(t_order.prodQuantity), 0)
-                   FROM t_order
-                   WHERE t_order.orderStatus = 'PAYED' AND t_order.groupId = t_group.groupId) AS flowGroupProductCnt
-        FROM t_group
-        WHERE t_group.delFlag = '0' AND t_group.groupUserId = #{userId}
-    </select>
-
-    <select id="selectYdtGroupByGroupId" parameterType="Long" resultMap="selectYdtGroupByGroupIdResult">
-        SELECT t_group.*,t_group_detail.*
-        FROM t_group
-        INNER JOIN t_group_detail ON t_group.groupId = t_group_detail.groupId
-        WHERE t_group.delFlag = '0'
-          AND  t_group.groupId = #{groupId}
-    </select>
-
-
-    <select id="selectGroupDetailByPprId" resultType="YdtGroupDetailDTO">
-        SELECT t_group_detail.*
-        FROM t_group_detail
-        WHERE t_group_detail.delFlag = '0'
-          AND t_group_detail.groupId = #{groupId}
-          AND t_group_detail.pprId = #{pprId}
-    </select>
-
-
-    <select id="selectFlowGroupOrderListByGroupId" parameterType="Long" resultMap="selectFlowGroupOrderListResult">
-        SELECT t_order.orderTime, t_order.buyerId, t_order_detail.*, (
-            SELECT sys_user.user_name
-            FROM sys_user
-            WHERE sys_user.user_id = t_order.buyerId) AS buyerName
-        FROM t_order
-        INNER JOIN t_order_detail ON t_order.orderId = t_order_detail.orderId
-        WHERE t_order.orderStatus = 'PAYED'
-            AND t_order.groupId = #{groupId}
-    </select>
-
-
-    <select id="selectCountPublishGroupTimesByUserId" parameterType="Long" resultType="int">
-        SELECT COUNT(1)
-        FROM t_group
-        WHERE t_group.groupStatus = 'DEPLOY'
-          AND t_group.groupUserId = #{userId}
-    </select>
-
-
-    <select id="selectSkusByProductId" resultMap="selectSkusByProductIdResult">
-        SELECT t_group_detail.prodId,
-               m_prod_prop_relation.propIds,m_prod_prop_relation.pprId,
-               m_prod_prop_relation.pprName
-        FROM t_group_detail
-        INNER JOIN m_prod_prop_relation ON t_group_detail.pprId = m_prod_prop_relation.pprId
-        WHERE m_prod_prop_relation.delFlag = '0'
-          AND t_group_detail.groupId = #{groupId}
-          AND t_group_detail.prodId = #{productId}
-    </select>
-
-
-
-
-    <select id="selectAttrByProductId" resultMap="selectAttrByProductIdResult">
-        SELECT m_prod_prop.propId,m_prod_prop.propName,
-               m_prod_prop_value.ppvId, m_prod_prop_value.prodPropValueName
-        FROM t_group_detail
-        INNER JOIN m_prod_prop ON t_group_detail.prodId = m_prod_prop.prodId
-        INNER JOIN m_prod_prop_value ON m_prod_prop.prodId = m_prod_prop_value.prodId
-        AND m_prod_prop_value.prodPropId = m_prod_prop.propId
-        WHERE  m_prod_prop.delFlag = '0'
-          AND m_prod_prop_value.delFlag = '0'
-          AND t_group_detail.groupId = #{groupId}
-          AND t_group_detail.prodId = #{productId}
-        ORDER BY m_prod_prop.sort, m_prod_prop_value.sort
-    </select>
-
-
-    <select id="selectYdtGroupDetailByGroupId" resultMap="selectYdtGroupDetailByGroupIdResult">
-        SELECT t_group.*
-        FROM t_group
-        WHERE t_group.delFlag = '0'
-          AND  t_group.groupId = #{groupId}
-    </select>
-
-    <select id="selectYdgGroupDetailListByGroupId" resultMap="selectYdgGroupDetailListByGroupIdResult">
-        SELECT t_group_detail.*, m_prod.prodName, m_prod.subTitle,m_prod.prodContent,
-               (SELECT IFNULL(SUM(t_order_detail.buyQty), 0)
-                   FROM t_order INNER JOIN t_order_detail ON t_order.orderId = t_order_detail.orderId
-                   WHERE t_order.orderStatus = 'PAYED'
-                     AND t_order.groupId = t_group_detail.groupId
-                     AND t_order_detail.prodId = t_group_detail.prodId) AS flowGroupCount
-        FROM t_group_detail
-        INNER JOIN m_prod ON m_prod.prodId = t_group_detail.prodId
-        WHERE t_group_detail.delFlag = '0'
-          AND t_group_detail.groupId = #{groupId}
-        GROUP BY t_group_detail.prodId
-    </select>
-
-    <select id="selectProductImagesByProductId" parameterType="Long" resultMap="ImagesResult">
-        SELECT m_prod_picture.picImgId, t_attch_file.fileId, t_attch_file.fileUrl
-        FROM m_prod_picture
-        INNER JOIN t_attch_file ON m_prod_picture.picImgId = t_attch_file.fileId
-        WHERE m_prod_picture.prodId = #{prodId}
-        ORDER BY m_prod_picture.sort
-    </select>
-
-</mapper>

+ 0 - 88
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreInvoiceMapper.xml

@@ -1,88 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreInvoiceMapper">
-
-    <resultMap id="selectInvoiceOrderListByUserIdInvoiceOrderResult" type="InvoiceOrderDTO" >
-        <result property="id"    column="id"    />
-        <result property="orderId"    column="orderId"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="orderDetailId"    column="orderDetailId"    />
-        <result property="buyerId"    column="buyerId"    />
-        <result property="buyerRole"    column="buyerRole"    />
-        <result property="tradeType"    column="tradeType"    />
-        <result property="sellerId"    column="sellerId"    />
-        <result property="sellerRole"    column="sellerRole"    />
-        <result property="payeeId"    column="payeeId"    />
-        <result property="payeeRole"    column="payeeRole"    />
-        <result property="suiteId"    column="suiteId"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="prodName"    column="prodName"    />
-        <result property="pprId"    column="pprId"    />
-        <result property="pprName"    column="pprName"    />
-        <result property="mateId"    column="mateId"    />
-        <result property="mateName"    column="mateName"    />
-        <result property="prodType"    column="prodType"    />
-        <result property="orgProdId"    column="orgProdId"    />
-        <result property="surfaceQty"    column="surfaceQty"    />
-        <result property="unitQty"    column="unitQty"    />
-        <result property="orderQty"    column="orderQty"    />
-        <result property="price"    column="price"    />
-        <result property="returnQty"    column="returnQty"    />
-        <result property="finishTime"    column="finishTime"    />
-        <result property="orderStatus"    column="orderStatus"    />
-        <result property="invoiceTime"    column="invoiceTime"    />
-        <result property="invoiceStatus"    column="invoiceStatus"    />
-        <result property="invoiceBatchNo"    column="invoiceBatchNo"    />
-        <result property="invoiceBillNo"    column="invoiceBillNo"    />
-        <result property="delFlag"    column="delFlag"    />
-        <result property="createUser"    column="createUser"    />
-        <result property="createTime"    column="createTime"    />
-        <result property="updateUser"    column="updateUser"    />
-        <result property="updateTime"    column="updateTime"    />
-        <association property="prodImageDTOS" select="selectProductImageByProdId" column="prodcutId=prodId"/>
-    </resultMap>
-
-    <resultMap id="ProductImageDTOResult" type="ImageDTO" >
-        <result property="imageId"    column="fileId"    />
-        <result property="imageUrl"    column="fileUrl"    />
-    </resultMap>
-
-    <select id="selectProductImageByProdId"  resultMap="ProductImageDTOResult">
-        SELECT t_attch_file.fileId, t_attch_file.fileUrl
-        FROM m_prod_picture
-        INNER JOIN t_attch_file ON m_prod_picture.picImgId = t_attch_file.fileId
-        WHERE m_prod_picture.delFlag = '0'
-          AND m_prod_picture.prodId = #{prodcutId}
-    </select>
-
-    <select id="selectInvoiceOrderListByUserId" resultMap="selectInvoiceOrderListByUserIdInvoiceOrderResult">
-        SELECT t_invoice_order.*
-        FROM t_invoice_order
-        WHERE t_invoice_order.delFlag = '0'
-          AND t_invoice_order.sellerId = #{mercId}
-          AND t_invoice_order.buyerId = #{userId}
-    </select>
-
-    <select id="selectUserInvoiceListByUserId" resultType="UserInvoiceDTO">
-        SELECT t_invoice.*,t_invoice.xhf_nsrsbh as xhfNsrsbh, t_invoice.ghf_nsrsbh as ghfNsrsbh
-        FROM t_invoice
-        WHERE t_invoice.delFlag = '0'
-          AND t_invoice.sellerId = #{mercId}
-          AND t_invoice.buyerId = #{userId}
-    </select>
-
-
-    <select id="selectInvoiceOrderListByOrderIds"  resultType="InvoiceOrderDTO">
-        select i.*
-        from t_invoice_order i
-        where i.delFlag = '0'
-        <if test="list != null">
-            AND i.orderId IN
-            <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-    </select>
-</mapper>

+ 0 - 84
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreMaterialMapper.xml

@@ -1,84 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreMaterialMapper">
-
-    <resultMap id="MaterialImageResult" type="MaterialImageDTO">
-        <result property="materialId"    column="mateId"/>
-        <result property="materialName"    column="mateName"/>
-        <result property="price"    column="price"/>
-        <association property="imageDTO"  javaType="ImageDTO">
-            <result property="imageId"    column="fileId"/>
-            <result property="imageUrl"    column="fileUrl"/>
-            <result property="height"    column="thumbImgHeight"/>
-            <result property="width"    column="thumbImgWidth"/>
-        </association>
-    </resultMap>
-
-    <resultMap id="MaterialCategoryResult" type="CategoryDTO">
-        <result property="categoryId"    column="mateKindId"/>
-        <result property="categoryName"    column="mateKindName"/>
-    </resultMap>
-
-    <resultMap  id="MaterialFontDTOResult" type="MaterialFontDTO">
-        <result property="fontId"    column="fontId"    />
-        <result property="fontType"    column="fontType"    />
-        <result property="fontName"    column="fontName"    />
-        <result property="fontUrl"    column="fontUrl"    />
-        <result property="fontFamily" column="fontFamily"/>
-    </resultMap>
-
-    <select id="selectMaterialImageList"  parameterType="MaterialImageDTO" resultMap="MaterialImageResult">
-        SELECT m_material.*, t_attch_file.fileId,t_attch_file.fileUrl,m_mate_price.price,m_merc_mate.mercId
-        FROM m_merc_mate
-        LEFT JOIN m_material ON m_merc_mate.mateId = m_material.mateId
-        INNER JOIN t_attch_file ON t_attch_file.fileId = m_material.thumbMateImgId
-        INNER JOIN m_mate_price ON m_mate_price.mateId = m_merc_mate.mateId
-        <where>
-            m_merc_mate.delFlag = '0'
-            AND m_merc_mate.mercId = #{mercId}
-            AND m_mate_price.costItem = 'DESIGN'
-            AND m_mate_price.buyerRoleKey = 'CUSTOMER'
-            <if test="mateKindId != null and mateKindId != ''"> AND m_merc_mate.mateKindId = #{mateKindId}</if>
-        </where>
-        ORDER BY m_merc_mate.mateSort
-    </select>
-
-
-    <select id="selectMaterialFontList" parameterType="java.lang.String" resultMap="MaterialFontDTOResult">
-        select fontId, fontType,fontFamily, fontName, fontUrl from m_font
-        <where>
-            delFlag = '0'
-            <if test="fontType != null  and fontType != ''"> and fontType = #{lang}</if>
-        </where>
-    </select>
-
-    <select id="selectMaterialCategoryList" parameterType="java.lang.String" resultMap="MaterialCategoryResult">
-        SELECT m_merc_mate_kind.*, m_material_kind.mateKindName
-        FROM m_merc_mate_kind
-        LEFT JOIN m_material_kind ON m_merc_mate_kind.mateKindId = m_material_kind.mateKindId
-        WHERE m_merc_mate_kind.delFlag = '0'
-          AND m_merc_mate_kind.supplyFlag = '1'
-          AND m_merc_mate_kind.mercId = #{mercId}
-        ORDER BY m_merc_mate_kind.kindSort
-    </select>
-
-    <select id="selectMaterialKindByMaterialId" parameterType="Long" resultType="MaterialKind">
-        SELECT m_material_kind.*
-        FROM m_material
-        INNER JOIN m_material_kind ON m_material.mateKindId = m_material_kind.mateKindId
-        WHERE m_material.mateId = #{materialId}
-    </select>
-
-
-    <select id="selectMatePriceByMateId" resultType="MatePrice">
-        SELECT m_mate_price.* FROM m_merc_mate
-        INNER JOIN m_mate_price ON m_mate_price.mateId = m_merc_mate.mateId AND m_mate_price.salesmanId = m_merc_mate.mercId
-        WHERE m_merc_mate.delFlag = '0'
-          AND m_mate_price.costItem = 'DESIGN'
-          AND m_mate_price.buyerRoleKey = 'CUSTOMER'
-          AND m_mate_price.mateId = #{materialId}
-          AND m_merc_mate.mercId = #{mercId}
-    </select>
-</mapper>

+ 0 - 61
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreMerchantMapper.xml

@@ -1,61 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreMerchantMapper">
-
-    <select id="selectMercByMercId" parameterType="Long" resultType="MercDTO">
-        SELECT m_merchant.*,m_merc_wxapp.*  FROM m_merchant
-        INNER JOIN m_merc_wxapp ON m_merchant.mercId = m_merc_wxapp.mercId
-        WHERE m_merchant.delFlag = '0'
-          AND m_merchant.status = 'IN_COOPERATION'
-          AND m_merc_wxapp.curFlag = '1'
-          AND m_merc_wxapp.applymentState = 'FINISH'
-          AND m_merchant.mercId = #{mercId}
-    </select>
-
-
-    <select id="selectMinMercId" resultType="Long">
-        <![CDATA[
-        SELECT MIN(m_merchant.mercId)
-        FROM m_merchant
-        INNER JOIN m_merc_wxapp ON m_merchant.mercId = m_merc_wxapp.mercId
-        WHERE m_merchant.delFlag = '0'
-          AND m_merchant.status = 'IN_COOPERATION'
-          AND m_merc_wxapp.curFlag = '1'
-          AND m_merc_wxapp.applymentState = 'FINISH'
-          AND m_merchant.mercId <> 100
-        ]]>
-    </select>
-
-    <select id="selectMercWxappByMercId" parameterType="Long" resultType="MercWxapp">
-        SELECT m_merc_wxapp.*
-        FROM m_merc_wxapp
-        WHERE m_merc_wxapp.delFlag = '0'
-          AND m_merc_wxapp.curFlag = '1'
-          AND m_merc_wxapp.mercId = #{mercId}
-        LIMIT 1
-    </select>
-
-    <select id="selectMercIdList" resultType="Long">
-        <![CDATA[
-        SELECT MIN(m_merchant.mercId)
-        FROM m_merchant
-        INNER JOIN m_merc_wxapp ON m_merchant.mercId = m_merc_wxapp.mercId
-        WHERE m_merchant.delFlag = '0'
-          AND m_merchant.status = 'IN_COOPERATION'
-          AND m_merc_wxapp.curFlag = '1'
-          AND m_merchant.mercId <> 100
-        ]]>
-    </select>
-
-    <select id="selectRandOneMerc" resultType="MercDTO">
-        SELECT m_merchant.mercId
-        FROM m_merchant
-        WHERE m_merchant.delFlag = '0'
-          AND m_merchant.`status` = 'IN_COOPERATION'
-        ORDER BY RAND()
-        LIMIT 1
-    </select>
-
-</mapper>

+ 0 - 215
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreOrderMapper.xml

@@ -1,215 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreOrderMapper">
-
-    <resultMap id="OrderDTOResult" type="OrderDTO">
-        <result property="orderId" column="orderId"/>
-        <result property="orderNo" column="orderNo"/>
-        <result property="orderTime" column="orderTime"/>
-        <result property="orderStatus" column="orderStatus"/>
-        <result property="orderType" column="orderType"/>
-        <result property="groupId" column="groupId"/>
-        <result property="buildingNo" column="buildingNo"/>
-        <result property="roomNo" column="roomNo"/>
-        <result property="groupNo" column="groupNo"/>
-        <result property="orderAmount" column="orderAmount"/>
-        <result property="payAmount" column="payAmount"/>
-        <result property="prodQuantity" column="prodQuantity"/>
-        <result property="buyerId" column="buyerId"/>
-        <result property="buyerRole" column="buyerRole"/>
-        <result property="sellerId" column="sellerId"/>
-        <result property="sellerRole" column="sellerRole"/>
-        <result property="payeeId" column="payeeId"/>
-        <result property="payeeRole" column="payeeRole"/>
-        <result property="referrerId" column="referrerId"/>
-        <result property="referrerRole" column="referrerRole"/>
-        <result property="referrerRate" column="referrerRate"/>
-        <result property="serviceRate" column="serviceRate"/>
-        <result property="cancelTime" column="cancelTime"/>
-        <result property="finishTime" column="finishTime"/>
-        <result property="recProvId" column="recProvId"/>
-        <result property="recProvName" column="recProvName"/>
-        <result property="recCityId" column="recCityId"/>
-        <result property="recCityName" column="recCityName"/>
-        <result property="recAreaId" column="recAreaId"/>
-        <result property="recAreaName" column="recAreaName"/>
-        <result property="recAddress" column="recAddress"/>
-        <result property="recName" column="recName"/>
-        <result property="recPhone" column="recPhone"/>
-        <result property="remark" column="remark"/>
-        <result property="delFlag" column="delFlag"/>
-        <result property="createUser" column="createUser"/>
-        <result property="createTime" column="createTime"/>
-        <result property="updateUser" column="updateUser"/>
-        <result property="updateTime" column="updateTime"/>
-        <collection property="orderDetailDTOS" select="selectOrderDetailListByOrderId" column="orderId=orderId"/>
-    </resultMap>
-
-    <resultMap id="OrderDetailDTOsResult" type="OrderDetailDTO">
-        <result property="orderDetailId" column="orderDetailId"/>
-        <result property="orderId" column="orderId"/>
-        <result property="prodId" column="prodId"/>
-        <result property="prodName" column="prodName"/>
-        <result property="pprId" column="pprId"/>
-        <result property="pprName" column="pprName"/>
-        <result property="upId" column="upId"/>
-        <result property="orgProdId" column="orgProdId"/>
-        <result property="prodType" column="prodType"/>
-        <result property="mateId" column="mateId"/>
-        <result property="mateName" column="mateName"/>
-        <result property="mateType" column="mateType"/>
-        <result property="vendorId" column="vendorId"/>
-        <result property="buyQty" column="buyQty"/>
-        <result property="afterQty" column="afterQty"/>
-        <result property="returnQty" column="returnQty"/>
-        <result property="buyPrice" column="buyPrice"/>
-        <result property="salePrice" column="salePrice"/>
-        <result property="confirmTime" column="confirmTime"/>
-        <result property="finishTime" column="finishTime"/>
-        <result property="orderDetailStatus" column="orderDetailStatus"/>
-        <result property="delFlag" column="delFlag"/>
-        <result property="createUser" column="createUser"/>
-        <result property="createTime" column="createTime"/>
-        <result property="updateUser" column="updateUser"/>
-        <result property="updateTime" column="updateTime"/>
-        <collection property="imageDTOS" select="selectProductImageByProdId" column="prodcutId=prodId"/>
-        <collection property="orderDetailExprs" select="selectOrderDetailExprsListByOrderDetailId" column="orderDetailId"/>
-    </resultMap>
-
-    <select id="selectOrderDetailExtByOrderDetailId" parameterType="String" resultMap="OrderDetailDTOsResult">
-        SELECT t_order_detail.* FROM t_order_detail
-        WHERE t_order_detail.orderDetailId = #{orderDetailId}
-    </select>
-
-    <select id="selectOrderDetailListBySuiteId" parameterType="String" resultType="OrderDetail">
-        SELECT t_order_detail.* FROM t_order_detail
-        WHERE t_order_detail.suiteId = #{suiteId}
-    </select>
-
-    <select id="selectOrderByOrderId" resultMap="OrderDTOResult">
-        SELECT t_order.*
-        FROM t_order
-        WHERE t_order.delFlag = '0'
-        AND t_order.orderId = #{orderId}
-    </select>
-
-    <select id="selectOrderListByOrderStatus" resultMap="OrderDTOResult">
-        SELECT t_order.*
-        FROM t_order
-        <where>
-            t_order.delFlag = '0'
-            AND t_order.sellerId = #{mercId}
-            AND t_order.buyerId = #{userId}
-            <if test="orderStatus != null and orderStatus != ''">
-                AND t_order.orderStatus = #{orderStatus}
-            </if>
-        </where>
-        ORDER BY t_order.orderTime desc
-    </select>
-
-    <select id="selectLockOrderByOrderNo" parameterType="String" resultMap="OrderDTOResult">
-        SELECT t_order.*
-        FROM t_order
-        WHERE t_order.delFlag = '0'
-          AND t_order.orderStatus = 'ORDERED'
-          AND t_order.orderNo = #{orderNo}
-        FOR UPDATE
-    </select>
-
-    <select id="selectLockPreCloseOrderByOrderId" parameterType="Long" resultMap="OrderDTOResult">
-        SELECT t_order.*
-        FROM t_order
-        WHERE t_order.delFlag = '0'
-          AND t_order.orderStatus IN ('ORDERED', 'PAYED')
-          AND t_order.orderId = #{orderId}
-        FOR UPDATE
-    </select>
-
-
-    <update id="updateOrderFinishByOrderId" parameterType="OrderDTO">
-        update t_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="finishTime != null">finishTime = #{finishTime},</if>
-            <if test="orderStatus != null and orderStatus != ''">orderStatus = #{orderStatus},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        <![CDATA[
-         where NOT EXISTS (
-            select t_order_detail.* from t_order_detail
-            where t_order_detail.orderDetailStatus <> 'RECEIVED'
-            and t_order_detail.orderId = t_order.orderId)
-            and t_order.orderId = #{orderId}
-        ]]>
-    </update>
-
-
-    <update id="updateOrderDetailFinishBySuiteId" parameterType="OrderDetail">
-        update t_order_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="afterQty != null">afterQty = #{afterQty},</if>
-            <if test="returnQty != null">returnQty = #{returnQty},</if>
-            <if test="confirmTime != null">confirmTime = #{confirmTime},</if>
-            <if test="finishTime != null">finishTime = #{finishTime},</if>
-            <if test="orderDetailStatus != null and orderDetailStatus != ''">orderDetailStatus = #{orderDetailStatus},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where suiteId = #{suiteId}
-    </update>
-
-
-    <update id="updateOrderStatus" parameterType="OrderDTO">
-        update t_order
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderStatus != null and orderStatus != ''">orderStatus = #{orderStatus},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where orderId = #{orderId}
-    </update>
-
-
-    <update id="updateOrderDetailStatus" parameterType="OrderDetailDTO">
-        update t_order_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderDetailStatus != null and orderDetailStatus != ''">orderDetailStatus = #{orderDetailStatus},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where orderDetailId = #{orderDetailId}
-    </update>
-
-
-    <update id="updateOrderDetailByOrderId" parameterType="OrderDetail">
-        update t_order_detail
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="orderDetailStatus != null and orderDetailStatus != ''">orderDetailStatus = #{orderDetailStatus},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where orderId = #{orderId}
-    </update>
-
-    <select id="selectOrderDetailExprsListByOrderDetailId" parameterType="Long" resultType="OrderDetailExprDTO">
-        select id, orderDetailId, expressName, expressNo, sendTime, confirmTime
-        from t_order_detail_expr
-        where orderDetailId = #{orderDetailId}
-    </select>
-
-    <select id="selectProductImageByProdId"  resultType="ImageDTO">
-        SELECT t_attch_file.fileId as imageId, t_attch_file.fileUrl as imageUrl
-        FROM m_prod_picture
-        INNER JOIN t_attch_file ON m_prod_picture.picImgId = t_attch_file.fileId
-        WHERE m_prod_picture.delFlag = '0'
-          AND m_prod_picture.prodId = #{prodcutId}
-    </select>
-
-    <select id="selectOrderDetailListByOrderId" resultMap="OrderDetailDTOsResult">
-        SELECT t_order_detail.* FROM t_order_detail WHERE t_order_detail.orderId = #{orderId}
-    </select>
-
-</mapper>

+ 0 - 117
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStorePaymentInfoMapper.xml

@@ -1,117 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStorePaymentInfoMapper">
-
-    <select id="selectOrderedPaymeninfoByWxOpenId" resultType="PaymentInfo">
-        SELECT t_payment_info.* FROM t_payment_info
-        WHERE t_payment_info.delFlag = '0'
-          AND t_payment_info.orderStatus = 'ORDERED'
-          AND UNIX_TIMESTAMP(t_payment_info.timeExpire) > UNIX_TIMESTAMP(NOW())
-          AND t_payment_info.orderId = #{orderId}
-          AND t_payment_info.wxOpenId = #{wxopenid}
-        ORDER BY t_payment_info.timeStart DESC
-        LIMIT 1
-    </select>
-
-
-    <select id="selectLockPaymentInfoByOutTradeNo" parameterType="String" resultType="PaymentInfo">
-        SELECT t_payment_info.* FROM t_payment_info
-        WHERE t_payment_info.delFlag = '0'
-          AND t_payment_info.orderStatus = 'ORDERED'
-          AND t_payment_info.outTradeNo = #{outTradeNo}
-        FOR UPDATE
-    </select>
-
-    <select id="selectPaymentInfoByOrderId" resultType="PaymentInfo">
-        select t_payment_info.* from t_payment_info
-        where t_payment_info.delFlag = '0'
-          and t_payment_info.orderId = #{orderId}
-    </select>
-
-
-    <update id="updatePaymentInfoByOutTradeNo" parameterType="PaymentInfo">
-        update t_payment_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderId != null">orderId = #{orderId},</if>
-            <if test="orderNo != null and orderNo != ''">orderNo = #{orderNo},</if>
-            <if test="orderStatus != null and orderStatus != ''">orderStatus = #{orderStatus},</if>
-            <if test="payTime != null">payTime = #{payTime},</if>
-            <if test="payKind != null and payKind != ''">payKind = #{payKind},</if>
-            <if test="sellerId != null">sellerId = #{sellerId},</if>
-            <if test="combineAppid != null and combineAppid != ''">combineAppid = #{combineAppid},</if>
-            <if test="combineMchid != null and combineMchid != ''">combineMchid = #{combineMchid},</if>
-            <if test="deviceId != null and deviceId != ''">deviceId = #{deviceId},</if>
-            <if test="payerClientIp != null and payerClientIp != ''">payerClientIp = #{payerClientIp},</if>
-            <if test="mchid != null and mchid != ''">mchid = #{mchid},</if>
-            <if test="outTradeNo != null and outTradeNo != ''">outTradeNo = #{outTradeNo},</if>
-            <if test="subMchid != null and subMchid != ''">subMchid = #{subMchid},</if>
-            <if test="subAttach != null and subAttach != ''">subAttach = #{subAttach},</if>
-            <if test="subDescription != null and subDescription != ''">subDescription = #{subDescription},</if>
-            <if test="payAmount != null">payAmount = #{payAmount},</if>
-            <if test="subCurrency != null and subCurrency != ''">subCurrency = #{subCurrency},</if>
-            <if test="profitSharing != null and profitSharing != ''">profitSharing = #{profitSharing},</if>
-            <if test="wxOpenId != null and wxOpenId != ''">wxOpenId = #{wxOpenId},</if>
-            <if test="notifyUrl != null and notifyUrl != ''">notifyUrl = #{notifyUrl},</if>
-            <if test="stateCode != null and stateCode != ''">stateCode = #{stateCode},</if>
-            <if test="prepayId != null and prepayId != ''">prepayId = #{prepayId},</if>
-            <if test="tradeType != null and tradeType != ''">tradeType = #{tradeType},</if>
-            <if test="tradeState != null and tradeState != ''">tradeState = #{tradeState},</if>
-            <if test="bankType != null and bankType != ''">bankType = #{bankType},</if>
-            <if test="successTime != null">successTime = #{successTime},</if>
-            <if test="transactionId != null and transactionId != ''">transactionId = #{transactionId},</if>
-            <if test="wxOrderId != null and wxOrderId != ''">wxOrderId = #{wxOrderId},</if>
-            <if test="wxOrderStatus != null and wxOrderStatus != ''">wxOrderStatus = #{wxOrderStatus},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="createUser != null and createUser != ''">createUser = #{createUser},</if>
-            <if test="createTime != null">createTime = #{createTime},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where outTradeNo = #{outTradeNo}
-    </update>
-
-    <update id="updatePaymentInfoByOrderId" parameterType="PaymentInfo">
-        update t_payment_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="orderId != null">orderId = #{orderId},</if>
-            <if test="orderNo != null and orderNo != ''">orderNo = #{orderNo},</if>
-            <if test="orderStatus != null and orderStatus != ''">orderStatus = #{orderStatus},</if>
-            <if test="payTime != null">payTime = #{payTime},</if>
-            <if test="payKind != null and payKind != ''">payKind = #{payKind},</if>
-            <if test="sellerId != null">sellerId = #{sellerId},</if>
-            <if test="combineAppid != null and combineAppid != ''">combineAppid = #{combineAppid},</if>
-            <if test="combineMchid != null and combineMchid != ''">combineMchid = #{combineMchid},</if>
-            <if test="deviceId != null and deviceId != ''">deviceId = #{deviceId},</if>
-            <if test="payerClientIp != null and payerClientIp != ''">payerClientIp = #{payerClientIp},</if>
-            <if test="mchid != null and mchid != ''">mchid = #{mchid},</if>
-            <if test="outTradeNo != null and outTradeNo != ''">outTradeNo = #{outTradeNo},</if>
-            <if test="subMchid != null and subMchid != ''">subMchid = #{subMchid},</if>
-            <if test="subAttach != null and subAttach != ''">subAttach = #{subAttach},</if>
-            <if test="subDescription != null and subDescription != ''">subDescription = #{subDescription},</if>
-            <if test="payAmount != null">payAmount = #{payAmount},</if>
-            <if test="subCurrency != null and subCurrency != ''">subCurrency = #{subCurrency},</if>
-            <if test="profitSharing != null and profitSharing != ''">profitSharing = #{profitSharing},</if>
-            <if test="wxOpenId != null and wxOpenId != ''">wxOpenId = #{wxOpenId},</if>
-            <if test="notifyUrl != null and notifyUrl != ''">notifyUrl = #{notifyUrl},</if>
-            <if test="stateCode != null and stateCode != ''">stateCode = #{stateCode},</if>
-            <if test="prepayId != null and prepayId != ''">prepayId = #{prepayId},</if>
-            <if test="tradeType != null and tradeType != ''">tradeType = #{tradeType},</if>
-            <if test="tradeState != null and tradeState != ''">tradeState = #{tradeState},</if>
-            <if test="bankType != null and bankType != ''">bankType = #{bankType},</if>
-            <if test="successTime != null">successTime = #{successTime},</if>
-            <if test="transactionId != null and transactionId != ''">transactionId = #{transactionId},</if>
-            <if test="wxOrderId != null and wxOrderId != ''">wxOrderId = #{wxOrderId},</if>
-            <if test="wxOrderStatus != null and wxOrderStatus != ''">wxOrderStatus = #{wxOrderStatus},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="createUser != null and createUser != ''">createUser = #{createUser},</if>
-            <if test="createTime != null">createTime = #{createTime},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where orderId = #{orderId}
-    </update>
-
-
-</mapper>

+ 0 - 46
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStorePopuCostsMapper.xml

@@ -1,46 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStorePopuCostsMapper">
-
-
-    <select id="selectPopuCostsByUserId" resultType="CommissionMoneyMonthDTO">
-        SELECT t_commission_money_month.*
-        FROM t_commission_money_month
-        WHERE t_commission_money_month.delFlag = '0'
-          AND t_commission_money_month.commissionYear = #{y}
-          AND t_commission_money_month.referrerId = #{userId}
-          AND t_commission_money_month.sellerId = #{mercId}
-        ORDER BY t_commission_money_month.commissionMonth asc
-    </select>
-
-    <select id="selectUserTotalPopuCostsByUserId" resultType="BigDecimal">
-        SELECT IFNULL(SUM(t_commission_money_month.commissionAmount), 0)
-        FROM t_commission_money_month
-        WHERE t_commission_money_month.delFlag = '0'
-          AND t_commission_money_month.referrerId = #{userId}
-          AND t_commission_money_month.sellerId =#{mercId}
-    </select>
-
-    <select id="selectUserYearPopuCostsByUserId" resultType="BigDecimal">
-        SELECT IFNULL(SUM(t_commission_money_month.commissionAmount), 0)
-        FROM t_commission_money_month
-        WHERE t_commission_money_month.delFlag = '0'
-          AND t_commission_money_month.commissionYear = #{y}
-          AND t_commission_money_month.referrerId = #{userId}
-          AND t_commission_money_month.sellerId = #{mercId}
-    </select>
-
-    <select id="selectPopuCostsDetail" resultType="CommissionOrderDTO">
-        SELECT t_commission_order.*
-        FROM t_commission_order
-        WHERE t_commission_order.delFlag = '0'
-          AND t_commission_order.referrerId = #{userId}
-          AND t_commission_order.sellerId = #{mercId}
-          AND date_format(t_commission_order.orderTime, '%Y%m') = #{ym}
-        ORDER BY t_commission_order.orderTime DESC
-    </select>
-
-
-</mapper>

+ 0 - 385
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreProductMapper.xml

@@ -1,385 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreProductMapper">
-
-    <resultMap id="ProductResult" type="ProductDTO">
-        <id property="productId"    column="prodId"/>
-        <result property="orgProductId" column="orgProdId"/>
-        <result property="prodName"    column="prodName"/>
-        <result property="subTitle"    column="subTitle"/>
-        <result property="prodType"    column="prodType"/>
-        <result property="description"    column="prodContent"/>
-        <association property="productPrice" select="selectMinProdPriceBy"
-                     column="mercId=mercId,prodId=prodId"/>
-        <association property="productVendorPrice" select="selectVendorMinProdPriceBy"
-                     column="prodId=prodId"/>
-        <collection property="imageUrls" select="selectProductImagesByProductId" column="prodId"/>
-    </resultMap>
-
-    <resultMap id="ProductAttrResult" type="ProductAttrDTO">
-        <id property="id"    column="propId"/>
-        <result property="label"    column="propName"/>
-        <collection property="values" javaType="java.util.List" ofType="ProductAttrDTO">
-            <result property="id"    column="ppvId"/>
-            <result property="label"    column="prodPropValueName"/>
-        </collection>
-    </resultMap>
-
-    <resultMap id="ProductSkuResult" type="ProductSkuDTO">
-        <result property="id"    column="pprId"/>
-        <result property="name"    column="pprName"/>
-        <result property="attrs"    column="propIds"/>
-<!--        <association property="price" select="selectProdPriceBy"-->
-<!--                     column="mercId=mercId,prodId=prodId,pprId=pprId"/>-->
-        <collection property="imageUrls" javaType="java.util.List" ofType="ImageDTO">
-            <result property="imageId"    column="fileId"/>
-            <result property="imageUrl"    column="fileUrl"/>
-        </collection>
-    </resultMap>
-
-
-    <resultMap id="CategoryResult" type="CategoryDTO">
-        <id property="categoryId"    column="prodkindId"/>
-        <result property="categoryName"    column="prodkindName"/>
-    </resultMap>
-
-
-    <resultMap id="BrandResult" type="BrandDTO">
-        <id property="brandId"    column="brandId"/>
-        <result property="brandName"    column="brandName"/>
-        <result property="logoImageId"    column="logoImageId"/>
-        <result property="logoImageUrl"    column="logoImageUrl"/>
-        <result property="brandImageId"    column="brandImageId"/>
-        <result property="brandImageUrl"    column="brandImageUrl"/>
-        <result property="brandDesc"    column="brandDesc"/>
-<!--        <collection property="logoImageUrls" javaType="java.util.List" ofType="ImageDTO">-->
-<!--            <id property="imageId"    column="logoFileId"/>-->
-<!--            <result property="imageUrl"    column="logoFileUrl"/>-->
-<!--        </collection>-->
-    </resultMap>
-
-
-    <resultMap id="ImagesResult" type="ImageDTO">
-        <id property="imageId"    column="fileId"/>
-        <result property="imageUrl"    column="fileUrl"/>
-    </resultMap>
-
-
-    <resultMap id="ProductDesignImageResult" type="ProductDesignImageDTO">
-        <id property="designId"    column="prodDesignId"/>
-        <result property="surfaceSeq"    column="surfaceSeq"/>
-        <result property="designName" column="designName"/>
-        <result property="suggestTech"    column="suggestTech"/>
-        <result property="optionalTech"    column="optionalTech"/>
-        <result property="point1X"    column="point1X"/>
-        <result property="point1Y"    column="point1Y"/>
-        <result property="point2X"    column="point2X"/>
-        <result property="point2Y"    column="point2Y"/>
-        <result property="printHeight"    column="printHeight"/>
-        <result property="printWidth"    column="printWidth"/>
-        <collection property="clearImgs" javaType="java.util.List" ofType="ImageDTO">
-            <id property="imageId"    column="clearImgId"/>
-            <result property="imageUrl"    column="clearImgUrl"/>
-        </collection>
-    </resultMap>
-
-    <resultMap id="ProductOneResult" type="ProductDTO">
-        <id property="productId"    column="prodId"/>
-        <result property="orgProductId" column="orgProdId"/>
-        <result property="prodName"    column="prodName"/>
-        <result property="subTitle"    column="subTitle"/>
-        <result property="prodType"    column="prodType"/>
-        <result property="description"    column="prodContent"/>
-        <result property="skuId"    column="pprId"/>
-        <result property="propertyName"    column="pprName"/>
-        <association property="productPrice" select="selectMinProdPriceBy"
-                     column="mercId=mercId,prodId=prodId"/>
-        <association property="productVendorPrice" select="selectVendorMinProdPriceBy"
-                     column="prodId=prodId"/>
-        <collection property="imageUrls" ofType="ImageDTO" javaType="java.util.List">
-            <result property="imageId"    column="fileId"/>
-            <result property="imageUrl"    column="fileUrl"/>
-        </collection>
-    </resultMap>
-
-
-    <resultMap id="selectProductBySkuIdProductOneResult" type="ProductDTO">
-        <id property="productId"    column="prodId"/>
-        <result property="orgProductId" column="orgProdId"/>
-        <result property="prodName"    column="prodName"/>
-        <result property="subTitle"    column="subTitle"/>
-        <result property="prodType"    column="prodType"/>
-        <result property="description"    column="prodContent"/>
-        <result property="skuId"    column="pprId"/>
-        <result property="propertyName"    column="pprName"/>
-        <result property="appStatus"    column="appStatus"/>
-        <result property="brandId"    column="brandId"/>
-<!--        <association property="productPrice" select="selectProdPriceBy"-->
-<!--                     column="mercId=mercId,prodId=prodId,pprId=pprId"/>-->
-        <collection property="imageUrls" ofType="ImageDTO" javaType="java.util.List">
-            <result property="imageId"    column="fileId"/>
-            <result property="imageUrl"    column="fileUrl"/>
-        </collection>
-    </resultMap>
-
-
-
-    <select id="selectProductImagesByProductId" parameterType="Long" resultMap="ImagesResult">
-        SELECT m_prod_picture.picImgId, t_attch_file.fileId, t_attch_file.fileUrl
-        FROM m_prod_picture
-        INNER JOIN t_attch_file ON m_prod_picture.picImgId = t_attch_file.fileId
-        WHERE m_prod_picture.prodId = #{prodId}
-        ORDER BY m_prod_picture.sort
-    </select>
-
-    <select id="selectProductList" parameterType="ProductDTO" resultMap="ProductResult">
-        SELECT m_prod.prodId, m_merc_prod.orgProdId, m_prod.prodName, m_prod.prodType, m_prod.subTitle, m_merc_prod.mercId
-        FROM m_merc_prod
-        LEFT JOIN m_prod ON m_merc_prod.prodId = m_prod.prodId
-        <where>
-            m_merc_prod.supplyFlag = '1'
-            AND m_merc_prod.shelfFlag = '1'
-            AND m_merc_prod.delFlag = '0'
-            AND m_merc_prod.mercId = #{mercId}
-            <if test="categoryName != null and categoryName != ''">AND m_merc_prod.prodkindId = #{categoryName}</if>
-            <if test="prodName != null and prodName != ''">AND (m_prod.prodName like concat('%',#{prodName},'%') OR m_prod.subTitle like concat('%',#{prodName},'%'))</if>
-            <if test="brandId != null and brandId != ''">AND m_prod.brandId = #{brandId} </if>
-            <if test="brandName != null and brandName != ''">
-                AND m_prod.brandId IN
-                <foreach collection="brandNames" index="index" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        ORDER BY m_merc_prod.prodSort
-    </select>
-
-    <select id="selectByProductId" resultMap="ProductOneResult">
-        SELECT m_prod.prodId,m_merc_prod.orgProdId,  m_prod.prodName, m_prod.subTitle,
-               m_prod.prodType, m_prod.prodContent,m_merc_prod.mercId,
-               m_prod_picture.picImgId, t_attch_file.fileId,
-               t_attch_file.fileUrl,
-               m_merc_prod.mercId, m_prod.brandId
-        FROM m_merc_prod
-        LEFT JOIN m_prod ON m_merc_prod.prodId = m_prod.prodId
-        INNER JOIN m_prod_picture ON m_prod_picture.prodId = m_prod.prodId AND m_prod_picture.delFlag = '0'
-        INNER JOIN t_attch_file ON t_attch_file.fileId = m_prod_picture.picImgId
-        WHERE m_merc_prod.supplyFlag = '1'
-          AND m_merc_prod.shelfFlag = '1'
-          AND m_merc_prod.delFlag = '0'
-          AND m_merc_prod.mercId = #{mercId}
-          AND m_merc_prod.prodId = #{productId}
-        ORDER BY m_merc_prod.prodSort, m_prod_picture.sort
-    </select>
-
-
-    <select id="selectAttrByProductId" resultMap="ProductAttrResult">
-        SELECT m_prod_prop.propId,m_prod_prop.propName,
-               m_prod_prop_value.ppvId, m_prod_prop_value.prodPropValueName
-        FROM m_merc_prod
-        INNER JOIN m_prod_prop ON m_merc_prod.orgProdId = m_prod_prop.prodId
-        INNER JOIN m_prod_prop_value ON m_prod_prop.prodId = m_prod_prop_value.prodId AND m_prod_prop_value.prodPropId = m_prod_prop.propId
-        WHERE m_merc_prod.delFlag = '0'
-          AND m_prod_prop.delFlag = '0'
-          AND m_prod_prop_value.delFlag = '0'
-          AND m_merc_prod.supplyFlag = '1'
-          AND m_merc_prod.shelfFlag = '1'
-          AND m_merc_prod.mercId = #{mercId}
-          AND m_merc_prod.prodId = #{productId}
-        ORDER BY m_prod_prop.sort, m_prod_prop_value.sort
-    </select>
-
-    <select id="selectSkusByProductId" resultMap="ProductSkuResult">
-        SELECT m_merc_prod.mercId,m_merc_prod.prodId,
-               m_prod_prop_relation.propIds,m_prod_prop_relation.pprId,
-               m_prod_prop_relation.pprName
-        FROM m_merc_prod
-        INNER JOIN m_prod_prop_relation ON m_merc_prod.orgProdId = m_prod_prop_relation.prodId
-        WHERE m_prod_prop_relation.delFlag = '0'
-          AND m_merc_prod.prodId = #{productId}
-          AND m_merc_prod.mercId = #{mercId}
-    </select>
-
-    <select id="selectBrandListByMercId" resultMap="BrandResult">
-        SELECT m_brand.brandId,
-               m_brand.brandName,
-               m_brand.logoImgId,
-               t_attch_file.fileUrl logoImageUrl,
-               t_attch_file.fileId logoImageId,
-               taf.fileUrl brandImageUrl,
-               taf.fileId brandImageId,
-               m_brand.brandDesc
-        FROM m_merc_prod
-         INNER JOIN m_prod ON m_merc_prod.orgProdId = m_prod.prodId
-         INNER JOIN m_brand ON m_brand.brandId = m_prod.brandId
-         LEFT JOIN t_attch_file ON m_brand.logoImgId = t_attch_file.fileId
-         LEFT JOIN t_attch_file taf ON m_brand.brandImgId = taf.fileId
-        WHERE m_merc_prod.supplyFlag = '1'
-          AND m_merc_prod.shelfFlag = '1'
-          AND m_merc_prod.delFlag = '0'
-          AND m_brand.delFlag = '0'
-          AND m_merc_prod.mercId = #{mercId}
-          <if test="prodkindId != null and prodkindId != ''">
-            AND m_merc_prod.prodkindId = #{prodkindId}
-          </if>
-        GROUP BY m_merc_prod.prodkindId, m_brand.brandId
-        ORDER BY m_brand.sort, t_attch_file.sort,taf.sort
-    </select>
-
-    <select id="selectBrandById" parameterType="java.lang.String" resultMap="BrandResult">
-        SELECT m_brand.brandId,
-               m_brand.brandName,
-               m_brand.logoImgId,
-               t_attch_file.fileUrl logoImageUrl,
-               t_attch_file.fileId logoImageId,
-               taf.fileUrl brandImageUrl,
-               taf.fileId brandImageId,
-               m_brand.brandDesc
-        FROM m_brand
-         LEFT JOIN t_attch_file ON m_brand.logoImgId = t_attch_file.fileId
-         LEFT JOIN t_attch_file taf ON m_brand.brandImgId = taf.fileId
-        WHERE m_brand.delFlag = '0'
-          AND m_brand.brandId = #{brandId}
-    </select>
-
-
-    <select id="selectCategoryListByMercId" parameterType="java.lang.String" resultMap="CategoryResult">
-        SELECT m_prodkind.prodkindId, m_prodkind.prodkindName
-        FROM m_merc_prod
-        LEFT JOIN m_prodkind ON m_merc_prod.prodkindId = m_prodkind.prodkindId
-        WHERE m_merc_prod.supplyFlag = '1'
-          AND m_merc_prod.shelfFlag = '1'
-          AND m_merc_prod.delFlag = '0'
-          AND m_prodkind.delFlag = '0'
-          AND m_merc_prod.mercId = #{mercId}
-        GROUP BY m_merc_prod.prodkindId
-        ORDER BY m_prodkind.kindSort
-    </select>
-
-
-    <select id="selectDesignListByMercId" resultMap="ProductDesignImageResult">
-        SELECT m_prod_design.*, clearImg.fileUrl AS clearImgUrl
-        FROM m_merc_prod
-        INNER JOIN m_prod_design ON m_merc_prod.orgProdId = m_prod_design.prodId
-        INNER JOIN t_attch_file clearImg ON m_prod_design.clearImgId = clearImg.fileId
-        WHERE m_prod_design.delFlag = '0'
-          AND m_merc_prod.mercId = #{mercId}
-          AND m_prod_design.pprId = #{pprId}
-    </select>
-
-
-<!--    <select id="selectProdPriceBy" resultType="BigDecimal">-->
-<!--        SELECT IFNULL(a.price, 0) + IFNULL(b.price, 0)-->
-<!--        FROM (-->
-<!--         SELECT SUM(m_prod_price.price) AS price-->
-<!--         FROM m_prod_price-->
-<!--         WHERE m_prod_price.delFlag = '0'-->
-<!--           AND m_prod_price.costItemKey IN ('BLANK', 'MANCOST', 'EXPRESS')-->
-<!--           AND m_prod_price.salesmanId = #{mercId}-->
-<!--           AND m_prod_price.buyerRoleKey = 'CUSTOMER'-->
-<!--           AND m_prod_price.prodId = #{prodId}-->
-<!--           AND m_prod_price.pprId = #{pprId} ) a, (-->
-<!--         SELECT m_prod_price.price-->
-<!--         FROM m_prod_price-->
-<!--         WHERE m_prod_price.delFlag = '0'-->
-<!--           AND m_prod_price.costItemKey = 'PRINT'-->
-<!--           AND m_prod_price.salesmanId = #{mercId}-->
-<!--           AND m_prod_price.buyerRoleKey = 'CUSTOMER'-->
-<!--           AND m_prod_price.prodId = #{prodId}-->
-<!--           AND m_prod_price.pprId = #{pprId}-->
-<!--           AND m_prod_price.surfaceQty = (-->
-<!--             SELECT COUNT(1)-->
-<!--             FROM m_prod_design-->
-<!--             WHERE m_prod_design.pprId = m_prod_price.pprId-->
-<!--               AND m_prod_design.prodId = m_prod_price.prodId-->
-<!--         )) b-->
-<!--    </select>-->
-
-
-    <select id="selectProductPriceList" resultType="ProdPriceDTO">
-        SELECT m_prod_price.*,  m_cost_item.* FROM m_cost_item
-        INNER JOIN m_prod_price ON m_cost_item.costItemKey = m_prod_price.costItemKey
-        WHERE m_prod_price.delFlag = '0'
-          AND m_prod_price.buyerRoleKey = 'CUSTOMER'
-          AND m_prod_price.salesmanId = #{mercId}
-          AND m_prod_price.prodId = #{prodId}
-          AND m_prod_price.pprId = #{pprId}
-          and (case when m_cost_item.singleFlag = '0' then m_prod_price.surfaceQty = #{surfaceQty} else 1 end)
-    </select>
-
-
-    <select id="selectProductBySkuId" resultMap="selectProductBySkuIdProductOneResult">
-        SELECT m_merc_prod.mercId,
-               m_merc_prod.prodId,
-               m_merc_prod.orgProdId,
-               m_merc_prod.mercId,
-               m_prod_prop_relation.propIds,
-               m_prod_prop_relation.pprId,
-               m_prod_prop_relation.pprName,
-               t_attch_file.fileId,
-               m_prod.prodName,
-               t_attch_file.fileUrl,
-               m_prod.prodType,
-               m_prod.appStatus
-        FROM m_merc_prod
-        LEFT JOIN m_prod ON m_merc_prod.prodId = m_prod.prodId
-        INNER JOIN m_prod_prop_relation ON m_merc_prod.orgProdId = m_prod_prop_relation.prodId
-        INNER JOIN m_prod_picture ON m_prod_picture.prodId = m_merc_prod.prodId
-        INNER JOIN t_attch_file ON t_attch_file.fileId = m_prod_picture.picImgId
-        WHERE m_prod_prop_relation.delFlag = '0'
-          AND m_merc_prod.prodId = #{prodId}
-          AND m_merc_prod.mercId = #{mercId}
-          AND m_prod_prop_relation.pprId = #{pprId}
-    </select>
-
-
-    <select id="selectMinProdPriceBy" resultType="BigDecimal">
-        SELECT SUM(a.price)
-        FROM (SELECT MIN(m_prod_price.price) AS price
-         FROM m_cost_item
-         INNER JOIN m_prod_price ON m_cost_item.costItemKey = m_prod_price.costItemKey
-         WHERE m_prod_price.delFlag = '0'
-           AND m_prod_price.buyerRoleKey = 'CUSTOMER'
-           AND m_prod_price.surfaceQty = 0
-           AND m_prod_price.salesmanId = #{mercId}
-           AND m_prod_price.prodId = #{prodId}
-         GROUP BY m_prod_price.costItemKey) a
-    </select>
-
-    <select id="selectVendorMinProdPriceBy" resultType="BigDecimal">
-        SELECT SUM(a.price)
-        FROM (SELECT MIN(m_prod_price.price) AS price
-              FROM m_cost_item
-                       INNER JOIN m_prod_price ON m_cost_item.costItemKey = m_prod_price.costItemKey
-              WHERE m_prod_price.delFlag = '0'
-                AND m_prod_price.buyerRoleKey = 'CUSTOMER'
---                 AND m_prod_price.surfaceQty = 0
-                AND m_prod_price.salesmanRoleKey = 'VENDOR'
-                AND m_prod_price.prodId = #{prodId}
-              GROUP BY m_prod_price.costItemKey) a
-    </select>
-
-
-    <select id="selectYdtProductListByMercId" parameterType="Long" resultType="ProductDTO">
-        <![CDATA[
-            SELECT m_prod.prodId, m_merc_prod.orgProdId,
-                m_prod.prodName, m_prod.prodType,
-                m_prod.subTitle,
-                m_merc_prod.mercId,
-                mppr.pprName,
-                mppr.pprId
-            FROM m_merc_prod
-            LEFT JOIN m_prod ON m_merc_prod.prodId = m_prod.prodId
-            LEFT JOIN m_prod_prop_relation mppr ON mppr.prodId = m_prod.prodId
-            WHERE m_merc_prod.supplyFlag = '1'
-            AND m_merc_prod.shelfFlag = '1'
-            AND m_merc_prod.delFlag = '0'
-            AND m_prod.prodType <> 'CUSTOMIZABLE'
-            AND m_merc_prod.mercId = #{mercId}
-        ]]>
-    </select>
-
-
-</mapper>

+ 0 - 17
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreProtMapper.xml

@@ -1,17 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreProtMapper">
-
-
-    <select id="selectProtByProtocolKey" parameterType="String" resultType="Prot">
-        SELECT m_prot.*
-        FROM m_prot
-        WHERE m_prot.delFlag = '0'
-          AND m_prot.protocolKey = #{protocolKey}
-        ORDER BY m_prot.verNo DESC  LIMIT 1
-    </select>
-
-
-</mapper>

+ 0 - 60
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreRecommendProductMapper.xml

@@ -1,60 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreRecommendProductMapper">
-
-    <resultMap id="ShopRecommendDTOResult" type="ShopRecommendDTO" >
-        <id property="mercRecId" column="mercRecId"/>
-        <id property="recTitle" column="recTitle"/>
-        <result property="headImageUrl"    column="fileUrl"    />
-        <collection property="productDTOS"
-                    select="selectShopRecommendProductsByMercRecId"
-                    column="{mercRecId=mercRecId,mercId=mercId}"/>
-    </resultMap>
-
-    <resultMap id="ProductOneResult" type="ProductDTO">
-        <id property="productId"    column="prodId"/>
-        <result property="prodName"    column="prodName"/>
-        <result property="subTitle"    column="subTitle"/>
-        <result property="prodType"    column="prodType"/>
-        <result property="description"    column="prodContent"/>
-<!--        <association property="productPrice" select="cn.com.wingxi.xingxi.store.data.repository.ProductRepository.selectMinProdPriceBy"-->
-<!--                     column="mercId=mercId,prodId=prodId"/>-->
-        <collection property="imageUrls" ofType="ImageDTO" javaType="java.util.List">
-            <result property="imageId"    column="fileId"/>
-            <result property="imageUrl"    column="fileUrl"/>
-        </collection>
-    </resultMap>
-
-    <select id="selectShopRecommendProductsByMercRecId" resultMap="ProductOneResult">
-        SELECT t_shop_recommend_prod.mercRecProdId, t_shop_recommend_prod.prodId, m_prod.prodName, m_prod.prodType, t_attch_file.fileId, t_attch_file.fileUrl
-        FROM t_shop_recommend_prod
-            INNER JOIN m_prod ON t_shop_recommend_prod.prodId = m_prod.prodId
-            INNER JOIN m_merc_prod ON t_shop_recommend_prod.prodId = m_merc_prod.prodId
-            LEFT JOIN m_prod_picture ON m_prod.prodId = m_prod_picture.prodId
-            LEFT JOIN t_attch_file ON m_prod_picture.picImgId = t_attch_file.fileId
-        WHERE t_shop_recommend_prod.delFlag = '0'
-            AND m_prod.delFlag = '0'
-            AND m_prod.appStatus = 'APPROVED'
-            AND t_shop_recommend_prod.mercRecId = #{mercRecId}
-            AND m_merc_prod.mercId = #{mercId}
-            AND m_merc_prod.delFlag = '0'
-            AND m_merc_prod.supplyFlag = '1'
-            AND m_merc_prod.shelfFlag = '1'
-        ORDER BY t_shop_recommend_prod.sort
-    </select>
-
-    <select id="selectShopRecommendByMercId" parameterType="String" resultMap="ShopRecommendDTOResult">
-        SELECT t_shop_recommend.recTitle,t_shop_recommend.mercId, t_attch_file.fileId, t_attch_file.fileUrl,
-               t_shop_recommend.recImg, t_shop_recommend.mercRecId
-        FROM t_shop_recommend
-        INNER JOIN t_attch_file ON t_shop_recommend.recImg = t_attch_file.fileId
-        WHERE t_shop_recommend.delFlag = '0'
-          AND t_shop_recommend.mercId = #{mercId}
-    </select>
-
-
-
-
-</mapper>

+ 0 - 21
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreReturnOrderMapper.xml

@@ -1,21 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreReturnOrderMapper">
-
-    <select id="selectReturnOrderListByStatus" resultType="ReturnOrderDTO">
-        SELECT t_return_order.* FROM t_order
-        INNER JOIN t_return_order ON t_order.orderId = t_return_order.orderId
-        <where>
-            t_return_order.delFlag = '0'
-            AND t_order.buyerId = #{userId}
-            AND t_order.sellerId = #{mercId}
-            <if test="status !=null and status != ''">
-                AND t_return_order.returnStatus = #{status}
-            </if>
-        </where>
-        ORDER BY t_return_order.returnTime desc
-    </select>
-
-</mapper>

+ 0 - 34
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreShopBannerMapper.xml

@@ -1,34 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreShopBannerMapper">
-
-    <resultMap id="ShopBannerResult" type="ShopBannerDTO" >
-        <result property="bannerId"    column="bannerId"    />
-        <result property="bannerType"    column="bannerType"    />
-        <result property="prodId"    column="prodId"    />
-        <result property="sort"    column="sort"    />
-        <collection property="imageDTOS"  ofType="ImageDTO">
-            <result property="imageId"    column="bannerImgId"/>
-            <result property="imageUrl"    column="fileUrl"/>
-        </collection>
-    </resultMap>
-
-    <select id="selectShopBannersByMercId" parameterType="String" resultMap="ShopBannerResult">
-        SELECT t_shop_banner.bannerId,
-               t_shop_banner.bannerImgId,
-               t_shop_banner.prodId,
-               t_shop_banner.bannerType,
-               t_shop_banner.sort,
-               t_attch_file.fileUrl
-        FROM t_shop_banner
-        INNER JOIN t_attch_file ON t_shop_banner.bannerImgId = t_attch_file.fileId
-        WHERE t_shop_banner.delFlag = '0'
-          AND t_shop_banner.shelfFlag = '1'
-          AND t_shop_banner.mercId = #{mercId}
-        ORDER BY t_shop_banner.sort
-    </select>
-
-
-</mapper>

+ 0 - 26
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreShopDecoMapper.xml

@@ -1,26 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreShopDecoMapper">
-
-    <select id="selectShopEnvByMercId" parameterType="String" resultType="ShopEnvDTO">
-        SELECT t_shop_deco.decoId
-             , t_shop_deco.shopName
-             , t_shop_deco.shopAbbrName
-             , t_shop_deco.themeColor
-             , t_shop_deco.fontColor
-        FROM t_shop_deco
-        WHERE t_shop_deco.delFlag = '0'
-          AND t_shop_deco.mercId = #{mercId}
-    </select>
-
-    <select id="selectShopModelListByMercId" parameterType="String" resultType="ShopThemeDTO">
-        SELECT t_shop_theme.id, t_shop_theme.model, t_shop_theme.sort,t_shop_theme.shelfFlag
-        FROM t_shop_theme
-        WHERE t_shop_theme.delFlag = '0'
-          AND t_shop_theme.mercId = #{mercId}
-        ORDER BY t_shop_theme.sort
-    </select>
-
-</mapper>

+ 0 - 61
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreShoppingCartsMapper.xml

@@ -1,61 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreShoppingCartsMapper">
-
-    <select id="selectCartsListByUserId" resultType="ShoppingCartDTO">
-        SELECT t_carts.*
-        FROM t_carts
-        WHERE t_carts.delFlag = '0'
-          AND t_carts.mercId = #{mercId}
-          AND t_carts.userId = #{userId}
-    </select>
-
-    <select id="selectCheckedCartsListByUserId" resultType="ShoppingCartDTO">
-        SELECT t_carts.*
-        FROM t_carts
-        WHERE t_carts.delFlag = '0'
-          AND t_carts.checkFlag = '1'
-          AND t_carts.mercId = #{mercId}
-          AND t_carts.userId = #{userId}
-    </select>
-
-    <select id="selectCartBySkuId" resultType="Carts">
-        SELECT t_carts.*
-        FROM t_carts
-        WHERE t_carts.delFlag = '0'
-          AND t_carts.mercId = #{mercId}
-          AND t_carts.userId = #{userId}
-          AND t_carts.prodId = #{productId}
-          AND t_carts.pprId = #{skuId}
-    </select>
-
-
-    <select id="selectCartsByUpId" resultType="Carts">
-        SELECT t_carts.*
-        FROM t_carts
-        WHERE t_carts.delFlag = '0'
-          AND t_carts.upId = #{upId}
-    </select>
-
-    <update id="updateAddCarts" parameterType="Carts">
-        update t_carts
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">userId = #{userId},</if>
-            <if test="mercId != null">mercId = #{mercId},</if>
-            <if test="prodId != null">prodId = #{prodId},</if>
-            <if test="pprId != null">pprId = #{pprId},</if>
-            <if test="upId != null and upId != ''">upId = #{upId},</if>
-            <if test="prodQty != null">prodQty = prodQty + #{prodQty},</if>
-            <if test="checkFlag != null and checkFlag != ''">checkFlag = #{checkFlag},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="createUser != null and createUser != ''">createUser = #{createUser},</if>
-            <if test="createTime != null">createTime = #{createTime},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-</mapper>

+ 0 - 38
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreStockMapper.xml

@@ -1,38 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreStockMapper">
-
-    <select id="selectProdStockLock" resultType="ProdStock">
-        SELECT ps.*
-        FROM t_prod_stock ps
-        WHERE ps.delFlag = '0'
-          AND ps.vendorId = #{vendorId}
-          AND ps.prodId = #{prodId}
-          AND ps.pprId = #{pprId}
-        ORDER BY ps.availQty DESC LIMIT 1
-        FOR UPDATE
-    </select>
-
-    <update id="updateSubProdStock" parameterType="ProdStock">
-        update t_prod_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="availQty != null">availQty = availQty - #{availQty},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where stockId = #{stockId} and availQty - #{availQty} >= 0
-    </update>
-
-    <update id="updateAddProdStock" parameterType="ProdStock">
-        update t_prod_stock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="availQty != null">availQty = availQty + #{availQty},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        where stockId = #{stockId}
-    </update>
-
-</mapper>

+ 0 - 32
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreSysOperLogMapper.xml

@@ -1,32 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreSysOperLogMapper">
-
-    <resultMap type="SysOperLog" id="SysOperLogResult">
-        <id     property="operId"         column="oper_id"        />
-        <result property="title"          column="title"          />
-        <result property="businessType"   column="business_type"  />
-        <result property="method"         column="method"         />
-        <result property="requestMethod"  column="request_method" />
-        <result property="operatorType"   column="operator_type"  />
-        <result property="operName"       column="oper_name"      />
-        <result property="deptName"       column="dept_name"      />
-        <result property="operUrl"        column="oper_url"       />
-        <result property="operIp"         column="oper_ip"        />
-        <result property="operLocation"   column="oper_location"  />
-        <result property="operParam"      column="oper_param"     />
-        <result property="jsonResult"     column="json_result"    />
-        <result property="status"         column="status"         />
-        <result property="errorMsg"       column="error_msg"      />
-        <result property="operTime"       column="oper_time"      />
-    </resultMap>
-
-    <select id="selectSysOperLogByOperName" parameterType="String" resultMap="SysOperLogResult">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time
-        from sys_oper_log
-        where oper_name = #{operName}
-    </select>
-
-</mapper>

+ 0 - 37
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserAddressMapper.xml

@@ -1,37 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreUserAddressMapper">
-
-
-    <select id="selectUserAddressListByUserId" parameterType="Long" resultType="UserAddressDTO">
-        SELECT m_user_address.*, m_user_address.id as userAddressId
-        FROM m_user_address
-        WHERE m_user_address.delFlag = '0'
-          AND m_user_address.userId = #{userId}
-    </select>
-
-    <update id="updateOtherAddressByUserId" parameterType="UserAddress">
-        update m_user_address
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userName != null and userName != ''">userName = #{userName},</if>
-            <if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
-            <if test="provId != null">provId = #{provId},</if>
-            <if test="provName != null and provName != ''">provName = #{provName},</if>
-            <if test="cityId != null">cityId = #{cityId},</if>
-            <if test="cityName != null and cityName != ''">cityName = #{cityName},</if>
-            <if test="areaId != null">areaId = #{areaId},</if>
-            <if test="areaName != null and areaName != ''">areaName = #{areaName},</if>
-            <if test="address != null and address != ''">address = #{address},</if>
-            <if test="defaultFlag != null and defaultFlag != ''">defaultFlag = #{defaultFlag},</if>
-            <if test="delFlag != null and delFlag != ''">delFlag = #{delFlag},</if>
-            <if test="updateUser != null and updateUser != ''">updateUser = #{updateUser},</if>
-            <if test="updateTime != null">updateTime = #{updateTime},</if>
-        </trim>
-        <![CDATA[where userId = #{userId} and id <> #{id}]]>
-    </update>
-
-
-
-</mapper>

+ 0 - 14
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserInvoiceInfoMapper.xml

@@ -1,14 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreUserInvoiceInfoMapper">
-
-    <select id="selectUserInvoiceInfoListByUserId" resultType="UserInvoiceInfoDTO">
-        SELECT *
-        FROM m_user_invoice_info
-        WHERE m_user_invoice_info.delFlag = '0'
-          AND m_user_invoice_info.userId = #{userId}
-    </select>
-
-</mapper>

+ 0 - 103
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserProdMapper.xml

@@ -1,103 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreUserProdMapper">
-
-    <resultMap id="selectUserProdListByUpIdResult" type="UserProdDTO">
-        <result property="id" column="id"/>
-        <result property="userId" column="userId"/>
-        <result property="upId" column="upId"/>
-        <result property="mercId" column="mercId"/>
-        <result property="prodId" column="prodId"/>
-        <result property="pprId" column="pprId"/>
-        <result property="surfaceSeq" column="surfaceSeq"/>
-        <result property="mateContent" column="mateContent"/>
-        <result property="resultImgId" column="resultImgId"/>
-        <result property="printImgId" column="printImgId"/>
-        <result property="delFlag" column="delFlag"/>
-        <result property="createUser" column="createUser"/>
-        <result property="createTime" column="createTime"/>
-        <result property="updateUser" column="updateUser"/>
-        <result property="updateTime" column="updateTime"/>
-        <collection property="userProdDetails" select="selectUserProdDetailListByUpId" column="upId=upId,surfaceSeq=surfaceSeq"/>
-    </resultMap>
-
-    <resultMap id="selectUserProdDetailListByUserIdResult" type="UserProdDTO">
-        <result property="id" column="id"/>
-        <result property="userId" column="userId"/>
-        <result property="upId" column="upId"/>
-        <result property="mercId" column="mercId"/>
-        <result property="prodId" column="prodId"/>
-        <result property="prodName" column="prodName"/>
-        <result property="pprId" column="pprId"/>
-        <result property="surfaceSeq" column="surfaceSeq"/>
-        <result property="mateContent" column="mateContent"/>
-        <result property="resultImgId" column="resultImgId"/>
-        <result property="printImgId" column="printImgId"/>
-        <result property="delFlag" column="delFlag"/>
-        <result property="createUser" column="createUser"/>
-        <result property="createTime" column="createTime"/>
-        <result property="updateUser" column="updateUser"/>
-        <result property="updateTime" column="updateTime"/>
-        <collection property="userProdDTOS" select="selectUserProdImageListByUpId" column="upId=upId"/>
-    </resultMap>
-
-
-    <resultMap id="selectUserProdImageListByUpIdResult" type="UserProdDTO">
-        <id property="id" column="id"/>
-        <result property="userId" column="userId"/>
-        <result property="upId" column="upId"/>
-        <result property="mercId" column="mercId"/>
-        <result property="prodId" column="prodId"/>
-        <result property="prodName" column="prodName"/>
-        <result property="pprId" column="pprId"/>
-        <result property="surfaceSeq" column="surfaceSeq"/>
-        <result property="resultImgId" column="resultImgId"/>
-        <result property="surfaceSeq" column="surfaceSeq"/>
-        <association property="imageDTO" javaType="ImageDTO">
-            <id property="imageId" column="fileId"/>
-            <result property="imageUrl" column="fileUrl"/>
-        </association>
-    </resultMap>
-
-
-
-    <select id="selectUserProdListByUpId" parameterType="String" resultMap="selectUserProdListByUpIdResult">
-        SELECT t_user_prod.*
-        FROM t_user_prod
-        WHERE t_user_prod.delFlag = '0'
-          AND t_user_prod.upId = #{resourceId}
-    </select>
-
-    <select id="selectUserProdDetailListByUpId" resultMap="cn.com.wingxi.xingxi.system.customer.mapper.UserProdDetailMapper.UserProdDetailResult">
-        SELECT t_user_prod_detail.*
-        FROM t_user_prod_detail
-        WHERE t_user_prod_detail.upId = #{upId}
-          AND t_user_prod_detail.surfaceSeq = #{surfaceSeq}
-    </select>
-
-
-    <select id="selectUserProdImageListByUpId"  resultMap="selectUserProdImageListByUpIdResult">
-        SELECT t_user_prod.*,t_attch_file.fileId, t_attch_file.fileUrl
-        FROM t_user_prod
-        INNER JOIN t_attch_file ON t_user_prod.resultImgId = t_attch_file.fileId
-        WHERE t_user_prod.upId = #{upId}
-    </select>
-
-    <select id="selectUserProdDetailListByUserId" resultMap="selectUserProdDetailListByUserIdResult">
-        SELECT  t_user_prod.upId,t_user_prod.userId,t_user_prod.mercId,
-                t_user_prod.prodId,t_user_prod.prodName,t_user_prod.pprid,
-                t_user_prod.createTime,t_user_prod.mateContent
-        FROM t_user_prod
-        WHERE t_user_prod.delFlag = '0'
-          AND t_user_prod.mercId = #{mercId}
-          AND t_user_prod.userId = #{userId}
-        GROUP BY t_user_prod.upId
-        ORDER BY t_user_prod.createTime desc
-    </select>
-
-
-
-
-</mapper>

+ 0 - 12
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxaStoreUserWithdrawMapper.xml

@@ -1,12 +0,0 @@
-<?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">
-<mapper namespace="cn.com.xingxi.store.data.mapper.WxaStoreUserWithdrawMapper">
-
-    <select id="selectWithdrawListBySubMchId" resultType="UserWithdrawDTO">
-        SELECT * FROM t_withdraw WHERE t_withdraw.subMchid = #{subMchId}
-    </select>
-
-
-</mapper>