yshop1.3版本发布及其导出最新sql

yshop-api/src/main/resources/config/application-prod.yml

@@ -6,7 +6,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: yshop
-      password: yshoP@2019#yx
+      password:
 
       # 初始化配置
       initial-size: 3
@@ -48,7 +48,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: yshop2019@yxtw
+    password:
     #连接超时时间
     timeout: 5000
 

yshop-api/src/main/resources/config/application.yml

@@ -53,13 +53,13 @@ wx:
   mp:
     configs:
     - appId: wxc061dee8806ff712
-      secret: 1dc5b2871d0d5ebd0f1ec7ddb856f805
+      secret:
       token: yshop
       aesKey: yYuBUkC8BXImCXyu7O6hkzLj4TC5nxsWPfL4CQAZPNY
   pay:
     appId: wxc061dee8806ff712
-    mchId: 1493624002
-    mchKey: dayouqiantuhupeng8638004yixiangt
+    mchId:
+    mchKey:
     subAppId:
     subMchId:
     keyPath:

yshop-api/src/main/resources/mapper/activity/YxStoreCombinationMapper.xml

@@ -0,0 +1,18 @@
+<?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="co.yixiang.modules.activity.mapper.YxStoreCombinationMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, product_id, mer_id, image, images, title, attr, people, info, price, sort, sales, stock, add_time, is_host, is_show, is_del, combination, mer_use, is_postage, postage, description, start_time, stop_time, effective_time, cost, browse, unit_name, end_time_date, start_time_date
+    </sql>
+
+    <select id="getYxStoreCombinationById" resultType="co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo">
+        select <include refid="Base_Column_List"/> from yx_store_combination where id = #{id}
+    </select>
+
+    <select id="getYxStoreCombinationPageList" resultType="co.yixiang.modules.activity.web.vo.YxStoreCombinationQueryVo">
+        select <include refid="Base_Column_List"/> from yx_store_combination
+    </select>
+
+</mapper>

yshop-api/src/main/resources/mapper/activity/YxStorePinkMapper.xml

@@ -0,0 +1,18 @@
+<?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="co.yixiang.modules.activity.mapper.YxStorePinkMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, uid, order_id, order_id_key, total_num, total_price, cid, pid, people, price, add_time, stop_time, k_id, is_tpl, is_refund, status
+    </sql>
+
+    <select id="getYxStorePinkById" resultType="co.yixiang.modules.activity.web.vo.YxStorePinkQueryVo">
+        select <include refid="Base_Column_List"/> from yx_store_pink where id = #{id}
+    </select>
+
+    <select id="getYxStorePinkPageList" resultType="co.yixiang.modules.activity.web.vo.YxStorePinkQueryVo">
+        select <include refid="Base_Column_List"/> from yx_store_pink
+    </select>
+
+</mapper>