1.2.3 后台操作按钮调整及其新增开启拼团功能

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

@@ -77,4 +77,5 @@ file:
   avatar: E:\yshop\avatar\
   # 文件大小 /M
   maxSize: 100
-  avatarMaxSize: 5
+  avatarMaxSize: 5
+  localUrl: http://localhost:8000

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:
+      password: yshoP@2019#yx
 
       # 初始化配置
       initial-size: 3
@@ -48,7 +48,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password:
+    password: yshop2019@yxtw
     #连接超时时间
     timeout: 5000
 
@@ -85,4 +85,5 @@ file:
   avatar: /home/yshop/avatar/
   # 文件大小 /M
   maxSize: 100
-  avatarMaxSize: 5
+  avatarMaxSize: 5
+  localUrl: http://localhost:8000

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

@@ -52,13 +52,13 @@ mybatis-plus:
 wx:
   mp:
     configs:
-    - appId: wx41db1daef9040a9e
-      secret: a21b79510e45c76d6d543ef3ec020817
-      token: dayouqiantu
-      aesKey: 6wYzx9DyWXHwKSCOBjf8hHQu15d4JI5fVzDDNphaKqM
+    - appId: wxc061dee8806ff712
+      secret: 1dc5b2871d0d5ebd0f1ec7ddb856f805
+      token: yshop
+      aesKey: yYuBUkC8BXImCXyu7O6hkzLj4TC5nxsWPfL4CQAZPNY
   pay:
-    appId: wx41db1daef9040a9e
-    mchId: 1531087341
+    appId: wxc061dee8806ff712
+    mchId: 1493624002
     mchKey: dayouqiantuhupeng8638004yixiangt
     subAppId:
     subMchId:
@@ -69,3 +69,8 @@ logging:
     com.github.binarywang.demo.wx.mp: DEBUG
     me.chanjar.weixin: DEBUG
 
+
+#订单未付款订单时间(单位秒)
+job:
+  unpayorder: 10
+

yshop-api/src/main/resources/logback.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <contextName>elAdmin</contextName>
+    <contextName>yshop</contextName>
 
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">

yshop-api/src/main/resources/mapper/order/YxStoreOrderMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, uid, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, add_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, back_integral, mark, is_del, unique, remark, mer_id, is_mer_check, combination_id, pink_id, cost, seckill_id, bargain_id, verify_code, store_id, shipping_type, is_channel, is_remind, is_system_del
+        id, order_id, uid, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, add_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, back_integral, mark, is_del, `unique`, remark, mer_id, is_mer_check, combination_id, pink_id, cost, seckill_id, bargain_id, verify_code, store_id, shipping_type, is_channel, is_remind, is_system_del
     </sql>
 
     <select id="getYxStoreOrderById" resultType="co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo">

yshop-api/src/main/resources/mapper/shop/YxArticleMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, cid, title, author, image_input, synopsis, share_title, share_synopsis, visit, sort, url, status, add_time, hide, admin_id, mer_id, product_id, is_hot, is_banner
+        id, cid, title, author, image_input, synopsis, share_title, share_synopsis, visit, sort, url, status, add_time, hide, admin_id, mer_id, product_id, is_hot, is_banner,content
     </sql>
 
     <select id="getYxArticleById" resultType="co.yixiang.modules.shop.web.vo.YxArticleQueryVo">

yshop-api/src/main/resources/mapper/user/YxSystemAttachmentMapper.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.user.mapper.YxSystemAttachmentMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        att_id, name, att_dir, satt_dir, att_size, att_type, pid, time, image_type, module_type
+    </sql>
+
+    <select id="getYxSystemAttachmentById" resultType="co.yixiang.modules.user.web.vo.YxSystemAttachmentQueryVo">
+        select <include refid="Base_Column_List"/> from yx_system_attachment where att_id = #{id}
+    </select>
+
+    <select id="getYxSystemAttachmentPageList" resultType="co.yixiang.modules.user.web.vo.YxSystemAttachmentQueryVo">
+        select <include refid="Base_Column_List"/> from yx_system_attachment
+    </select>
+
+</mapper>

yshop-api/src/main/resources/mapper/user/YxUserExtractMapper.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.user.mapper.YxUserExtractMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, uid, real_name, extract_type, bank_code, bank_address, alipay_code, extract_price, mark, balance, fail_msg, fail_time, add_time, status, wechat
+    </sql>
+
+    <select id="getYxUserExtractById" resultType="co.yixiang.modules.user.web.vo.YxUserExtractQueryVo">
+        select <include refid="Base_Column_List"/> from yx_user_extract where id = #{id}
+    </select>
+
+    <select id="getYxUserExtractPageList" resultType="co.yixiang.modules.user.web.vo.YxUserExtractQueryVo">
+        select <include refid="Base_Column_List"/> from yx_user_extract
+    </select>
+
+</mapper>

yshop-api/src/main/resources/mapper/user/YxUserMapper.xml

@@ -15,4 +15,5 @@
         select <include refid="Base_Column_List"/> from yx_user
     </select>
 
+
 </mapper>