Merge remote-tracking branch 'origin/master'

zzjs-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -4,15 +4,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysMenu;
 import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.domain.model.LoginBody;
 import com.miaxis.common.core.domain.model.LoginBodyNoCode;
 import com.miaxis.common.core.domain.model.LoginUser;
 import com.miaxis.common.enums.StudentLoginTypeEnum;
-import com.miaxis.common.utils.RandomNameUtils;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.ServletUtils;
-import com.miaxis.feign.dto.WxResult;
+import com.miaxis.common.core.domain.entity.WxResult;
 import com.miaxis.feign.service.IWxService;
 import com.miaxis.framework.web.service.SysLoginService;
 import com.miaxis.framework.web.service.SysPermissionService;
@@ -21,6 +19,7 @@ import com.miaxis.system.dto.common.RouterDTO;
 import com.miaxis.system.dto.system.TokenDTO;
 import com.miaxis.system.dto.system.UserInfoDTO;
 import com.miaxis.system.service.ISysMenuService;
+import com.miaxis.twzduser.service.ITwzdIUserInfoService;
 import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,7 +58,7 @@ public class SysLoginController
     private IWxService wxService;
 
     @Autowired
-    private IUserInfoService userInfoService;
+    private ITwzdIUserInfoService twzdIUserInfoService;
 
     @Value("${app.appid}")
     private String appid;
@@ -113,8 +112,9 @@ public class SysLoginController
         // 生成令牌
         if (wxResult.getOpenid() != null){
             // 生成令牌
-            String token = loginService.login(wxResult.getOpenid(),null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
+            String token = loginService.login(wxResult,null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
             tokenDTO.setToken(token);
+            tokenDTO.setJpcjUserInfo(twzdIUserInfoService.getUserByUnionId(wxResult.getUnionid()));
             return Response.success(tokenDTO) ;
         }
         else{
@@ -132,8 +132,10 @@ public class SysLoginController
     @ApiOperation("用户jscode登录(测试，固定openid)")
     public Response<TokenDTO> getInfoTest(String jscode){
         TokenDTO tokenDTO = new TokenDTO();
-            // 生成令牌
-        String token = loginService.login("oO7PJ5CPQJo62kZWA3uiUX2KG2s4",null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
+        WxResult wxResult = new WxResult();
+        wxResult.setOpenid("oO7PJ5CPQJo62kZWA3uiUX2KG2s4");
+                // 生成令牌
+        String token = loginService.login(wxResult,null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
         tokenDTO.setToken(token);
         return Response.success(tokenDTO) ;
 

zzjs-admin/src/main/resources/application-dev.yml

@@ -14,9 +14,9 @@ spring:
             newgzpt:
                 # 从数据源开关/默认关闭
                 enabled: true
-                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
-                username: newgzpt
-                password: newgzpt2016
+                url: jdbc:mysql://1.15.26.233:3307/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: miaxis110
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

zzjs-admin/src/main/resources/application-prod.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/zzjs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://172.17.0.6:3306/zzjs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
             # 从库数据源
             newgzpt:
                 # 从数据源开关/默认关闭
                 enabled: true
-                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
-                username: newgzpt
-                password: newgzpt2016
+                url: jdbc:mysql://172.17.0.6:3306/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: Miaxis@2020
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -58,7 +58,7 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 1.15.29.64
+        host: 172.17.66.3
         # 端口，默认为6379
         port: 6379
         # 密码
@@ -123,7 +123,7 @@ wxpay:
 film:
     appKey: 10294472736
     appSecret: n8qV2tsBKN6JQ4nMtycPa8e7
-    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
+    notifyUrl: https://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
     v1Url: http://movieapi.pintoto.cn/
     v2Url: http://movieapi2.pintoto.cn/
 
@@ -152,4 +152,4 @@ fulu:
     appKey: "qxTK3W/RNleYH5tygePOu52hoFHpaqCi0eR5yKhHVgYQanIcua5edOG2rgrldHnL"
     appSecret: "a1be19d04c724c05971942305ea97489"
     url: "http://openapi.fulu.com"
-    notifyUrl: "http://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"
+    notifyUrl: "https://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"

zzjs-admin/src/main/resources/application-prodtest.yml

@@ -0,0 +1,155 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/zzjs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: Miaxis@2020
+            # 从库数据源
+            newgzpt:
+                # 从数据源开关/默认关闭
+                enabled: true
+                url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/twzd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                username: root
+                password: Miaxis@2020
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username:
+                login-password:
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: sh-crs-lfzs3n8w.sql.tencentcdb.com
+        # 端口，默认为6379
+        port: 29466
+        # 密码
+        password: miaxis110
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+
+# 短信验证
+sms_user_name: "jsjp"
+sms_password: "t7nwh7"
+
+
+
+# 调用外部接口
+feign:
+    jgpt_ipport: http://localhost:8080/
+    qgpt_ipport: http://114.55.58.112:8085/
+
+# 微信小程序
+app:
+    appid: wx8f43db501343feab
+    secret: 3509a81880669ffa6fa554b2aa050351
+
+# 极速云助手微信公众号
+gzh:
+    appid: wxff332e2f6da86bf9
+    secret: 65f267dcb2e387f7caf651a80a118253
+
+# 腾讯cos
+cos:
+    secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe
+    secretKey: IK5af8MJzPoKbdQxDCtKWR5T5PSEkyDB
+    bucket: ap-shanghai
+    bucketName: t1-1305573081
+    path: https://t1-1305573081.file.myqcloud.com
+    preffix: t1
+    classId: 843436
+
+
+# 微信支付
+wxpay:
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
+    merchantId: 1608699504
+    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
+    v3key: qqwweerrttyyuuiioopp123456789000
+    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://admin.zzxcx.net/prod-api/open-api/wx/notify/refund
+
+
+# 电影
+film:
+    appKey: 10294472736
+    appSecret: n8qV2tsBKN6JQ4nMtycPa8e7
+    notifyUrl: https://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
+    v1Url: http://movieapi.pintoto.cn/
+    v2Url: http://movieapi2.pintoto.cn/
+
+# 拼多多
+pdd:
+    clientId: "fa0f2debb5b0444b9719919d7b8204d1"
+    clientSecret: "3305b6bb37252495848e67fd991134651e308495"
+    pid: "1642187_203462988"
+
+# 美团联盟
+mei:
+    actId: "2"
+    key: "610077fffb51712efaa686d9ffb623da"
+    secret: "514202a9238958b16cb13805d6f79273"
+    sid: "jsshq001"
+    appId: "wxde8ac0a21135c07d"
+
+# 挖数据平台
+wai:
+    appid: "7629"
+    secret: "cce08fcab10ff96a863892bb6e396a9e"
+
+
+# 福禄平台
+fulu:
+    appKey: "qxTK3W/RNleYH5tygePOu52hoFHpaqCi0eR5yKhHVgYQanIcua5edOG2rgrldHnL"
+    appSecret: "a1be19d04c724c05971942305ea97489"
+    url: "http://openapi.fulu.com"
+    notifyUrl: "https://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"

zzjs-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -2,11 +2,13 @@ package com.miaxis.test;
 
 import com.alibaba.fastjson.JSONObject;
 import com.miaxis.ZzjsApplication;
+import com.miaxis.common.core.domain.entity.TwzdUserInfo;
 import com.miaxis.common.enums.OrderStatusEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.feign.dto.FilmDTO;
 import com.miaxis.feign.dto.FilmMcpData;
 import com.miaxis.feign.dto.FilmXdResult;
+import com.miaxis.twzduser.service.ITwzdIUserInfoService;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.WxNotifyReturnDTO;
 import com.miaxis.wx.dto.WxOrderCreateDTO;
@@ -26,7 +28,7 @@ import java.security.cert.X509Certificate;
 
 import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 
-//@ActiveProfiles("prod")
+@ActiveProfiles("prodTest")
 @SpringBootTest(classes = ZzjsApplication.class)
 @RunWith(SpringRunner.class)
 public class NormalTest {
@@ -36,46 +38,21 @@ public class NormalTest {
     @Autowired
     private IRefundRecordService refundRecordService;
 
-    @Autowired
-    private AutoUpdateCertificatesVerifier verifier;
 
     @Autowired
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
+    private ITwzdIUserInfoService twzdIUserInfoService;
     @Test
     public void test1() throws Exception {
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo("12021060816391765454799220937462");
-        WxNotifyReturnDTO refund = refundRecordService.refund(wxOrder, "12021060816391765454799220937463","商品购买失败");
-        System.out.println(JSONObject.toJSONString(refund));
-//        WxOrder wxOrder1 = wxOrderService.getByOutTradeNo("12021052415260767148145493655617");
-//        refundRecordService.refund(wxOrder1,"12021051815333778448136985596489");
+        WxOrder wxOrder = wxOrderService.getByOutTradeNo("12022020913473284017326528036733");
+        WxNotifyReturnDTO refund = refundRecordService.refund(wxOrder, "12022020913473284017326528036734","商品购买失败退款");
+
     }
 
-    @Test
-    public void test11() throws Exception {
-        threadPoolTaskExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                System.out.println(Thread.currentThread()+"aaa");
-
-            }
-        });
-
-        if (true){
-            System.out.println("低分段");
-            threadPoolTaskExecutor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        System.out.println(Thread.currentThread()+"bbb");
-                    } catch (Exception e) {
-                        throw new CustomException("订单:推送消息失败");
-                    }
-                }
-            });
-
-        }
 
+    @Test
+    public void test2() throws Exception {
+        TwzdUserInfo twzdUserInfo = twzdIUserInfoService.getUserByUnionId("oqEKX6NC9wDu7TEAvQ4zb0Kq3EQ4");
+        System.out.println("11");
     }
 
 

zzjs-common/src/main/java/com/miaxis/common/core/domain/entity/TwzdUserInfo.java

@@ -0,0 +1,116 @@
+package com.miaxis.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户对象 user_info
+ *
+ * @author miaxis
+ * @date 2021-01-11
+ */
+@Data
+@TableName("user_info")
+@ApiModel(value = "UserInfo", description = "用户对象 user_info")
+public class TwzdUserInfo extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    @TableField("phone")
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+
+    /** 微信号码 */
+    @Excel(name = "微信号码")
+    @TableField("wechar")
+    @ApiModelProperty(value = "微信号码")
+    private String wechar;
+
+    /** app头像地址 */
+    @Excel(name = "app头像地址")
+    @TableField("head_image")
+    @ApiModelProperty(value = "app头像地址")
+    private String headImage;
+
+    /** app昵称 */
+    @Excel(name = "app昵称")
+    @TableField("nick_name")
+    @ApiModelProperty(value = "app昵称")
+    private String nickName;
+
+
+    /** 微信openid */
+    @Excel(name = "微信openid")
+    @TableField("openid")
+    @ApiModelProperty(value = "微信openid")
+    private String openid;
+
+
+
+    /** 0 启用 1禁用 */
+    @Excel(name = "0 启用 1禁用")
+    @TableField("status")
+    @ApiModelProperty(value = "0 启用 1禁用")
+    private Integer status;
+
+//    /** 0 否 1是 */
+//    @Excel(name = "是否是vip 0 否 1")
+//    @TableField("is_vip")
+//    @ApiModelProperty(value = "是否是vip 0 否 1是")
+//    private Integer isVip;
+
+
+    /** 驾校班型Id */
+    @Excel(name = "联合id")
+    @TableField("union_id")
+    @ApiModelProperty(value = "联合id")
+    private String unionId;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    @ApiModelProperty(value = "过期时间")
+    private Date expireTime;
+
+
+
+    @ApiModelProperty(value = "销售类型0- 非销售1- 个人销售2- 团队销售")
+    private Integer saleType;
+
+    @ApiModelProperty(value = "所属城市名称")
+    private String cityName;
+
+    @ApiModelProperty(value = "所属区名称")
+    private String areaName;
+
+    @ApiModelProperty(value = "所属驾校名称")
+    private String schoolName;
+
+    @ApiModelProperty(value = "直接收益金额,单位分")
+    private Integer profitPrice;
+
+
+    @ApiModelProperty(value = "未结算推广积分")
+    private Integer achievement;
+
+    @ApiModelProperty(value = "已结算推广积分")
+    private Integer achievementSettled;
+
+
+}

zzjs-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -87,6 +87,12 @@ public class UserInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "微信openid")
     private String openid;
 
+    /** 微信openid */
+    @Excel(name = "unionid")
+    @TableField("union_id")
+    @ApiModelProperty(value = "微信openid")
+    private String unionId;
+
     /** 业务类型  0:初领 1:增领 9:其他 */
     @Excel(name = "业务类型  0:初领 1:增领 9:其他")
     @TableField("busitype")

zzjs-service/src/main/java/com/miaxis/feign/dto/WxResult.java → zzjs-common/src/main/java/com/miaxis/common/core/domain/entity/WxResult.java

@@ -1,4 +1,4 @@
-package com.miaxis.feign.dto;
+package com.miaxis.common.core.domain.entity;
 
 
 import lombok.Data;

zzjs-framework/src/main/java/com/miaxis/framework/web/service/SysLoginService.java

@@ -1,6 +1,7 @@
 package com.miaxis.framework.web.service;
 
 import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.entity.WxResult;
 import com.miaxis.common.core.domain.model.LoginUser;
 import com.miaxis.common.core.redis.RedisCache;
 import com.miaxis.common.enums.StudentLoginTypeEnum;
@@ -89,17 +90,18 @@ public class SysLoginService
     /**
      * 学员登录验证
      *
-     * @param principal 主体  可以是用户名,电话号码，openid等
+     * @param
      * @param credential 密码或者验证码
      * @param loginType 登录类型 1 学员用户名密码登录 2 学员手机验证码登录
      * @return 结果
      */
-    public String login(String principal, String credential, String loginType) {
+    public String login(WxResult wxResult, String credential, String loginType) {
 
         ServletUtils.getRequest().setAttribute("loginType",loginType);
+        ServletUtils.getRequest().setAttribute("unionid",wxResult.getUnionid());
         // 用户验证
         if (StudentLoginTypeEnum.OPENID_LOGIN.getCode().equals(loginType)){
-            return authenticate(principal,new OpenIdAuthenticationToken(principal));
+            return authenticate(wxResult.getOpenid(),new OpenIdAuthenticationToken(wxResult.getOpenid()));
         }
         else{
             throw new CustomException("loginType参数错误");

zzjs-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -72,7 +72,11 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setHeadImage(configService.selectConfigByKey("xcx_user_image"));
                     userInfo.setNickName("用户未授权_"+RandomNameUtils.generateName());
                     userInfo.setOpenid(identification);
+                    userInfo.setUnionId((String) ServletUtils.getRequest().getAttribute("unionid"));
                     userService.saveUserInfo(userInfo);
+                }else {
+                    userInfo.setUnionId((String) ServletUtils.getRequest().getAttribute("unionid"));
+                    userService.updateStudent(userInfo);
                 }
                 return createLoginUser(userInfo);
             }

zzjs-service/src/main/java/com/miaxis/feign/service/IWxService.java

@@ -1,9 +1,7 @@
 package com.miaxis.feign.service;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.WxResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;

zzjs-service/src/main/java/com/miaxis/teachingVideo/mapper/TeachingVideoInfoMapper.java

@@ -53,4 +53,6 @@ public interface TeachingVideoInfoMapper extends BaseMapper<TeachingVideoInfo> {
      * @return
      */
     List<TeachingVideoInfoAppletVo> getTeachingVideoByTypeId(Long typeId);
+
+    List<TeachingVideoInfoAppletVo> selectTeachingVideoInfoListByType();
 }

zzjs-service/src/main/java/com/miaxis/twzduser/mapper/TwzdUserInfoMapper.java

@@ -0,0 +1,16 @@
+package com.miaxis.twzduser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.common.core.domain.entity.TwzdUserInfo;
+import com.miaxis.common.core.domain.entity.UserInfo;
+
+/**
+ * 用户Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+public interface TwzdUserInfoMapper extends BaseMapper<UserInfo> {
+
+    TwzdUserInfo getUserByUnionId(String unionId);
+}

zzjs-service/src/main/java/com/miaxis/twzduser/service/ITwzdIUserInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.twzduser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.common.core.domain.entity.TwzdUserInfo;
+
+/**
+ * 用户Service接口
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+public interface ITwzdIUserInfoService {
+    /**
+     * 查询用户列表
+     *
+     * @param  unionId
+     * @return 用户集合
+     */
+    public TwzdUserInfo getUserByUnionId(String unionId);
+
+}

zzjs-service/src/main/java/com/miaxis/twzduser/service/impl/TwzdIUserInfoServiceImpl.java

@@ -0,0 +1,37 @@
+package com.miaxis.twzduser.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataSource;
+import com.miaxis.common.core.domain.entity.TwzdUserInfo;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.enums.DataSourceTypeEnum;
+import com.miaxis.twzduser.mapper.TwzdUserInfoMapper;
+import com.miaxis.twzduser.service.ITwzdIUserInfoService;
+import com.miaxis.user.mapper.UserInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * 用户Service业务层处理
+ *
+ * @author miaxis
+ * @date 2021-08-18
+ */
+@Service
+@DataSource(value = DataSourceTypeEnum.NEWGZPT)
+public class TwzdIUserInfoServiceImpl implements ITwzdIUserInfoService {
+    @Autowired
+    private TwzdUserInfoMapper userInfoMapper;
+
+
+
+    @Override
+    public TwzdUserInfo getUserByUnionId(String unionId) {
+        return userInfoMapper.getUserByUnionId(unionId);
+    }
+}

zzjs-service/src/main/java/com/miaxis/twzduser/vo/UserVipInfoVO.java

@@ -0,0 +1,27 @@
+package com.miaxis.twzduser.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class UserVipInfoVO {
+
+
+
+    /** 微信openid */
+    @ApiModelProperty(value = "微信openid")
+    private String openid;
+
+    /** 0 否 1是 */
+
+    @ApiModelProperty(value = "是否是vip 0 否 1是")
+    private Integer isVip;
+
+
+
+    @ApiModelProperty(value = "签名")
+    private String sign;
+
+
+}

zzjs-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -197,7 +197,6 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         JSONObject  data = jsonObject.getJSONObject("data");
         JSONObject  discountRule = data.getJSONObject("discountRule");
         JSONArray list = data.getJSONArray("list");
-        log.info(list.toJSONString());
         List<CinemaData> cinemaData = list.toJavaList(CinemaData.class);
         List<CinemaData> listdata = cinemaData.stream().filter(a -> showId.equals(a.getShowId())).collect(Collectors.toList());
         CinemaData realCinemaData = listdata.get(0);
@@ -210,6 +209,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
             String film_discount = configService.selectConfigByKey("film_discount");
             Double  chosenDiscount = netPrice >3900 ? upDiscountRate:downDiscountRate;
             Double aDouble = Double.valueOf(film_discount);
+            log.info("upDiscountRate值:"+upDiscountRate+",downDiscountRate值:"+downDiscountRate+",film_discount值:"+aDouble);
             Double dDouble = netPrice * chosenDiscount * aDouble;
             realValue = dDouble.intValue();
         }else if (ticketType == 2){

zzjs-service/src/main/resources/mapper/teachingVideo/TeachingVideoInfoMapper.xml

@@ -162,5 +162,26 @@
           AND vi.`status` = 0
           order by sort
     </select>
+    <select id="selectTeachingVideoInfoListByType" resultType="com.miaxis.teachingVideo.vo.TeachingVideoInfoAppletVo">
+        select
+            vi.id,
+            vi.title,
+            vi.video_describe,
+            vi.video_duration,
+            vi.video_size,
+            vti.pid,
+            vi.teaching_video_type_id,
+            f1.file_url as fileUrl,
+            f2.file_url as coverFileUrl
+        from teaching_video_info vi
+                 LEFT JOIN file_info f1 on f1.file_id = vi.file_id
+                 LEFT JOIN file_info f2 on f2.file_id = vi.cover_file_id
+                 LEFT JOIN teaching_video_type_info vti ON vti.id = vi.teaching_video_type_id
+        WHERE
+            vi.teaching_video_type_id = #{videoTypeId}
+          AND vi.`shelf_status` = 0
+          AND vi.`status` = 0
+          order by sort
+    </select>
 
-</mapper>
+</mapper>

zzjs-service/src/main/resources/mapper/user/TwzdUserInfoMapper.xml

@@ -0,0 +1,13 @@
+<?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="com.miaxis.twzduser.mapper.TwzdUserInfoMapper">
+<select id="getUserByUnionId"  resultType="com.miaxis.common.core.domain.entity.TwzdUserInfo">
+    select * from user_info where union_id =#{unionId}
+
+
+</select>
+
+
+</mapper>

zzjs-system/src/main/java/com/miaxis/system/dto/system/TokenDTO.java

@@ -1,5 +1,6 @@
 package com.miaxis.system.dto.system;
 
+import com.miaxis.common.core.domain.entity.TwzdUserInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,4 +17,6 @@ public class TokenDTO {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "令牌")
     private String token;
+    @ApiModelProperty(value = "金牌车教用户信息")
+    private TwzdUserInfo jpcjUserInfo;
 }

zzjs-system/src/main/java/com/miaxis/system/mapper/SysUserMapper.java

@@ -116,4 +116,6 @@ public interface SysUserMapper
     UserInfo getStudentByName(String username);
 
     void saveUserInfo(UserInfo userInfo);
+
+    void updateStudent(UserInfo userInfo);
 }

zzjs-system/src/main/java/com/miaxis/system/service/ISysUserService.java

@@ -176,4 +176,6 @@ public interface ISysUserService
 
 
     void saveUserInfo(UserInfo userInfo);
+
+    void updateStudent(UserInfo userInfo);
 }

zzjs-system/src/main/java/com/miaxis/system/service/impl/SysUserServiceImpl.java

@@ -462,4 +462,9 @@ public class SysUserServiceImpl implements ISysUserService
     public void saveUserInfo(UserInfo userInfo) {
         userMapper.saveUserInfo(userInfo);
     }
+
+    @Override
+    public void updateStudent(UserInfo userInfo) {
+        userMapper.updateStudent(userInfo);
+    }
 }

zzjs-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -99,7 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where name = #{name}
 	</select>
 	<insert id="saveUserInfo" parameterType="com.miaxis.common.core.domain.entity.UserInfo" >
-		insert into user_info (head_image,nick_name,openid) values (#{headImage},#{nickName},#{openid})
+		insert into user_info (head_image,nick_name,openid,union_id) values (#{headImage},#{nickName},#{openid},#{unionId})
+	</insert>
+	<insert id="updateStudent" parameterType="com.miaxis.common.core.domain.entity.UserInfo" >
+		update user_info set union_id = #{unionId} where openid = #{openid}
 	</insert>