新套餐修改

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptDictDataController.java

@@ -5,21 +5,16 @@ import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysDictData;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.newgzpt.domain.GzptUserInfo;
-import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
-import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.system.service.ISysConfigService;
-import com.miaxis.system.service.ISysDictDataService;
 import com.miaxis.system.service.ISysDictTypeService;
-import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptUserInfoController.java

@@ -10,7 +10,6 @@ import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
-import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +30,6 @@ public class GzptUserInfoController extends BaseController {
     @Autowired
     private IGzptUserInfoService gzptUserInfoService;
 
-    @Autowired
-    private IUserInfoService userInfoService;
 
 
     /**
@@ -59,7 +56,6 @@ public class GzptUserInfoController extends BaseController {
         //绑定用户与学员关系
         UserInfo student = SecurityUtils.getLoginUser().getStudent();
         student.setGzptUserId(gzptUserInfo.getId());
-        userInfoService.updateById(student);
         return Response.success();
     }
 }

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptVideoVipController.java

@@ -33,7 +33,7 @@ import java.util.Date;
  * @since 2021-03-09
  */
 @RestController
-@Api(tags = "【app-学员视频VIP信息】")
+@Api(tags = "【app-学员视频VIP信息(旧版本)】")
 @RequestMapping(Constants.OPEN_PREFIX+"/gzpt/videoVip")
 public class GzptVideoVipController extends BaseController {
 

jsjp-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -1,57 +0,0 @@
-package com.miaxis.app.controller.user;
-
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.common.utils.StringUtils;
-import com.miaxis.user.dto.UserInfoUpdateDto;
-import com.miaxis.user.service.IUserInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【用户信息】Controller
- *
- * @author wwl
- * @date 2020-12-23
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/user/info")
-@Api(tags={"【小程序-普通用户信息】"})
-public class UserInfoController extends BaseController{
-
-    @Autowired
-    private IUserInfoService userInfoService;
-
-    /**
-     * 修改用户信息
-     */
-    @PostMapping
-    @ApiOperation("修改用户信息")
-    public Response edit(@RequestBody UserInfoUpdateDto userInfoUpdateDto){
-
-        UserInfo userInfo= SecurityUtils.getLoginUser().getStudent();
-        if (userInfo!= null){
-            if (!StringUtils.isEmpty(userInfoUpdateDto.getHeadImage())){
-                userInfo.setHeadImage(userInfoUpdateDto.getHeadImage());
-            }
-            if (!StringUtils.isEmpty(userInfoUpdateDto.getNickName())){
-                userInfo.setNickName(userInfoUpdateDto.getNickName());
-            }
-        }
-        //更新数据库
-        userInfoService.updateById(userInfo);
-        return Response.success("更新成功");
-    }
-
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/userInfo/UserVipController.java

@@ -0,0 +1,131 @@
+package com.miaxis.app.controller.userInfo;
+
+import com.miaxis.common.constant.Constants;
+
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.*;
+
+import com.miaxis.newgzpt.domain.GzptVideoVip;
+import com.miaxis.newgzpt.vo.GzptVideoVipVO;
+import com.miaxis.userInfo.dto.UserVipDTO;
+import com.miaxis.userInfo.vo.UserVipVO;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.service.IUserVipService;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【会员信息】Controller
+ *
+ * @author miaxis
+ * @date 2022-06-02
+ */
+@RestController
+@RequestMapping(Constants.OPEN_PREFIX + "/userInfo/vip")
+@Api(tags = {"【app-会员信息】"})
+public class UserVipController extends BaseController {
+    @Autowired
+    private IUserVipService userVipService;
+
+    private String rsaPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMLNHTgsyYOXDJVF8r4qCyb+8Uw4" +
+            "XKq8aThAhUIaPYIop+HJxETGbXk3e0o46i4iOX8RTv0i3jmhL6W0mSxy9ismfXPP7VtKgEt6VnMm" +
+            "ufsrQ2kcXyRsKmuwUd3rTH5gniXwLdIPF8V5ujiSq94nPHok1krDMWbss8Q7lcH2kQFHAgMBAAEC" +
+            "gYBh6Eu2TzRdMg79+7EciO8gA2Tt5SoWGipcPnl7lsqxX5O5dPpzgrPFB/CshlyVIVh6mA12Rw8g" +
+            "MfZLt7CA2asFdgGHfgCvMjsCnL2U1Nf1QFnsnGXmFXeVUvdy7XPILi75rVyOEAw+/f3KzjSA7B3w" +
+            "URE8M2QlIUcjm8LLyCVC4QJBAO+taJH7pVZGVn2upsOk14X08QU0lsQ7ufe/8VXe+IujwGMh34U6" +
+            "BHGV7grodtA7TvQ3mDggQLHB2+IxBWdDCrcCQQDQEVMI+CD7afEyN9rK/MAJwevtxNaTyEd1bhKw" +
+            "t6WKr1YbAdUz2gvnpCQjD1Gqt5yXHKu279msX9W4euXePG3xAkBUCYZn4UdIp+L9sHZSlQLoukik" +
+            "HZtbdOGw58Ez7blSJPl5CNB5wyz5sqtDcdzvCEyXvsKFs3FbonB5r9yIJ26jAkEAugGC1dXcxmWj" +
+            "dl1wf18M3qw6GkmJ+ntlRpmso8bJev3cYDB3RO99DQw0MhOT0qZqmrzK1bP+SJc0HMPhk5c6QQJA" +
+            "WRLIxmeM/P9X2mDjMrI46Wnn27QoKGgYSHdPxmLD0y7NUytf5HyCsY2vhA9FZcnikibax7SwzC/B" +
+            "D7yOXFAy/Q==";
+
+
+    /**
+     * 获取会员信息详细信息
+     *
+     * @return
+     */
+    @GetMapping(value = "/{userId}")
+    @ApiOperation("获取会员信息详细信息")
+    public Response<UserVipVO> getUserInfoByUserId(
+            @ApiParam(name = "userId", value = "会员信息参数", required = true)
+            @PathVariable("userId") Long userId
+    ) throws Exception {
+        UserVip userVip = userVipService.getUserVipByUserId(userId);
+        UserVipVO vo = new UserVipVO();
+        if (userVip != null) {
+            BeanUtils.copyProperties(userVip, vo);
+            String sign = getSign(vo.getUserId(),vo.getSubject1(), vo.getSubject2(), vo.getSubject3(),vo.getSubject4());
+            vo.setSign(sign);
+            return Response.success(vo);
+        } else {
+            return Response.success(vo);
+        }
+    }
+
+
+    /**
+     * 删除会员信息
+     */
+    @Log(title = "会员信息", businessType = BusinessTypeEnum.DELETE)
+    @DeleteMapping("/{userId}")
+    @ApiOperation("删除会员信息")
+    public Response<Integer> removeByUserId(
+            @ApiParam(name = "userId", value = "会员信息ids参数", required = true)
+            @PathVariable Long userId
+    ) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("user_id", userId);
+        return toResponse(userVipService.removeByMap(map) ? 1 : 0);
+    }
+
+
+    private String getSign(Long userId, Date subject1, Date subject2, Date subject3, Date subject4) throws Exception {
+        String str = userId + "";
+        // System.out.println(userId);
+
+        if (subject1 != null) {
+            str += subject1.getTime() + "";
+        }
+        if (subject2 != null) {
+            str += subject2.getTime() + "";
+        }
+        if (subject3 != null) {
+            str += subject3.getTime() + "";
+        }
+        if (subject4 != null) {
+            str += subject4.getTime() + "";
+        }
+        System.out.println("str：" + str);
+        // 进行签名服务
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+        PrivateKey privateKey = kf.generatePrivate(new PKCS8EncodedKeySpec(Base64.getDecoder().decode(rsaPrivateKey)));
+        signature.initSign(privateKey);
+        signature.update(str.getBytes("UTF-8"));
+        byte[] signedData = signature.sign();
+        return Base64.getEncoder().encodeToString(signedData);
+
+    }
+
+}

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

@@ -6,17 +6,18 @@ import com.miaxis.common.config.WxpayConfig;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.AesUtil;
-import com.miaxis.common.utils.DateUtils;
-import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.domain.GzptVideoVip;
 import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.newgzpt.service.IGzptVideoVipService;
-import com.miaxis.system.service.ISysUserService;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.service.IUserVipService;
 import com.miaxis.wx.domain.RefundRecord;
 import com.miaxis.wx.domain.WxJsOrder;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.dto.*;
+import com.miaxis.wx.dto.WxNotifyReturnDTO;
+import com.miaxis.wx.dto.WxpayNotifyDTO;
 import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxJsOrderService;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
@@ -27,7 +28,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -68,6 +68,13 @@ public class WxNotifyController {
 
     @Autowired
     private IGzptVideoVipService videoVipService;
+
+    @Autowired
+    private IOrderInfoService orderInfoService;
+
+    @Autowired
+    private IUserVipService userVipService;
+
     /**
      * 微信支付回调接口
      */
@@ -274,8 +281,20 @@ public class WxNotifyController {
         wxJsOrder.setOrderStatus("2");
 
         //插入VIP信息
-        writeVipDataToDb(wxJsOrder);
+        writeVipDataToDb2(wxJsOrder);
         wxJsOrderService.updateById(wxJsOrder);
+
+        //插入订单主表
+        OrderInfo orderInfo = new OrderInfo();
+        orderInfo.setGoodsName(wxJsOrder.getGoodsName());
+        orderInfo.setUserId(wxJsOrder.getUserId());
+        orderInfo.setOutTradeNo(wxJsOrder.getOutTradeNo());
+        orderInfo.setTradeType(1);
+        orderInfo.setSuccessTime(wxJsOrder.getSuccessTime());
+        orderInfo.setPayType(1);
+        orderInfo.setCreateTime(new Date());
+        orderInfoService.save(orderInfo);
+
     }
 
 
@@ -398,6 +417,211 @@ public class WxNotifyController {
         }
     }
 
+
+
+    @Transactional
+    public void writeVipDataToDb2(WxJsOrder wxJsOrder) {
+        long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
+        Date now = new Date();
+
+        if ("科一专项VIP".equals(wxJsOrder.getGoodsName())) {
+            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+            if (userVip != null) {
+                //修改会员信息
+                Date km1Date = userVip.getSubject1();
+                if (km1Date != null) {  //存在会员时间
+                    if (km1Date.compareTo(now) < 0) {  //会员已过期
+                        long x = now.getTime() + oneYearLong;
+                        Date km1oneYear = new Date(x);
+                        userVip.setSubject1(km1oneYear);
+                        userVipService.updateById(userVip);
+                    } else {  //会员时间延长
+                        long x = km1Date.getTime() + oneYearLong;
+                        Date km1oneYear = new Date(x);
+                        userVip.setSubject1(km1oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km1oneYear = new Date(x);
+                    userVip.setSubject1(km1oneYear);
+                    userVipService.updateById(userVip);
+                }
+            } else {
+                //新增会员信息
+                UserVip uv = new UserVip();
+                uv.setUserId(wxJsOrder.getUserId());
+                uv.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date km1oneYear = new Date(x);
+                uv.setSubject1(km1oneYear);
+                userVipService.save(uv);
+            }
+
+        } else if ("科二专项VIP".equals(wxJsOrder.getGoodsName())) {
+            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+            if (userVip != null) {
+                //修改会员信息
+                Date km2Date = userVip.getSubject2();
+                if (km2Date != null) {  //存在会员时间
+                    if (km2Date.compareTo(now) < 0) {  //会员已过期
+                        long x = now.getTime() + oneYearLong;
+                        Date km2oneYear = new Date(x);
+                        userVip.setSubject2(km2oneYear);
+                        userVipService.updateById(userVip);
+                    } else {  //会员时间延长
+                        long x = km2Date.getTime() + oneYearLong;
+                        Date km2oneYear = new Date(x);
+                        userVip.setSubject2(km2oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km2oneYear = new Date(x);
+                    userVip.setSubject2(km2oneYear);
+                    userVipService.updateById(userVip);
+                }
+            } else {
+                //新增会员信息
+                UserVip uv = new UserVip();
+                uv.setUserId(wxJsOrder.getUserId());
+                uv.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date km2oneYear = new Date(x);
+                uv.setSubject2(km2oneYear);
+                userVipService.save(uv);
+            }
+        } else if ("科三专项VIP".equals(wxJsOrder.getGoodsName())) {
+            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+            if (userVip != null) {
+                //修改会员信息
+                Date km3Date = userVip.getSubject2();
+                if (km3Date != null) {  //存在会员时间
+                    if (km3Date.compareTo(now) < 0) {  //会员已过期
+                        long x = now.getTime() + oneYearLong;
+                        Date km3oneYear = new Date(x);
+                        userVip.setSubject3(km3oneYear);
+                        userVipService.updateById(userVip);
+                    } else {  //会员时间延长
+                        long x = km3Date.getTime() + oneYearLong;
+                        Date km3oneYear = new Date(x);
+                        userVip.setSubject3(km3oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    userVip.setSubject3(km3oneYear);
+                    userVipService.updateById(userVip);
+                }
+            } else {
+                //新增会员信息
+                UserVip uv = new UserVip();
+                uv.setUserId(wxJsOrder.getUserId());
+                uv.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date km3oneYear = new Date(x);
+                uv.setSubject3(km3oneYear);
+                userVipService.save(uv);
+            }
+
+        } else if ("科四专项VIP".equals(wxJsOrder.getGoodsName())) {
+            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+            if (userVip != null) {
+                //修改会员信息
+                Date km4Date = userVip.getSubject2();
+                if (km4Date != null) {  //存在会员时间
+                    if (km4Date.compareTo(now) < 0) {  //会员已过期
+                        long x = now.getTime() + oneYearLong;
+                        Date km4oneYear = new Date(x);
+                        userVip.setSubject4(km4oneYear);
+                        userVipService.updateById(userVip);
+                    } else {  //会员时间延长
+                        long x = km4Date.getTime() + oneYearLong;
+                        Date km4oneYear = new Date(x);
+                        userVip.setSubject4(km4oneYear);
+                        userVipService.updateById(userVip);
+                    }
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km4oneYear = new Date(x);
+                    userVip.setSubject4(km4oneYear);
+                    userVipService.updateById(userVip);
+                }
+            } else {
+                //新增会员信息
+                UserVip uv = new UserVip();
+                uv.setUserId(wxJsOrder.getUserId());
+                uv.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date km4oneYear = new Date(x);
+                uv.setSubject4(km4oneYear);
+                userVipService.save(uv);
+            }
+
+        }   else if ("科目一二三四所有付费权益".equals(wxJsOrder.getGoodsName())) {
+            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
+            if(userVip!=null) {
+                //修改会员信息
+                Date km1Date = userVip.getSubject1();
+                Date km2Date = userVip.getSubject2();
+                Date km3Date = userVip.getSubject3();
+                Date km4Date = userVip.getSubject4();
+                if(km1Date!=null) { //科目一处理
+                    long x = km1Date.getTime() + oneYearLong;
+                    Date km1oneYear = new Date(x);
+                    userVip.setSubject1(km1oneYear);
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km1oneYear = new Date(x);
+                    userVip.setSubject1(km1oneYear);
+                }
+                if(km2Date!=null) { //科目二处理
+                    long x = km2Date.getTime() + oneYearLong;
+                    Date km2oneYear = new Date(x);
+                    userVip.setSubject2(km2oneYear);
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km2oneYear = new Date(x);
+                    userVip.setSubject2(km2oneYear);
+                }
+                if(km3Date!=null) { //科目三处理
+                    long x = km3Date.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    userVip.setSubject3(km3oneYear);
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    userVip.setSubject3(km3oneYear);
+                }
+                if(km4Date!=null) { //科目四处理
+                    long x = km4Date.getTime() + oneYearLong;
+                    Date km4oneYear = new Date(x);
+                    userVip.setSubject4(km4oneYear);
+                } else {
+                    long x = now.getTime() + oneYearLong;
+                    Date km4oneYear = new Date(x);
+                    userVip.setSubject4(km4oneYear);
+                }
+                userVipService.updateById(userVip);
+            } else {
+                //新增会员信息
+                UserVip uv = new UserVip();
+                uv.setUserId(wxJsOrder.getUserId());
+                uv.setUserName(wxJsOrder.getUserName());
+                long x = now.getTime() + oneYearLong;
+                Date oneYear = new Date(x);
+                uv.setSubject1(oneYear);
+                uv.setSubject2(oneYear);
+                uv.setSubject3(oneYear);
+                uv.setSubject4(oneYear);
+                userVipService.updateById(uv);
+            }
+        }
+    }
+
+
+
     private String getSourString(WxpayNotifyDTO wxpayNotifyDTO) throws GeneralSecurityException, IOException {
         AesUtil aesUtil = new AesUtil(wxpayConfig.getV3key().getBytes());
         WxpayNotifyDTO.WxpaySource wxpaySource = wxpayNotifyDTO.getResource();

jsjp-admin/src/main/java/com/miaxis/pc/controller/carousel/HomePageDataInfoController.java

@@ -1,111 +0,0 @@
-package com.miaxis.pc.controller.carousel;
-
-import com.miaxis.carousel.domain.HomePageDataInfo;
-import com.miaxis.carousel.service.IHomePageDataInfoService;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【首页数据】Controller
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/pc/homePage")
-@Api(tags={"【pc-首页数据】"})
-public class HomePageDataInfoController extends BaseController{
-
-    private final IHomePageDataInfoService homePageDataInfoService;
-
-    /**
-     * 查询首页数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('carousel:carousel:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询首页数据列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<HomePageDataInfoVo> list(@ModelAttribute HomePageDataInfo homePageDataInfo){
-        startPage();
-        List<HomePageDataInfoVo> list = homePageDataInfoService.selectHomePageDataInfoList(homePageDataInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 新增首页数据
-     */
-    @PreAuthorize("@ss.hasPermi('carousel:carousel:add')")
-    @Log(title = "首页数据", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增首页数据")
-    public Response add(@RequestBody HomePageDataInfo homePageDataInfo){
-
-        return homePageDataInfoService.saveHomePageDataInfo(homePageDataInfo);
-    }
-
-    /**
-     * 获取首页数据详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('carousel:carousel:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取首页数据详细信息")
-    public Response<HomePageDataInfoVo> getHomePageDataInfo(
-            @ApiParam(name = "id", value = "首页数据id", required = true)
-            @PathVariable("id") Long id
-    ) {
-        return homePageDataInfoService.getHomePageDataById(id);
-    }
-
-    /**
-     * 修改首页数据
-     */
-    @PreAuthorize("@ss.hasPermi('carousel:carousel:edit')")
-    @Log(title = "首页数据", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改首页数据")
-    public Response<Integer> edit(@RequestBody HomePageDataInfo homePageDataInfo) {
-        return homePageDataInfoService.updateHomePageDataInfoById(homePageDataInfo);
-    }
-
-
-    /**
-     * 删除首页数据(伪删除)
-     */
-    @PreAuthorize("@ss.hasPermi('carousel:carousel:remove')")
-    @Log(title = "首页数据", businessType = BusinessTypeEnum.UPDATE)
-	@PutMapping("/{ids}")
-    @ApiOperation("删除首页数据")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "首页数据ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return homePageDataInfoService.removeCarouselByIds(ids);
-    }
-
-    /**
-     * 同步全部数据 数据库->缓存
-     */
-    @Log(title = "首页数据", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/synchro")
-    @ApiOperation("同步数据")
-    public Response synchroData(){
-        return homePageDataInfoService.synchroData();
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/fulu/FuluCommodityInfoController.java

@@ -1,99 +0,0 @@
-package com.miaxis.pc.controller.fulu;
-
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.fulu.domain.FuluCommodityInfo;
-import com.miaxis.fulu.service.IFuluCommodityInfoService;
-import com.miaxis.fulu.vo.FuluCommodityInfoVo;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【福禄商品】Controller
- * @author wwl
- * @version 1.0
- * @date 2021/6/24 15:50
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/pc/fulu")
-@Api(tags={"【pc-福禄商品】"})
-public class FuluCommodityInfoController extends BaseController {
-
-    private final IFuluCommodityInfoService fuluCommodityInfoService;
-
-    /**
-     * 查询福禄商品列表
-     */
-    @PreAuthorize("@ss.hasPermi('fulu:info:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询福禄商品列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<FuluCommodityInfoVo> list(@ModelAttribute FuluCommodityInfo fuluCommodityInfo){
-        startPage();
-        List<FuluCommodityInfoVo> list = fuluCommodityInfoService.selectFuluCommodityInfoList(fuluCommodityInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取福禄商品详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('fulu:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取福禄商品详细信息")
-    public Response<FuluCommodityInfoVo> getFuLuById(
-            @ApiParam(name = "id", value = "福禄商品参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return fuluCommodityInfoService.getFuLuById(id);
-    }
-
-    /**
-     * 新增福禄商品
-     */
-    @PreAuthorize("@ss.hasPermi('fulu:info:add')")
-    @Log(title = "福禄商品", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增福禄商品")
-    public Response<Integer> add(@RequestBody FuluCommodityInfo fuluCommodityInfo){
-        return toResponse(fuluCommodityInfoService.save(fuluCommodityInfo) ? 1 : 0);
-    }
-
-    /**
-     * 修改福禄商品
-     */
-    @PreAuthorize("@ss.hasPermi('fulu:info:edit')")
-    @Log(title = "福禄商品", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改福禄商品")
-    public Response<Integer> edit(@RequestBody FuluCommodityInfo fuluCommodityInfo){
-        return toResponse(fuluCommodityInfoService.updateById(fuluCommodityInfo) ? 1 : 0);
-    }
-
-
-    /**
-     * 删除福禄商品（伪删除）
-     */
-    @PreAuthorize("@ss.hasPermi('fulu:info:remove')")
-    @Log(title = "福禄商品", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除福禄商品")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "福禄商品ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return fuluCommodityInfoService.removeFuLuByIds(ids);
-    }
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/order/WxJsOrderController.java

@@ -1,122 +0,0 @@
-package com.miaxis.pc.controller.order;
-
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.OrderCodeFactory;
-import com.miaxis.wx.domain.WxJsOrder;
-import com.miaxis.wx.dto.WxJsOrderOutTradeNoDTO;
-import com.miaxis.wx.dto.WxNotifyReturnDTO;
-import com.miaxis.wx.service.IRefundRecordService;
-import com.miaxis.wx.service.IWxJsOrderService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【订单】Controller
- *
- * @author miaxis
- * @date 2022-03-25
- */
-@RestController
-@RequestMapping("/order/info")
-@Api(tags={"【PC-订单】"})
-public class WxJsOrderController extends BaseController{
-    @Autowired
-    private IWxJsOrderService wxJsOrderService;
-
-    @Autowired
-    private IRefundRecordService refundRecordService;
-
-    /**
-     * 查询订单列表
-     */
-
-    @PreAuthorize("@ss.hasPermi('order:info:query')")
-    @GetMapping("/list")
-    @ApiOperation("查询订单列表")
-        @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<WxJsOrder> list(@ModelAttribute WxJsOrder wxJsOrder){
-        startPage();
-        List<WxJsOrder> list = wxJsOrderService.selectWxJsOrderList(wxJsOrder);
-        return toResponsePageInfo(list);
-    }
-
-
-
-
-
-    /**
-     * 获取订单详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('order:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取订单详细信息")
-    public Response<WxJsOrder> getInfo(
-            @ApiParam(name = "id", value = "订单参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(wxJsOrderService.getById(id));
-    }
-
-    /**
-     * 新增订单
-     */
-    @PreAuthorize("@ss.hasPermi('order:info:add')")
-    @Log(title = "订单", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增订单")
-    public Response<Integer> add(@RequestBody WxJsOrder wxJsOrder){
-        return toResponse(wxJsOrderService.save(wxJsOrder) ? 1 : 0);
-    }
-
-    /**
-     * 修改订单
-     */
-    @PreAuthorize("@ss.hasPermi('order:info:edit')")
-    @Log(title = "订单", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改订单")
-    public Response<Integer> edit(@RequestBody WxJsOrder wxJsOrder){
-        return toResponse(wxJsOrderService.updateById(wxJsOrder) ? 1 : 0);
-    }
-
-    /**
-     * 删除订单
-     */
-    @PreAuthorize("@ss.hasPermi('order:info:remove')")
-    @Log(title = "订单", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除订单")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "订单ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(wxJsOrderService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-
-
-    /**
-     * 订单退款
-     */
-    @PreAuthorize("@ss.hasPermi('order:info:refund')")
-    @Log(title = "订单", businessType = BusinessTypeEnum.UPDATE)
-    @PostMapping("/refund")
-    @ApiOperation("订单退款")
-    public Response<WxNotifyReturnDTO> refund(@RequestBody WxJsOrderOutTradeNoDTO wxJsOrderOutTradeNoDTO) throws Exception {
-        WxJsOrder wxJsOrder = wxJsOrderService.getByOutTradeNo(wxJsOrderOutTradeNoDTO.getOutTradeNo());
-        WxNotifyReturnDTO wxNotifyReturnDTO = refundRecordService.refund(wxJsOrder, OrderCodeFactory.getOrderCode(null), wxJsOrderOutTradeNoDTO.getReason());
-        return Response.success(wxNotifyReturnDTO);
-    }
-
-}

jsjp-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java

@@ -1,20 +1,15 @@
 package com.miaxis.system.controller.common;
 
-import com.miaxis.common.annotation.Log;
 import com.miaxis.common.config.MiaxisConfig;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.enums.BusinessTypeEnum;
 import com.miaxis.common.enums.FileUploadTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.EnumUtils;
 import com.miaxis.common.utils.StringUtils;
 import com.miaxis.common.utils.VodSignature;
 import com.miaxis.common.utils.file.FileUtils;
-import com.miaxis.file.domain.FileInfo;
-import com.miaxis.file.service.IFileInfoService;
 import com.qcloud.cos.COSClient;
-import com.qcloud.cos.model.PutObjectRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,16 +18,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.util.Calendar;
 
 /**
  * 通用请求处理
@@ -45,8 +36,6 @@ public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
-    @Autowired
-    private IFileInfoService fileInfoService;
 
 
     @Resource
@@ -65,62 +54,6 @@ public class CommonController
 
 
 
-    /**
-     * 上传文件
-     */
-    @Log(title = "上传文件", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping(Constants.OPEN_PREFIX+"/common/file")
-    @ApiOperation("通用上传请求")
-    public Response<FileInfo> updateload(MultipartFile file,
-                                         @ApiParam(name = "remark", value = "备注，非必传") @RequestParam("remark") String remark,
-                                         @ApiParam(name = "fileType", value = "业务类型:1-商户logo、2-汽车品牌logo、3-学车视频、" +
-                                                 "98-音视频文件、99-其他")
-        @RequestParam("fileType") Integer fileType) throws Exception {
-        FileUploadTypeEnum fileUploadTypeEnum = getPathByType(fileType);
-        String originalFilename = file.getOriginalFilename();
-        //获取最后一个.的位置
-        int lastIndexOf = originalFilename.lastIndexOf(".");
-        //获取文件的后缀名
-        String suffix = originalFilename.substring(lastIndexOf);
-        if (!validateFileSuffix(suffix,fileUploadTypeEnum)){
-            throw new CustomException("文件类型不合法");
-        }
-
-        // bucket的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
-        String bucketName = this.bucketName;
-        // 简单文件上传, 最大支持 5 GB, 适用于小文件上传, 建议 20 M 以下的文件使用该接口
-        // 大文件上传请参照 API 文档高级 API 上传
-        File localFile = null;
-        localFile = File.createTempFile("temp",null);
-        file.transferTo(localFile);
-        Calendar cal = Calendar.getInstance();
-        int year = cal.get(Calendar.YEAR);
-        int month=cal.get(Calendar.MONTH)+ 1;
-        int day=cal.get(Calendar.DATE);
-        //存储的文件名
-        String storagefileName = System.currentTimeMillis() + suffix;
-        // 指定要上传到 COS 上的路径
-        String key = null;
-        if (FileUploadTypeEnum.OTHERS.getCode()!= fileType){
-            key = "/"+this.preffix+"/"+fileUploadTypeEnum.getFileType()+"/"+year+"/"+month+"/"+day+"/"+storagefileName;
-        }else{
-            key = "/"+this.preffix+"/"+fileUploadTypeEnum.getFileType()+"/"+storagefileName;
-        }
-        FileInfo fileInfo = new FileInfo();
-
-        //如果是学车视频 ，则调用vod上传
-        PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, localFile);
-        cosClient.putObject(putObjectRequest);
-        String fileUrl=this.path + putObjectRequest.getKey();
-        fileInfo.setFileType(fileUploadTypeEnum.getFileType());
-        fileInfo.setFilePath(key);
-        fileInfo.setFileUrl(fileUrl);
-        if (!StringUtils.isEmpty(remark)){
-            fileInfo.setRemark(remark);
-        }
-        fileInfoService.save(fileInfo);
-        return Response.success(fileInfo);
-    }
 
 
 

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

@@ -21,7 +21,6 @@ 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.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,8 +57,6 @@ public class SysLoginController
     @Autowired
     private IWxService wxService;
 
-    @Autowired
-    private IUserInfoService userInfoService;
 
     @Value("${app.appid}")
     private String appid;

jsjp-service/src/main/java/com/miaxis/activities/domain/ActivitiesTmall.java

@@ -1,107 +0,0 @@
-package com.miaxis.activities.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import lombok.Data;
-/**
- * 活动-天猫订单对象 activities_tmall
- *
- * @author miaxis
- * @date 2021-06-29
- */
-@Data
-@TableName("activities_tmall")
-@ApiModel(value = "ActivitiesTmall", description = "活动-天猫订单对象 activities_tmall")
-public class ActivitiesTmall extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 天猫订单号 */
-    @Excel(name = "天猫订单号")
-    @TableField("tmall_no")
-    @ApiModelProperty(value = "天猫订单号")
-    private String tmallNo;
-
-    /** 是否被兑换过  0-未兑换 1-已兑换 */
-    @Excel(name = "是否被兑换过  0-未兑换 1-已兑换")
-    @TableField("is_exchange")
-    @ApiModelProperty(value = "是否被兑换过  0-未兑换 1-已兑换")
-    private Integer isExchange;
-
-    /** 兑换时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "兑换时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("exchange_time")
-    @ApiModelProperty(value = "兑换时间")
-    private Date exchangeTime;
-
-    /** 活动类型 1-话费充值 */
-    @Excel(name = "活动类型 1-话费充值")
-    @TableField("activities_type")
-    @ApiModelProperty(value = "活动类型 1-话费充值")
-    private Integer activitiesType;
-
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setTmallNo(String tmallNo){
-        this.tmallNo = tmallNo;
-    }
-
-    public String getTmallNo(){
-        return tmallNo;
-    }
-    public void setIsExchange(Integer isExchange){
-        this.isExchange = isExchange;
-    }
-
-    public Integer getIsExchange(){
-        return isExchange;
-    }
-    public void setExchangeTime(Date exchangeTime){
-        this.exchangeTime = exchangeTime;
-    }
-
-    public Date getExchangeTime(){
-        return exchangeTime;
-    }
-    public void setActivitiesType(Integer activitiesType){
-        this.activitiesType = activitiesType;
-    }
-
-    public Integer getActivitiesType(){
-        return activitiesType;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("tmallNo", getTmallNo())
-            .append("isExchange", getIsExchange())
-            .append("exchangeTime", getExchangeTime())
-            .append("activitiesType", getActivitiesType())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

jsjp-service/src/main/java/com/miaxis/activities/mapper/ActivitiesTmallMapper.java

@@ -1,23 +0,0 @@
-package com.miaxis.activities.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.activities.domain.ActivitiesTmall;
-
-/**
- * 活动-天猫订单Mapper接口
- *
- * @author miaxis
- * @date 2021-06-29
- */
-public interface ActivitiesTmallMapper extends BaseMapper<ActivitiesTmall> {
-    /**
-     * 查询活动-天猫订单列表
-     *
-     * @param activitiesTmall 活动-天猫订单
-     * @return 活动-天猫订单集合
-     */
-    public List<ActivitiesTmall> selectActivitiesTmallList(ActivitiesTmall activitiesTmall);
-
-    ActivitiesTmall getByTmallNoWithPhoneBill(String tmallNo);
-}

jsjp-service/src/main/java/com/miaxis/activities/service/IActivitiesTmallService.java

@@ -1,23 +0,0 @@
-package com.miaxis.activities.service;
-
-import java.util.List;
-import com.miaxis.activities.domain.ActivitiesTmall;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 活动-天猫订单Service接口
- *
- * @author miaxis
- * @date 2021-06-29
- */
-public interface IActivitiesTmallService extends IService<ActivitiesTmall>{
-    /**
-     * 查询活动-天猫订单列表
-     *
-     * @param activitiesTmall 活动-天猫订单
-     * @return 活动-天猫订单集合
-     */
-    public List<ActivitiesTmall> selectActivitiesTmallList(ActivitiesTmall activitiesTmall);
-
-    ActivitiesTmall getByTmallNoWithPhoneBill(String tmallNo);
-}

jsjp-service/src/main/java/com/miaxis/activities/service/impl/ActivitiesTmallServiceImpl.java

@@ -1,41 +0,0 @@
-package com.miaxis.activities.service.impl;
-
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.activities.mapper.ActivitiesTmallMapper;
-import com.miaxis.activities.domain.ActivitiesTmall;
-import com.miaxis.activities.service.IActivitiesTmallService;
-
-/**
- * 活动-天猫订单Service业务层处理
- *
- * @author miaxis
- * @date 2021-06-29
- */
-@Service
-public class ActivitiesTmallServiceImpl extends ServiceImpl<ActivitiesTmallMapper, ActivitiesTmall> implements IActivitiesTmallService {
-    @Autowired
-    private ActivitiesTmallMapper activitiesTmallMapper;
-
-    /**
-     * 查询活动-天猫订单列表
-     *
-     * @param activitiesTmall 活动-天猫订单
-     * @return 活动-天猫订单
-     */
-    @Override
-    public List<ActivitiesTmall> selectActivitiesTmallList(ActivitiesTmall activitiesTmall){
-        return activitiesTmallMapper.selectActivitiesTmallList(activitiesTmall);
-    }
-
-    @Override
-    public ActivitiesTmall getByTmallNoWithPhoneBill(String tmallNo) {
-        return activitiesTmallMapper.getByTmallNoWithPhoneBill(tmallNo);
-    }
-}

jsjp-service/src/main/java/com/miaxis/carousel/domain/HomePageDataInfo.java

@@ -1,65 +0,0 @@
-package com.miaxis.carousel.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-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;
-/**
- * 首页数据表 home_page_data_info
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@TableName("home_page_data_info")
-@ApiModel(value = "HomePageDataInfo", description = "首页数据表 home_page_data_info")
-public class HomePageDataInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 图片名称 */
-    @Excel(name = "图片名称")
-    @TableField("picture_name")
-    @ApiModelProperty(value = "图片名称")
-    private String pictureName;
-
-    /** 图片id--对应file_info的id */
-    @Excel(name = "图片id--对应file_info的id")
-    @TableField("file_id")
-    @ApiModelProperty(value = "图片id--对应file_info的id")
-    private Long fileId;
-
-    @TableField("jump_url")
-    @ApiModelProperty(value = "跳转url")
-    private String jumpUrl;
-
-    @TableField("jump_url_type")
-    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面、goWebView: h5")
-    private String jumpUrlType;
-
-    @ApiModelProperty(value = "权重（数值从大到小）")
-    private Integer weight;
-
-    @TableField("data_type")
-    @ApiModelProperty(value = "类型：carouselChart：轮播图、coupon：优惠劵、menu：首页菜单")
-    private String dataType;
-
-    @TableField("data_describe")
-    @ApiModelProperty(value = "内容描述")
-    private String dataDescribe;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @Excel(name = "状态  0：有效(默认)、1：失效 （伪删除）", readConverterExp = "伪=删除")
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-}

jsjp-service/src/main/java/com/miaxis/carousel/mapper/HomePageDataInfoMapper.java

@@ -1,33 +0,0 @@
-package com.miaxis.carousel.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.carousel.domain.HomePageDataInfo;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 首页数据Mapper接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface HomePageDataInfoMapper extends BaseMapper<HomePageDataInfo> {
-    /**
-     * 查询首页数据列表
-     *
-     * @param homePageDataInfo 首页数据
-     * @return 首页数据集合
-     */
-    List<HomePageDataInfoVo> selectHomePageDataInfoList(HomePageDataInfo homePageDataInfo);
-
-    /**
-     * 获取首页数据详细信息
-     * @param id
-     * @return
-     */
-    HomePageDataInfoVo getHomePageDataById(@Param("id") Long id);
-
-    int updateHomePageDataByPictureName(HomePageDataInfoVo homePageDataInfoVo);
-}

jsjp-service/src/main/java/com/miaxis/carousel/service/IHomePageDataInfoService.java

@@ -1,79 +0,0 @@
-package com.miaxis.carousel.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.carousel.domain.HomePageDataInfo;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import com.miaxis.common.core.domain.Response;
-
-import java.util.List;
-
-/**
- * 首页数据Service接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface IHomePageDataInfoService extends IService<HomePageDataInfo>{
-
-    /**
-     * 查询首页数据列表
-     *
-     * @param homePageDataInfo 首页数据
-     * @return 首页数据集合
-     */
-    List<HomePageDataInfoVo> selectHomePageDataInfoList(HomePageDataInfo homePageDataInfo);
-
-    /**
-     * 新增首页数据
-     * @param homePageDataInfo
-     * @return
-     */
-    Response saveHomePageDataInfo(HomePageDataInfo homePageDataInfo);
-
-    /**
-     * 修改首页数据
-     * @param homePageDataInfo
-     * @return
-     */
-    Response<Integer> updateHomePageDataInfoById(HomePageDataInfo homePageDataInfo);
-
-    /**
-     * 获取首页数据详细信息
-     * @param id
-     * @return
-     */
-    Response<HomePageDataInfoVo> getHomePageDataById(Long id);
-
-
-
-    /**
-     * 删除首页数据(伪删除)
-     * @param ids
-     * @return
-     */
-    Response<Integer> removeCarouselByIds(Long[] ids);
-
-    /**
-     * applet
-     * 获取首页数据列表
-     * @return
-     */
-    Response getHomePageDataList();
-
-    /**
-     * 查询首页数据列表--字典参数
-     * @param dictValues
-     * @return
-     */
-    Response dictValueHomePageDataList(String[] dictValues);
-
-
-    int updateHomePageDataByPictureName(HomePageDataInfoVo homePageDataInfoVo);
-
-    /**
-     * 同步数据
-     * @return
-     */
-    Response synchroData();
-
-}

jsjp-service/src/main/java/com/miaxis/carousel/service/impl/HomePageDataInfoServiceImpl.java

@@ -1,264 +0,0 @@
-package com.miaxis.carousel.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.carousel.domain.HomePageDataInfo;
-import com.miaxis.carousel.mapper.HomePageDataInfoMapper;
-import com.miaxis.carousel.service.IHomePageDataInfoService;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysDictData;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.bean.BeanUtils;
-import com.miaxis.file.domain.FileInfo;
-import com.miaxis.file.service.IFileInfoService;
-import com.miaxis.system.mapper.SysDictDataMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 首页数据Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Service
-@RequiredArgsConstructor
-public class HomePageDataInfoServiceImpl extends ServiceImpl<HomePageDataInfoMapper, HomePageDataInfo> implements IHomePageDataInfoService {
-
-    private final HomePageDataInfoMapper homePageDataInfoMapper;
-
-    private final RedisTemplate redisTemplate;
-
-    private final IFileInfoService fileInfoService;
-
-    private final SysDictDataMapper dictDataMapper;
-
-    /**
-     * 查询首页数据列表
-     *
-     * @param homePageDataInfo 首页数据
-     * @return 首页数据
-     */
-    @Override
-    public List<HomePageDataInfoVo> selectHomePageDataInfoList(HomePageDataInfo homePageDataInfo){
-        return homePageDataInfoMapper.selectHomePageDataInfoList(homePageDataInfo);
-    }
-
-    /**
-     * 新增首页数据
-     * @param homePageDataInfo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response saveHomePageDataInfo(HomePageDataInfo homePageDataInfo) {
-        try{
-            HomePageDataInfo chartInfo = new HomePageDataInfo();
-            BeanUtils.copyProperties(homePageDataInfo,chartInfo);
-            homePageDataInfoMapper.insert(chartInfo);
-            //更新缓存
-            updateHomePageDataRedis(chartInfo);
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    /**
-     * 修改首页数据
-     * @param homePageDataInfo
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response<Integer> updateHomePageDataInfoById(HomePageDataInfo homePageDataInfo) {
-        try {
-            homePageDataInfoMapper.updateById(homePageDataInfo);
-            if ("1".equals(homePageDataInfo.getStatus())){
-                //删除缓存
-                redisTemplate.delete(Constants.HOME_PAGE_DATA_KEY+homePageDataInfo.getDataType()+":"+ homePageDataInfo.getId());
-            }else{
-                //更新缓存
-                updateHomePageDataRedis(homePageDataInfo);
-            }
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    @Override
-    public int updateHomePageDataByPictureName(HomePageDataInfoVo homePageDataInfoVo) {
-       return  homePageDataInfoMapper.updateHomePageDataByPictureName(homePageDataInfoVo);
-    }
-
-    /**
-     * 获取首页数据详细信息
-     * @param id
-     * @return
-     */
-    @Override
-    public Response<HomePageDataInfoVo> getHomePageDataById(Long id) {
-        return Response.success(homePageDataInfoMapper.getHomePageDataById(id));
-    }
-
-
-    /**
-     * 删除首页数据(伪删除)
-     * @param ids
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response removeCarouselByIds(Long[] ids) {
-
-        //首页字典类型
-        List<SysDictData> sysDictData = dictDataMapper.selectDictDataByType("wx_menu_type");
-        //删除数据
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<HomePageDataInfo>().set("status","1").eq("id",id));
-        }
-        //根据字典类型 更新缓存
-        for (SysDictData dictData : sysDictData) {
-            for (Long id : ids) {
-                //判断类型 删除缓存
-                if (redisTemplate.hasKey(Constants.HOME_PAGE_DATA_KEY  + dictData.getDictValue()+":"+id)){
-                    redisTemplate.delete(Constants.HOME_PAGE_DATA_KEY  + dictData.getDictValue() + ":" + id);
-                }
-            }
-        }
-        return Response.success();
-    }
-
-
-    /**
-     * applet
-     * 获取首页数据列表
-     * @return
-     */
-    @Override
-    public Response getHomePageDataList() {
-        Map<String, List<HomePageDataInfoVo>> map = new HashMap<>();
-
-        //首页字典类型
-        List<SysDictData> sysDictData = dictDataMapper.selectDictDataByType("wx_menu_type");
-        for (SysDictData dictData : sysDictData) {
-            List<HomePageDataInfoVo> newInfos = new ArrayList<>();
-            Set carouselChartkeys = redisTemplate.keys(Constants.HOME_PAGE_DATA_KEY + dictData.getDictValue()+":*");
-            if (!carouselChartkeys.isEmpty()){
-                for (Object key : carouselChartkeys) {
-                    String jsonStr = (String) redisTemplate.opsForValue().get(key);
-                    HomePageDataInfoVo homePageDataInfoVo = JSONObject.parseObject(jsonStr).toJavaObject(HomePageDataInfoVo.class);
-                    newInfos.add(homePageDataInfoVo);
-                }
-            }else {
-                //数据库获取(此处可不做查询！)
-                HomePageDataInfo homePageDataInfo = new HomePageDataInfo();
-                homePageDataInfo.setDataType(dictData.getDictValue());
-                homePageDataInfo.setStatus("0");//启用状态
-                newInfos = homePageDataInfoMapper.selectHomePageDataInfoList(homePageDataInfo);
-            }
-            //排序
-            List<HomePageDataInfoVo> infoVos = newInfos.stream()
-                    .sorted(Comparator.comparing(HomePageDataInfoVo::getWeight).reversed())
-                    .collect(Collectors.toList());
-
-            map.put(dictData.getDictValue(),infoVos);
-        }
-
-        return Response.success(map);
-    }
-
-
-    /**
-     * 查询首页数据列表--字典参数
-     * @param dictValues
-     * @return
-     */
-    @Override
-    public Response dictValueHomePageDataList(String[] dictValues) {
-        Map<String, List<HomePageDataInfoVo>> map = new HashMap<>();
-
-        for (String dictData : dictValues) {
-            List<HomePageDataInfoVo> newInfos = new ArrayList<>();
-            Set carouselChartkeys = redisTemplate.keys(Constants.HOME_PAGE_DATA_KEY + dictData+":*");
-            if (!carouselChartkeys.isEmpty()){
-                for (Object key : carouselChartkeys) {
-                    String jsonStr = (String) redisTemplate.opsForValue().get(key);
-                    HomePageDataInfoVo homePageDataInfoVo = JSONObject.parseObject(jsonStr).toJavaObject(HomePageDataInfoVo.class);
-                    newInfos.add(homePageDataInfoVo);
-                }
-            }else {
-                //数据库获取(此处可不做查询！)
-                HomePageDataInfo homePageDataInfo = new HomePageDataInfo();
-                homePageDataInfo.setDataType(dictData);
-                homePageDataInfo.setStatus("0");//启用状态
-                newInfos = homePageDataInfoMapper.selectHomePageDataInfoList(homePageDataInfo);
-            }
-            //排序
-            List<HomePageDataInfoVo> infoVos = newInfos.stream()
-                    .sorted(Comparator.comparing(HomePageDataInfoVo::getWeight).reversed())
-                    .collect(Collectors.toList());
-
-            map.put(dictData,infoVos);
-        }
-
-        return Response.success(map);
-    }
-
-
-    /**
-     * 同步数据
-     * @return
-     */
-    @Override
-    public Response synchroData() {
-        //查询全部启用数据
-        List<HomePageDataInfo> dataInfos = homePageDataInfoMapper.selectByMap(new HashMap<String, Object>() {{
-            put("status", 0);
-        }});
-        //删除全部缓存
-        redisTemplate.delete( redisTemplate.keys(Constants.HOME_PAGE_DATA_KEY +"*"));
-        //同步缓存
-        for (HomePageDataInfo dataInfo : dataInfos) {
-            updateHomePageDataRedis(dataInfo);
-        }
-        return Response.success();
-    }
-
-
-    /**
-     * 更新首页数据缓存
-     * @param homePageDataInfo
-     */
-    private void updateHomePageDataRedis(HomePageDataInfo homePageDataInfo){
-        //更新缓存
-        FileInfo fileInfo = fileInfoService.getById(homePageDataInfo.getFileId());
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(homePageDataInfo));
-        jsonObject.put("fileUrl",fileInfo.getFileUrl());
-
-        //首页字典类型
-        List<SysDictData> sysDictData = dictDataMapper.selectDictDataByType("wx_menu_type");
-        //根据字典类型 删除缓存
-        for (SysDictData dictData : sysDictData) {
-            if (redisTemplate.hasKey(Constants.HOME_PAGE_DATA_KEY  + dictData.getDictValue()+":"+homePageDataInfo.getId())){
-                redisTemplate.delete(Constants.HOME_PAGE_DATA_KEY  + dictData.getDictValue() + ":" + homePageDataInfo.getId());
-            }
-        }
-
-        //同时更新缓存(根据type拼接)
-        redisTemplate.opsForValue().set(Constants.HOME_PAGE_DATA_KEY +homePageDataInfo.getDataType()+":"+ homePageDataInfo.getId(),JSONObject.toJSONString(jsonObject));
-    }
-
-
-}

jsjp-service/src/main/java/com/miaxis/carousel/vo/HomePageDataInfoVo.java

@@ -1,51 +0,0 @@
-package com.miaxis.carousel.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 首页数据表对象返回参
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@ApiModel(value = "HomePageDataInfoVo", description = "首页数据表对象返回参")
-public class HomePageDataInfoVo {
-
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 图片名称 */
-    @ApiModelProperty(value = "图片名称")
-    private String pictureName;
-
-    @ApiModelProperty(value = "图片id")
-    private String fileId;
-
-    /** 图片id--对应file_info的id */
-    @ApiModelProperty(value = "图片访问地址")
-    private String fileUrl;
-
-    @ApiModelProperty(value = "跳转url")
-    private String jumpUrl;
-
-    @ApiModelProperty(value = "跳转url类型  goMiniApp:小程序 、goPage：小程序页面 、goWebView: h5")
-    private String jumpUrlType;
-
-    @ApiModelProperty(value = "权重（数值从大到小）")
-    private Integer weight;
-
-    @ApiModelProperty(value = "类型：carouselChart：轮播图、coupon：优惠劵、menu：首页菜单")
-    private String dataType;
-
-    @ApiModelProperty(value = "内容描述")
-    private String dataDescribe;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/file/domain/FileInfo.java

@@ -1,100 +0,0 @@
-package com.miaxis.file.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-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 org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-/**
- * 文件对象 file_info
- *
- * @author miaxis
- * @date 2021-01-22
- */
-@Data
-@TableName("file_info")
-@ApiModel(value = "FileInfo", description = "文件对象 file_info")
-public class FileInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 自增id */
-    @TableId(value = "file_id")
-    @ApiModelProperty(value = "自增id")
-    private Long fileId;
-
-    /** 顺序 */
-    @Excel(name = "顺序")
-    @TableField("seq")
-    @ApiModelProperty(value = "顺序")
-    private Long seq;
-
-    /** 文件业务类型 */
-    @Excel(name = "文件业务类型")
-    @TableField("file_type")
-    @ApiModelProperty(value = "文件业务类型")
-    private String fileType;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @TableField("remark")
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    /** 文件url(访问地址) */
-    @Excel(name = "文件url(访问地址)")
-    @TableField("file_url")
-    @ApiModelProperty(value = "文件url(访问地址)")
-    private String fileUrl;
-
-    /** 文件路径 */
-    @Excel(name = "文件路径")
-    @TableField("file_path")
-    @ApiModelProperty(value = "文件路径")
-    private String filePath;
-
-    public void setFileId(Long fileId){
-        this.fileId = fileId;
-    }
-
-    public Long getFileId(){
-        return fileId;
-    }
-    public void setSeq(Long seq){
-        this.seq = seq;
-    }
-
-    public Long getSeq(){
-        return seq;
-    }
-    public void setFileUrl(String fileUrl){
-        this.fileUrl = fileUrl;
-    }
-
-    public String getFileUrl(){
-        return fileUrl;
-    }
-    public void setFilePath(String filePath){
-        this.filePath = filePath;
-    }
-
-    public String getFilePath(){
-        return filePath;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("fileId", getFileId())
-            .append("seq", getSeq())
-            .append("fileUrl", getFileUrl())
-            .append("filePath", getFilePath())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

jsjp-service/src/main/java/com/miaxis/file/mapper/FileInfoMapper.java

@@ -1,22 +0,0 @@
-package com.miaxis.file.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.file.domain.FileInfo;
-
-/**
- * 文件Mapper接口
- *
- * @author miaxis
- * @date 2021-01-22
- */
-public interface FileInfoMapper extends BaseMapper<FileInfo> {
-    /**
-     * 查询文件列表
-     *
-     * @param fileInfo 文件
-     * @return 文件集合
-     */
-    public List<FileInfo> selectFileInfoList(FileInfo fileInfo);
-
-}

jsjp-service/src/main/java/com/miaxis/file/service/IFileInfoService.java

@@ -1,21 +0,0 @@
-package com.miaxis.file.service;
-
-import java.util.List;
-import com.miaxis.file.domain.FileInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 文件Service接口
- *
- * @author miaxis
- * @date 2021-01-22
- */
-public interface IFileInfoService extends IService<FileInfo>{
-    /**
-     * 查询文件列表
-     *
-     * @param fileInfo 文件
-     * @return 文件集合
-     */
-    public List<FileInfo> selectFileInfoList(FileInfo fileInfo);
-}

jsjp-service/src/main/java/com/miaxis/file/service/impl/FileInfoServiceImpl.java

@@ -1,36 +0,0 @@
-package com.miaxis.file.service.impl;
-
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.file.mapper.FileInfoMapper;
-import com.miaxis.file.domain.FileInfo;
-import com.miaxis.file.service.IFileInfoService;
-
-/**
- * 文件Service业务层处理
- *
- * @author miaxis
- * @date 2021-01-22
- */
-@Service
-public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements IFileInfoService {
-    @Autowired
-    private FileInfoMapper fileInfoMapper;
-
-    /**
-     * 查询文件列表
-     *
-     * @param fileInfo 文件
-     * @return 文件
-     */
-    @Override
-    public List<FileInfo> selectFileInfoList(FileInfo fileInfo){
-        return fileInfoMapper.selectFileInfoList(fileInfo);
-    }
-}

jsjp-service/src/main/java/com/miaxis/file/vo/FileVo.java

@@ -1,27 +0,0 @@
-package com.miaxis.file.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 文件上传vo
- *
- * @Author wwl
- * @Date 2021/1/4
- * @Version 1.0
- */
-@Data
-public class FileVo implements Serializable {
-
-    @ApiModelProperty(value = "文件名")
-    private String fileName;
-
-    @ApiModelProperty(value = "文件路径")
-    private String filePath;
-
-    @ApiModelProperty(value = "文件访问路径")
-    private String fileUrl;
-
-}

jsjp-service/src/main/java/com/miaxis/fulu/domain/FuluCommodityInfo.java

@@ -1,54 +0,0 @@
-package com.miaxis.fulu.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- *  福禄商品对象 fulu_goods_info
- * @author wwl
- * @version 1.0
- * @date 2021/6/24 15:07
- */
-@Data
-@TableName("fulu_commodity_info")
-@ApiModel(value = "FuluCommodityInfo", description = "福禄商品对象 fulu_goods_info")
-public class FuluCommodityInfo extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    @TableField("icon_id")
-    @ApiModelProperty(value = "图标id")
-    private Long iconId;
-
-    @TableField("name")
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @TableField("introduction")
-    @ApiModelProperty(value = "描述")
-    private String introduction;
-
-    @TableField("remark")
-    @ApiModelProperty(value = "描述")
-    private String remark;
-
-    @TableField("product_ids")
-    @ApiModelProperty(value = "分类商品ids")
-    private String productIds;
-
-    @TableField("fulu_goods_type")
-    @ApiModelProperty(value = "福禄商品分类名称（对应字典表）")
-    private Integer fuluGoodsType;
-
-    @TableField("status")
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    private String status;
-}

jsjp-service/src/main/java/com/miaxis/fulu/mapper/FuluCommodityInfoMapper.java

@@ -1,38 +0,0 @@
-package com.miaxis.fulu.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.fulu.domain.FuluCommodityInfo;
-import com.miaxis.fulu.vo.FuluCommodityInfoVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * 福禄商品Mapper接口
- * @author wwl
- * @version 1.0
- * @date 2021/6/24 15:14
- */
-public interface FuluCommodityInfoMapper extends BaseMapper<FuluCommodityInfo> {
-    /**
-     * 查询福禄商品列表
-     *
-     * @param fuluCommodityInfo 福禄商品
-     * @return 福禄商品集合
-     */
-    List<FuluCommodityInfoVo> selectFuluCommodityInfoList(FuluCommodityInfo fuluCommodityInfo);
-
-    /**
-     * 获取福禄商品详细信息
-     * @param id
-     * @return
-     */
-    FuluCommodityInfoVo getFuLuById(@Param("id")Long id);
-
-    /**
-     * applet
-     * @return
-     */
-    List<FuluCommodityInfoVo> getFuluDataList();
-}

jsjp-service/src/main/java/com/miaxis/fulu/service/IFuluCommodityInfoService.java

@@ -1,49 +0,0 @@
-package com.miaxis.fulu.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.fulu.domain.FuluCommodityInfo;
-import com.miaxis.fulu.vo.FuluCommodityInfoVo;
-
-import java.util.List;
-
-/**
- * 福禄商品Service接口
- * @author wwl
- * @version 1.0
- * @date 2021/6/24 15:36
- */
-public interface IFuluCommodityInfoService extends IService<FuluCommodityInfo> {
-
-    /**
-     * 查询福禄商品列表
-     *
-     * @param fuluCommodityInfo 福禄商品
-     * @return 福禄商品集合
-     */
-    List<FuluCommodityInfoVo> selectFuluCommodityInfoList(FuluCommodityInfo fuluCommodityInfo);
-
-    /**
-     * 获取福禄商品详细信息
-     * @param id
-     * @return
-     */
-    Response<FuluCommodityInfoVo> getFuLuById(Long id);
-
-    /**
-     * 删除福禄商品（伪删除）
-     * @param ids
-     * @return
-     */
-    Response removeFuLuByIds(Long[] ids);
-
-
-    /**
-     * applet
-     * 查询福禄商品列表
-     * @return
-     */
-    Response queryFuluCommodityInfoList();
-
-
-}

jsjp-service/src/main/java/com/miaxis/fulu/service/impl/FuluCommodityInfoServiceImpl.java

@@ -1,88 +0,0 @@
-package com.miaxis.fulu.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysDictData;
-import com.miaxis.fulu.domain.FuluCommodityInfo;
-import com.miaxis.fulu.mapper.FuluCommodityInfoMapper;
-import com.miaxis.fulu.service.IFuluCommodityInfoService;
-import com.miaxis.fulu.vo.FuluCommodityInfoAppletVo;
-import com.miaxis.fulu.vo.FuluCommodityInfoVo;
-import com.miaxis.system.mapper.SysDictDataMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/6/24 15:44
- */
-@Service
-@AllArgsConstructor
-public class FuluCommodityInfoServiceImpl extends ServiceImpl<FuluCommodityInfoMapper, FuluCommodityInfo> implements IFuluCommodityInfoService {
-
-    private final FuluCommodityInfoMapper fuluCommodityInfoMapper;
-
-    private final SysDictDataMapper sysDictDataMapper;
-
-    /**
-     * 查询福禄商品列表
-     *
-     * @param fuluCommodityInfo 福禄商品
-     * @return 福禄商品
-     */
-    @Override
-    public List<FuluCommodityInfoVo> selectFuluCommodityInfoList(FuluCommodityInfo fuluCommodityInfo){
-        return fuluCommodityInfoMapper.selectFuluCommodityInfoList(fuluCommodityInfo);
-    }
-
-    /**
-     * 获取福禄商品详细信息
-     * @param id
-     * @return
-     */
-    @Override
-    public Response<FuluCommodityInfoVo> getFuLuById(Long id) {
-        return Response.success(fuluCommodityInfoMapper.getFuLuById(id));
-    }
-
-    /**
-     * 删除福禄商品（伪删除）
-     * @param ids
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response removeFuLuByIds(Long[] ids) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<FuluCommodityInfo>().set("status",1).eq("id",id));
-        }
-        return Response.success();
-    }
-
-    /**
-     * applet
-     * 查询福禄商品列表
-     * @return
-     */
-    @Override
-    public Response queryFuluCommodityInfoList() {
-        List<FuluCommodityInfoAppletVo> infoAppletVo = new ArrayList<>();
-        List<SysDictData> fuluGoodsTypeList = sysDictDataMapper.selectDictDataByType("fulu_goods_type");
-        List<FuluCommodityInfoVo> commodityInfos = fuluCommodityInfoMapper.getFuluDataList();
-
-        for (SysDictData sysDictData : fuluGoodsTypeList) {
-            FuluCommodityInfoAppletVo infoAppletVo1 = new FuluCommodityInfoAppletVo();
-            infoAppletVo1.setTypeName(sysDictData.getDictLabel());
-            infoAppletVo1.setList(commodityInfos.stream().filter(m -> m.getFuluGoodsType().toString().equals(sysDictData.getDictValue())).collect(Collectors.toList()));
-            infoAppletVo.add(infoAppletVo1);
-        }
-        return Response.success(infoAppletVo);
-    }
-}

jsjp-service/src/main/java/com/miaxis/fulu/vo/FuluCommodityInfoAppletVo.java

@@ -1,25 +0,0 @@
-package com.miaxis.fulu.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- *  福禄商品对象applet返回参
- * @author wwl
- * @version 1.0
- * @date 2021/6/25 14:15
- */
-@Data
-@ApiModel(value = "FuluCommodityInfoAppletVo", description = "福禄商品对象applet返回参")
-public class FuluCommodityInfoAppletVo{
-
-    @ApiModelProperty(value = "福禄商品分类名称")
-    private String typeName;
-
-    @ApiModelProperty(value = "数据集合")
-    private List<FuluCommodityInfoVo> list;
-
-}

jsjp-service/src/main/java/com/miaxis/fulu/vo/FuluCommodityInfoVo.java

@@ -1,53 +0,0 @@
-package com.miaxis.fulu.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- *  福禄商品对象返回参
- * @author wwl
- * @version 1.0
- * @date 2021/6/25 9:04
- */
-@Data
-@ApiModel(value = "FuluCommodityInfoVo", description = "福禄商品对象返回参")
-public class FuluCommodityInfoVo {
-
-    @TableId(value = "id")
-    private Long id;
-
-    @ApiModelProperty(value = "图标访问地址")
-    private String iconUrl;
-
-    @TableField("name")
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @TableField("introduction")
-    @ApiModelProperty(value = "描述")
-    private String introduction;
-
-    @TableField("remark")
-    @ApiModelProperty(value = "描述")
-    private String remark;
-
-    @TableField("product_ids")
-    @ApiModelProperty(value = "分类商品ids")
-    private String productIds;
-
-    @TableField("fulu_goods_type")
-    @ApiModelProperty(value = "福禄商品分类名称（对应字典表）")
-    private String fuluGoodsType;
-
-    @ApiModelProperty(value = "福禄商品分类名称")
-    private String fuluGoodsTypeName;
-
-    @TableField("status")
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    private String status;
-}

jsjp-service/src/main/java/com/miaxis/newgzpt/dto/GzptVideoVipDTO.java

@@ -1,6 +1,5 @@
 package com.miaxis.newgzpt.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

jsjp-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -0,0 +1,84 @@
+package com.miaxis.order.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 订单信息对象 order_info
+ *
+ * @author miaxis
+ * @date 2022-06-01
+ */
+@Data
+@TableName("order_info")
+@ApiModel(value = "OrderInfo", description = "订单信息对象 order_info")
+public class OrderInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 商品 */
+    @Excel(name = "商品")
+    @TableField("goods_name")
+    @ApiModelProperty(value = "商品")
+    private String goodsName;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    @TableField("user_id")
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /** 极速驾培订单ID */
+    @Excel(name = "极速驾培订单ID")
+    @TableField("out_trade_no")
+    @ApiModelProperty(value = "极速驾培订单ID")
+    private String outTradeNo;
+
+    /** 极速驾培中退款订单ID */
+    @Excel(name = "极速驾培中退款订单ID")
+    @TableField("out_refund_no")
+    @ApiModelProperty(value = "极速驾培中退款订单ID")
+    private String outRefundNo;
+
+
+    /** 总金额*/
+    @TableField("total")
+    @ApiModelProperty(value = "总金额")
+    private Integer total;
+
+    /** 交易状态 1、支付成功2、支付失败*/
+    @TableField("trade_type")
+    @ApiModelProperty(value = "微信交易状态，枚举值：")
+    private Integer tradeType;
+
+    /** 支付完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("success_time")
+    @ApiModelProperty(value = "支付完成时间")
+    private Date successTime;
+
+    /** 1:微信 2:支付宝 */
+    @Excel(name = "1:微信 2:支付宝")
+    @TableField("pay_type")
+    @ApiModelProperty(value = "1:微信 2:支付宝")
+    private Integer payType;
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/order/mapper/OrderInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.order.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.order.domain.OrderInfo;
+
+/**
+ * 订单信息Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-06-01
+ */
+public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
+    /**
+     * 查询订单信息列表
+     *
+     * @param orderInfo 订单信息
+     * @return 订单信息集合
+     */
+    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
+
+}

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -0,0 +1,21 @@
+package com.miaxis.order.service;
+
+import java.util.List;
+import com.miaxis.order.domain.OrderInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 订单信息Service接口
+ *
+ * @author miaxis
+ * @date 2022-06-01
+ */
+public interface IOrderInfoService extends IService<OrderInfo>{
+    /**
+     * 查询订单信息列表
+     *
+     * @param orderInfo 订单信息
+     * @return 订单信息集合
+     */
+    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
+}

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.order.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.order.mapper.OrderInfoMapper;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.service.IOrderInfoService;
+
+/**
+ * 订单信息Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-06-01
+ */
+@Service
+public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements IOrderInfoService {
+    @Autowired
+    private OrderInfoMapper orderInfoMapper;
+
+    /**
+     * 查询订单信息列表
+     *
+     * @param orderInfo 订单信息
+     * @return 订单信息
+     */
+    @Override
+    public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo){
+        return orderInfoMapper.selectOrderInfoList(orderInfo);
+    }
+}

jsjp-service/src/main/java/com/miaxis/user/domain/UserImages.java

@@ -1,53 +0,0 @@
-package com.miaxis.user.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-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;
-/**
- * 用户照片对象 user_images
- *
- * @author miaxis
- * @date 2020-12-25
- */
-@Data
-@TableName("user_images")
-@ApiModel(value = "UserImages", description = "用户照片对象 user_images")
-public class UserImages extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** 照片id */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "照片id")
-    private Long id;
-
-    /** 用户表id */
-    @Excel(name = "用户表id")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户表id")
-    private Long userId;
-
-    /** 照片url(访问地址) */
-    @Excel(name = "照片url(访问地址)")
-    @TableField("file_url")
-    @ApiModelProperty(value = "照片url(访问地址)")
-    private String fileUrl;
-
-    /** 文件路径 */
-    @Excel(name = "文件路径")
-    @TableField("file_path")
-    @ApiModelProperty(value = "文件路径")
-    private String filePath;
-
-    /** 1:身份证正面 2:身份证反面 3:人脸比对模板(采集人像图) */
-    @Excel(name = "1:身份证正面 2:身份证反面 3:人脸比对模板(采集人像图)")
-    @TableField("image_type")
-    @ApiModelProperty(value = "1:身份证正面 2:身份证反面 3:人脸比对模板(采集人像图)")
-    private Long imageType;
-
-
-}

jsjp-service/src/main/java/com/miaxis/user/domain/UserPay.java

@@ -1,53 +0,0 @@
-package com.miaxis.user.domain;
-
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import com.miaxis.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-/**
- * 缴费对象 user_pay
- *
- * @author miaxis
- * @date 2020-12-29
- */
-@Data
-@TableName("user_pay")
-@ApiModel(value = "UserPay", description = "缴费对象 user_pay")
-public class UserPay extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** id */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    /** 用户表主键 */
-    @Excel(name = "用户表主键")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户表主键")
-    private Long userId;
-
-    /** 总金额 */
-    @Excel(name = "总金额")
-    @TableField("price")
-    @ApiModelProperty(value = "总金额")
-    private Double price;
-
-    /** 缴费状态0:未缴费 1:已缴费  */
-    @Excel(name = "缴费状态0:未缴费 1:已缴费 ")
-    @TableField("pay_status")
-    @ApiModelProperty(value = "缴费状态0:未缴费 1:已缴费 ")
-    private Long payStatus;
-
-    /** 1:理科中心学习材料费 2:模拟中心机位费 3:驾校费用、4:班型费用 */
-    @Excel(name = "1:理科中心学习材料费 2:模拟中心机位费 3:驾校费用、4:班型费用")
-    @TableField("pay_type")
-    @ApiModelProperty(value = "1:理科中心学习材料费 2:模拟中心机位费 3:驾校费用、4:班型费用")
-    private Long payType;
-
-}

jsjp-service/src/main/java/com/miaxis/user/domain/UserRegister.java

@@ -1,58 +0,0 @@
-package com.miaxis.user.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-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;
-/**
- * 用户报名信息对象 user_register
- *
- * @author miaxis
- * @date 2020-12-25
- */
-@Data
-@TableName("user_register")
-@ApiModel(value = "UserRegister", description = "用户报名信息对象 user_register")
-public class UserRegister extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    /** 用户id(user_info表id) */
-    @Excel(name = "用户id(user_info表id)")
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id(user_info表id)")
-    private Long userId;
-
-    /** 报名驾校 */
-    @Excel(name = "报名驾校")
-    @TableField("inscode")
-    @ApiModelProperty(value = "报名驾校")
-    private String inscode;
-
-    /** 报名车型 */
-    @Excel(name = "报名车型")
-    @TableField("bmcx")
-    @ApiModelProperty(value = "报名车型")
-    private String bmcx;
-
-    /** 教练全国统一编号 */
-    @Excel(name = "教练全国统一编号")
-    @TableField("coachnum")
-    @ApiModelProperty(value = "教练全国统一编号")
-    private String coachnum;
-
-    /** 报名班类id */
-    @Excel(name = "报名班类id")
-    @TableField("class_id")
-    @ApiModelProperty(value = "报名班类id")
-    private Long classId;
-
-}

jsjp-service/src/main/java/com/miaxis/user/dto/UserDto.java

@@ -1,76 +0,0 @@
-package com.miaxis.user.dto;
-
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Author wwl
- * @Date 2020/12/24
- * @Version 1.0
- */
-@Data
-public class UserDto extends BaseBusinessEntity {
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "性别")
-    private Long sex;
-
-    @ApiModelProperty(value = "身份证明号码 1：身份证号，2：护照，3：军官证，4：其他")
-    private Long cardtype;
-
-    @ApiModelProperty(value = "身份证明号码")
-    private String idcard;
-
-    @ApiModelProperty(value = "出生日期")
-    private Date birthday;
-
-    @ApiModelProperty(value = "手机号码")
-    private String phone;
-
-    @ApiModelProperty(value = "登录密码 MD5加密")
-    private String password;
-
-    @ApiModelProperty(value = "微信号码")
-    private String wechar;
-
-    @ApiModelProperty(value = "微信openid")
-    private String openid;
-
-    @ApiModelProperty(value = "驾校全国统一编号")
-    private String inscode;
-
-    @ApiModelProperty(value = "培训车型")
-    private String traintype;
-
-    @ApiModelProperty(value = "驾校班型Id")
-    private Long schoolClassTypeId;
-
-    @ApiModelProperty(value = "驾校班型金额")
-    private Double schoolClassTypePrice;
-
-    @ApiModelProperty(value = "教练全国统一编号")
-    private String coachnum;
-
-    @ApiModelProperty(value = "身份证正面图片地址")
-    private String idCardFrontUrl;
-    @ApiModelProperty(value = "身份证正面图片路径")
-    private String idCardFrontPath;
-
-    @ApiModelProperty(value = "身份证反面图片地址")
-    private String idCardReverseUrl;
-    @ApiModelProperty(value = "身份证反面图片路径")
-    private String idCardReversePath;
-
-    @ApiModelProperty(value = "人像图片地址")
-    private String facesUrl;
-    @ApiModelProperty(value = "人像图片路径")
-    private String facesPath;
-
-    @ApiModelProperty(value = "短信验证码")
-    private String verificationCode;
-}

jsjp-service/src/main/java/com/miaxis/user/dto/UserInfoUpdateDto.java

@@ -1,30 +0,0 @@
-package com.miaxis.user.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Author wwl
- * @Date 2020/12/24
- * @Version 1.0
- */
-@Data
-public class UserInfoUpdateDto extends BaseBusinessEntity {
-    /** 小程序头像地址 */
-    @Excel(name = "小程序头像地址")
-    @TableField("head_image")
-    @ApiModelProperty(value = "小程序头像地址")
-    private String headImage;
-
-    /** 小程序昵称 */
-    @Excel(name = "小程序昵称")
-    @TableField("nick_name")
-    @ApiModelProperty(value = "小程序昵称")
-    private String nickName;
-
-}

jsjp-service/src/main/java/com/miaxis/user/mapper/UserImagesMapper.java

@@ -1,15 +0,0 @@
-package com.miaxis.user.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.user.domain.UserImages;
-
-/**
- * 用户照片Mapper接口
- *
- * @author miaxis
- * @date 2020-12-25
- */
-public interface UserImagesMapper extends BaseMapper<UserImages> {
-
-}

jsjp-service/src/main/java/com/miaxis/user/mapper/UserInfoMapper.java

@@ -1,47 +0,0 @@
-package com.miaxis.user.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.user.vo.UserVo;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 用户信息Mapper接口
- *
- * @author miaxis
- * @date 2020-12-23
- */
-public interface UserInfoMapper extends BaseMapper<UserInfo> {
-    /**
-     * 查询用户信息
-     *
-     * @param id 用户信息ID
-     * @return 用户信息
-     */
-    UserInfo selectUserInfoById(Long id);
-
-    /**
-     * 删除用户信息
-     *
-     * @param id 用户信息ID
-     * @return 结果
-     */
-    int deleteUserInfoById(Long id);
-
-    /**
-     * 批量删除用户信息
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    int deleteUserInfoByIds(Long[] ids);
-
-    /**
-     * 获取我的报名信息
-     * @param userId
-     * @return
-     */
-    UserVo getMyRegistrationInformation(@Param("userId") String userId);
-
-    UserInfo selectUserInfoByMobile(String phone);
-}

jsjp-service/src/main/java/com/miaxis/user/mapper/UserPayMapper.java

@@ -1,14 +0,0 @@
-package com.miaxis.user.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.user.domain.UserPay;
-
-/**
- * 缴费Mapper接口
- *
- * @author wwl
- * @date 2020-12-29
- */
-public interface UserPayMapper extends BaseMapper<UserPay> {
-}

jsjp-service/src/main/java/com/miaxis/user/mapper/UserRegisterMapper.java

@@ -1,63 +0,0 @@
-package com.miaxis.user.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.user.domain.UserRegister;
-
-import java.util.List;
-
-/**
- * 用户报名信息Mapper接口
- *
- * @author miaxis
- * @date 2020-12-25
- */
-public interface UserRegisterMapper extends BaseMapper<UserRegister> {
-    /**
-     * 查询用户报名信息
-     *
-     * @param id 用户报名信息ID
-     * @return 用户报名信息
-     */
-    public UserRegister selectUserRegisterById(Long id);
-
-    /**
-     * 查询用户报名信息列表
-     *
-     * @param userRegister 用户报名信息
-     * @return 用户报名信息集合
-     */
-    public List<UserRegister> selectUserRegisterList(UserRegister userRegister);
-
-    /**
-     * 新增用户报名信息
-     *
-     * @param userRegister 用户报名信息
-     * @return 结果
-     */
-    public int insertUserRegister(UserRegister userRegister);
-
-    /**
-     * 修改用户报名信息
-     *
-     * @param userRegister 用户报名信息
-     * @return 结果
-     */
-    public int updateUserRegister(UserRegister userRegister);
-
-    /**
-     * 删除用户报名信息
-     *
-     * @param id 用户报名信息ID
-     * @return 结果
-     */
-    public int deleteUserRegisterById(Long id);
-
-    /**
-     * 批量删除用户报名信息
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteUserRegisterByIds(Long[] ids);
-}

jsjp-service/src/main/java/com/miaxis/user/service/IUserImagesService.java

@@ -1,15 +0,0 @@
-package com.miaxis.user.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.user.domain.UserImages;
-
-/**
- * 用户照片Service接口
- *
- * @author miaxis
- * @date 2020-12-25
- */
-public interface IUserImagesService extends IService<UserImages> {
-
-}

jsjp-service/src/main/java/com/miaxis/user/service/IUserInfoService.java

@@ -1,87 +0,0 @@
-package com.miaxis.user.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.user.dto.UserDto;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.core.domain.entity.UserInfo;
-
-/**
- * 用户信息Service接口
- *
- * @author miaxis
- * @date 2020-12-23
- */
-public interface IUserInfoService extends IService<UserInfo>{
-    /**
-     * 查询用户信息
-     *
-     * @param id 用户信息ID
-     * @return 用户信息
-     */
-    UserInfo selectUserInfoById(Long id);
-
-    /**
-     * 修改用户信息
-     *
-     * @param userInfo 用户信息
-     * @return 结果
-     */
-    int updateUserInfo(UserInfo userInfo);
-
-    /**
-     * 批量删除用户信息
-     *
-     * @param ids 需要删除的用户信息ID
-     * @return 结果
-     */
-    int deleteUserInfoByIds(Long[] ids);
-
-
-    /**
-     * 修改手机号
-     * @param phone
-     * @param verificationCode
-     * @return
-     */
-    Response modifyPhoneNumber(String phone, String verificationCode,SysUser user);
-
-    /**
-     * 保存用户报名信息
-     * @param userDto
-     * @return
-     */
-    Response saveUserInformation(UserDto userDto);
-
-    /**
-     * 注册报名获取短信验证码
-     * @param phone
-     * @return
-     */
-    Response sendSignUpVerificationCode(String phone);
-
-    /**
-     * 修改手机号获取短信验证码
-     * @param user
-     * @param phone
-     * @return
-     */
-    Response sendModifyVerificationCode(SysUser user, String phone);
-
-
-    /**
-     * 获取我的报名信息
-     * @param userId
-     * @return
-     */
-    Response getMyRegistrationInformation(String userId);
-
-    /**
-     * 查询用户信息
-     *
-     * @param moble 用户moble
-     * @return 用户信息
-     */
-
-    UserInfo selectUserInfoByMoble(String moble);
-}

jsjp-service/src/main/java/com/miaxis/user/service/IUserRegisterService.java

@@ -1,63 +0,0 @@
-package com.miaxis.user.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.user.domain.UserRegister;
-
-import java.util.List;
-
-/**
- * 用户报名信息Service接口
- *
- * @author miaxis
- * @date 2020-12-25
- */
-public interface IUserRegisterService extends IService<UserRegister> {
-    /**
-     * 查询用户报名信息
-     *
-     * @param id 用户报名信息ID
-     * @return 用户报名信息
-     */
-    public UserRegister selectUserRegisterById(Long id);
-
-    /**
-     * 查询用户报名信息列表
-     *
-     * @param userRegister 用户报名信息
-     * @return 用户报名信息集合
-     */
-    public List<UserRegister> selectUserRegisterList(UserRegister userRegister);
-
-    /**
-     * 新增用户报名信息
-     *
-     * @param userRegister 用户报名信息
-     * @return 结果
-     */
-    public int insertUserRegister(UserRegister userRegister);
-
-    /**
-     * 修改用户报名信息
-     *
-     * @param userRegister 用户报名信息
-     * @return 结果
-     */
-    public int updateUserRegister(UserRegister userRegister);
-
-    /**
-     * 批量删除用户报名信息
-     *
-     * @param ids 需要删除的用户报名信息ID
-     * @return 结果
-     */
-    public int deleteUserRegisterByIds(Long[] ids);
-
-    /**
-     * 删除用户报名信息信息
-     *
-     * @param id 用户报名信息ID
-     * @return 结果
-     */
-    public int deleteUserRegisterById(Long id);
-}

jsjp-service/src/main/java/com/miaxis/user/service/impl/UserImagesServiceImpl.java

@@ -1,22 +0,0 @@
-package com.miaxis.user.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.user.domain.UserImages;
-import com.miaxis.user.mapper.UserImagesMapper;
-import com.miaxis.user.service.IUserImagesService;
-import org.springframework.stereotype.Service;
-
-
-
-/**
- * 用户照片Service业务层处理
- *
- * @author miaxis
- * @date 2020-12-25
- */
-@Service
-public class UserImagesServiceImpl extends ServiceImpl<UserImagesMapper, UserImages> implements IUserImagesService {
-
-
-}

jsjp-service/src/main/java/com/miaxis/user/service/impl/UserInfoServiceImpl.java

@@ -1,267 +0,0 @@
-package com.miaxis.user.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.sms.ISmsService;
-import com.miaxis.sms.domain.SmsParameter;
-import com.miaxis.user.domain.UserImages;
-import com.miaxis.user.domain.UserPay;
-import com.miaxis.user.domain.UserRegister;
-import com.miaxis.user.dto.UserDto;
-import com.miaxis.user.mapper.UserInfoMapper;
-import com.miaxis.user.mapper.UserPayMapper;
-import com.miaxis.user.mapper.UserRegisterMapper;
-import com.miaxis.user.service.IUserImagesService;
-import com.miaxis.user.service.IUserInfoService;
-import com.miaxis.user.vo.UserVo;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.RedisPrefixUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 用户信息Service业务层处理
- *
- * @author miaxis
- * @date 2020-12-23
- */
-@Service
-public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements IUserInfoService {
-
-    @Resource
-    private UserInfoMapper userInfoMapper;//用户信息
-
-    @Resource
-    private UserRegisterMapper userRegisterMapper;//用户报名信息
-
-    @Resource
-    private IUserImagesService userImagesService;//用户图片信息
-
-    @Autowired
-    private ISmsService smsService;//短信服务
-
-    @Resource
-    private UserPayMapper userPayMapper;//缴费信息
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    /**
-     * 查询用户信息
-     *
-     * @param id 用户信息ID
-     * @return 用户信息
-     */
-    @Override
-    public UserInfo selectUserInfoById(Long id){
-        return userInfoMapper.selectUserInfoById(id);
-    }
-
-    /**
-     * 查询用户信息
-     *
-     * @param mobile mobile
-     * @return 用户信息
-     */
-    @Override
-    public UserInfo selectUserInfoByMoble(String mobile){
-        return userInfoMapper.selectUserInfoByMobile(mobile);
-    }
-
-
-
-    /**
-     * 修改用户信息
-     *
-     * @param userInfo 用户信息
-     * @return 结果
-     */
-    @Override
-    public int updateUserInfo(UserInfo userInfo){
-        return userInfoMapper.updateById(userInfo);
-    }
-
-    /**
-     * 批量删除用户信息
-     *
-     * @param ids 需要删除的用户信息ID
-     * @return 结果
-     */
-    @Override
-    public int deleteUserInfoByIds(Long[] ids){
-        return userInfoMapper.deleteUserInfoByIds(ids);
-    }
-
-
-    /**
-     * 修改手机号
-     * @param phone
-     * @param verificationCode
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response modifyPhoneNumber(String phone,String verificationCode,SysUser user) {
-
-        //生成短信缓存前缀
-        String smsKeyPrefix = RedisPrefixUtils.getSmsKeyPrefix("modify", phone);
-        String smsKeyCountPrefix = RedisPrefixUtils.getSmsKeyCountPrefix("modify", phone);
-
-        //查看验证码是否过期
-        if (redisTemplate.hasKey(smsKeyCountPrefix) &&
-                !redisTemplate.hasKey(smsKeyPrefix)){
-            throw new CustomException("验证码已过期,请重新验证!");
-        }
-        //比对缓存中的验证码
-        String smsCodeValue = redisTemplate.opsForValue().get(smsKeyPrefix).toString();
-        if (!verificationCode.equals(smsCodeValue)){
-            throw new CustomException("验证码错误,请重新输入!");
-        }
-
-        UserInfo userInfo = new UserInfo();
-        userInfo.setId(user.getUserId());
-        userInfo.setPhone(phone);
-        //更新绑定手机号
-        userInfoMapper.updateById(userInfo);
-
-        return Response.success();
-    }
-
-    /**
-     * 保存用户报名信息
-     * @param userDto
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response saveUserInformation(UserDto userDto) {
-
-        //生成短信缓存前缀
-        String smsKeyPrefix = RedisPrefixUtils.getSmsKeyPrefix("signUp", userDto.getPhone());
-        String smsKeyCountPrefix = RedisPrefixUtils.getSmsKeyCountPrefix("signUp", userDto.getPhone());
-
-        //查看验证码是否过期
-        if (redisTemplate.hasKey(smsKeyCountPrefix) &&
-                !redisTemplate.hasKey(smsKeyPrefix)){
-            throw new CustomException("验证码已过期,请重新验证!");
-        }
-        //比对缓存中的验证码
-        String smsCodeValue = redisTemplate.opsForValue().get(smsKeyPrefix).toString();
-        if (!userDto.getVerificationCode().equals(smsCodeValue)){
-            throw new CustomException("验证码错误,请重新输入!");
-        }
-
-        //用户信息表
-        UserInfo userInfo = new UserInfo();
-        BeanUtils.copyProperties(userDto,userInfo);
-        userInfoMapper.insert(userInfo);
-
-
-        //用户报名信息表
-        UserRegister userRegister = new UserRegister();
-        userRegister.setUserId(userInfo.getId());
-        userRegister.setInscode(userDto.getInscode());
-        userRegister.setBmcx(userDto.getTraintype());
-        userRegister.setCoachnum(userDto.getCoachnum());
-        userRegister.setClassId(userDto.getSchoolClassTypeId());
-        userRegisterMapper.insert(userRegister);
-
-        //报名缴费信息
-        UserPay userPay = new UserPay();
-        userPay.setUserId(userInfo.getId());
-        userPay.setPrice(userDto.getSchoolClassTypePrice());
-        userPay.setPayType(4l);
-        userPay.setPayStatus(0l);
-        userPayMapper.insert(userPay);
-
-
-        //用户图片信息
-        List<UserImages> userImagesList = new ArrayList<>();
-        for (int i = 0; i < 3; i++) {
-            UserImages userImages = new UserImages();
-            userImages.setUserId(userInfo.getId());
-            switch(i){
-                case 0 :
-                    userImages.setFileUrl(userDto.getIdCardFrontUrl());
-                    userImages.setFilePath(userDto.getIdCardFrontPath());
-                    userImages.setImageType(1l);
-                    userImagesList.add(userImages);
-                    break;
-                case 1 :
-                    userImages.setFileUrl(userDto.getIdCardReverseUrl());
-                    userImages.setFilePath(userDto.getIdCardReversePath());
-                    userImages.setImageType(2l);
-                    userImagesList.add(userImages);
-                    break;
-                case 2 :
-                    userImages.setFileUrl(userDto.getFacesUrl());
-                    userImages.setFilePath(userDto.getFacesPath());
-                    userImages.setImageType(3l);
-                    userImagesList.add(userImages);
-                    break;
-                default :
-                    break;
-            }
-        }
-        userImagesService.saveBatch(userImagesList);
-
-        return Response.success(userInfo);
-
-    }
-
-    /**
-     * 注册报名获取短信验证码
-     * @param phone
-     * @return
-     */
-    @Override
-    public Response sendSignUpVerificationCode(String phone) {
-        SmsParameter smsParameter = new SmsParameter();
-        smsParameter.setPhone(phone);
-        smsParameter.setType("signUp");
-
-        return smsService.sendVerificationCode(smsParameter);
-    }
-
-
-    /**
-     * 修改手机号获取短信验证码
-     * @param user
-     * @param phone
-     * @return
-     */
-    @Override
-    public Response sendModifyVerificationCode(SysUser user, String phone) {
-        if (user.getPhonenumber().equals(phone)){
-            throw new CustomException("该手机号与当前绑定的手机号相同!");
-        }
-
-        SmsParameter smsParameter = new SmsParameter();
-        smsParameter.setPhone(phone);
-        smsParameter.setType("modify");
-
-        return smsService.sendVerificationCode(smsParameter);
-    }
-
-    /**
-     * 获取我的报名信息
-     * @param userId
-     * @return
-     */
-    @Override
-    public Response getMyRegistrationInformation(String userId) {
-        UserVo userVo = userInfoMapper.getMyRegistrationInformation(userId);
-        return Response.success(userVo);
-    }
-
-
-}

jsjp-service/src/main/java/com/miaxis/user/service/impl/UserRegisterServiceImpl.java

@@ -1,94 +0,0 @@
-package com.miaxis.user.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.user.domain.UserRegister;
-import com.miaxis.user.mapper.UserRegisterMapper;
-import com.miaxis.user.service.IUserRegisterService;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-/**
- * 用户报名信息Service业务层处理
- *
- * @author miaxis
- * @date 2020-12-25
- */
-@Service
-public class UserRegisterServiceImpl extends ServiceImpl<UserRegisterMapper, UserRegister> implements IUserRegisterService {
-
-    @Resource
-    private UserRegisterMapper userRegisterMapper;
-
-    /**
-     * 查询用户报名信息
-     *
-     * @param id 用户报名信息ID
-     * @return 用户报名信息
-     */
-    @Override
-    public UserRegister selectUserRegisterById(Long id){
-        return userRegisterMapper.selectUserRegisterById(id);
-    }
-
-    /**
-     * 查询用户报名信息列表
-     *
-     * @param userRegister 用户报名信息
-     * @return 用户报名信息
-     */
-    @Override
-    public List<UserRegister> selectUserRegisterList(UserRegister userRegister){
-        return userRegisterMapper.selectUserRegisterList(userRegister);
-    }
-
-    /**
-     * 新增用户报名信息
-     *
-     * @param userRegister 用户报名信息
-     * @return 结果
-     */
-    @Override
-    public int insertUserRegister(UserRegister userRegister){
-        userRegister.setCreateTime(DateUtils.getNowDate());
-        return userRegisterMapper.insertUserRegister(userRegister);
-    }
-
-    /**
-     * 修改用户报名信息
-     *
-     * @param userRegister 用户报名信息
-     * @return 结果
-     */
-    @Override
-    public int updateUserRegister(UserRegister userRegister){
-        userRegister.setUpdateTime(DateUtils.getNowDate());
-        return userRegisterMapper.updateUserRegister(userRegister);
-    }
-
-    /**
-     * 批量删除用户报名信息
-     *
-     * @param ids 需要删除的用户报名信息ID
-     * @return 结果
-     */
-    @Override
-    public int deleteUserRegisterByIds(Long[] ids){
-        return userRegisterMapper.deleteUserRegisterByIds(ids);
-    }
-
-    /**
-     * 删除用户报名信息信息
-     *
-     * @param id 用户报名信息ID
-     * @return 结果
-     */
-    @Override
-    public int deleteUserRegisterById(Long id){
-        return userRegisterMapper.deleteUserRegisterById(id);
-    }
-}

jsjp-service/src/main/java/com/miaxis/user/vo/UserVo.java

@@ -1,33 +0,0 @@
-package com.miaxis.user.vo;
-
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 报名信息VO
- * @Author wwl
- * @Date 2020/12/28
- * @Version 1.0
- */
-@Data
-public class UserVo extends BaseBusinessEntity {
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "手机号码")
-    private String mobile;
-
-    @ApiModelProperty(value = "报名时间")
-    private String createDate;
-
-    @ApiModelProperty(value = "驾校名称")
-    private String schoolName;
-
-    @ApiModelProperty(value = "驾校班型名称")
-    private String className;
-
-    @ApiModelProperty(value = "驾校班型价格")
-    private String Price;
-}

jsjp-service/src/main/java/com/miaxis/userInfo/domain/UserVip.java

@@ -0,0 +1,76 @@
+package com.miaxis.userInfo.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 会员信息对象 user_vip
+ *
+ * @author miaxis
+ * @date 2022-06-02
+ */
+@Data
+@TableName("user_vip")
+@ApiModel(value = "UserVip", description = "会员信息对象 user_vip")
+public class UserVip extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    @TableField("user_id")
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    /** 用户姓名 */
+    @Excel(name = "用户姓名")
+    @TableField("user_name")
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    /** 科目一到时时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "科目一到时时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("subject1")
+    @ApiModelProperty(value = "科目一到时时间")
+    private Date subject1;
+
+    /** 科目二到时时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "科目二到时时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("subject2")
+    @ApiModelProperty(value = "科目二到时时间")
+    private Date subject2;
+
+    /** 科目三到期时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "科目三到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("subject3")
+    @ApiModelProperty(value = "科目三到期时间")
+    private Date subject3;
+
+    /** 科目四到时时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "科目四到时时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("subject4")
+    @ApiModelProperty(value = "科目四到时时间")
+    private Date subject4;
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/userInfo/dto/UserVipDTO.java

@@ -0,0 +1,25 @@
+package com.miaxis.userInfo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 学员基本信息表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+@Data
+public class UserVipDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/userInfo/mapper/UserVipMapper.java

@@ -0,0 +1,26 @@
+package com.miaxis.userInfo.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.dto.UserVipDTO;
+
+/**
+ * 会员信息Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-06-02
+ */
+public interface UserVipMapper extends BaseMapper<UserVip> {
+    /**
+     * 查询会员信息列表
+     *
+     * @param userVip 会员信息
+     * @return 会员信息集合
+     */
+    public List<UserVip> selectUserVipList(UserVip userVip);
+
+    UserVip getUserVipByUserId(Long userId);
+
+    int removeByUserId(Long userId);
+}

jsjp-service/src/main/java/com/miaxis/userInfo/service/IUserVipService.java

@@ -0,0 +1,28 @@
+package com.miaxis.userInfo.service;
+
+import java.util.List;
+import com.miaxis.userInfo.domain.UserVip;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.userInfo.dto.UserVipDTO;
+
+/**
+ * 会员信息Service接口
+ *
+ * @author miaxis
+ * @date 2022-06-02
+ */
+public interface IUserVipService extends IService<UserVip> {
+    /**
+     * 查询会员信息列表
+     *
+     * @param userVip 会员信息
+     * @return 会员信息集合
+     */
+    public List<UserVip> selectUserVipList(UserVip userVip);
+
+
+    public UserVip getUserVipByUserId(Long userId);
+
+    public int removeByUserId(Long userId);
+}
+

jsjp-service/src/main/java/com/miaxis/userInfo/service/impl/UserVipServiceImpl.java

@@ -0,0 +1,45 @@
+package com.miaxis.userInfo.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.userInfo.domain.UserVip;
+import com.miaxis.userInfo.dto.UserVipDTO;
+import com.miaxis.userInfo.mapper.UserVipMapper;
+import com.miaxis.userInfo.service.IUserVipService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 会员信息Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-06-02
+ */
+@Service
+public class UserVipServiceImpl extends ServiceImpl<UserVipMapper, UserVip> implements IUserVipService {
+    @Autowired
+    private UserVipMapper userVipMapper;
+
+    /**
+     * 查询会员信息列表
+     *
+     * @param userVip 会员信息
+     * @return 会员信息
+     */
+    @Override
+    public List<UserVip> selectUserVipList(UserVip userVip){
+        return userVipMapper.selectUserVipList(userVip);
+    }
+
+    @Override
+    public UserVip getUserVipByUserId(Long userId) {
+        return userVipMapper.getUserVipByUserId(userId);
+    }
+
+    @Override
+    public int removeByUserId(Long userId) {
+        return userVipMapper.removeByUserId(userId);
+    }
+
+}

jsjp-service/src/main/java/com/miaxis/userInfo/vo/UserVipVO.java

@@ -0,0 +1,54 @@
+package com.miaxis.userInfo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 视频VIP表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class UserVipVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject1;
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject2;
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject3;
+
+    @ApiModelProperty(value = "科目3  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject4;
+
+    @ApiModelProperty(value = "签名")
+    private String sign;
+
+
+}

jsjp-service/src/main/resources/mapper/activities/ActivitiesTmallMapper.xml

@@ -1,40 +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="com.miaxis.activities.mapper.ActivitiesTmallMapper">
-
-    <resultMap type="ActivitiesTmall" id="ActivitiesTmallResult">
-        <result property="id"    column="id"    />
-        <result property="tmallNo"    column="tmall_no"    />
-        <result property="isExchange"    column="is_exchange"    />
-        <result property="exchangeTime"    column="exchange_time"    />
-        <result property="activitiesType"    column="activities_type"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectActivitiesTmallVo">
-        select * from activities_tmall
-    </sql>
-
-    <select id="selectActivitiesTmallList" parameterType="ActivitiesTmall" resultMap="ActivitiesTmallResult">
-        <include refid="selectActivitiesTmallVo"/>
-        <where>
-            <if test="tmallNo != null  and tmallNo != ''"> and tmall_no = #{tmallNo}</if>
-            <if test="isExchange != null "> and is_exchange = #{isExchange}</if>
-            <if test="exchangeTime != null "> and exchange_time = #{exchangeTime}</if>
-            <if test="activitiesType != null "> and activities_type = #{activitiesType}</if>
-        </where>
-    </select>
-
-
-    <select id="getByTmallNoWithPhoneBill" parameterType="string" resultType="com.miaxis.activities.domain.ActivitiesTmall">
-        select * from activities_tmall
-        <where>
-            activities_type =1 and
-            tmall_no = #{tmallNo}
-        </where>
-    </select>
-
-</mapper>

jsjp-service/src/main/resources/mapper/carousel/HomePageDataInfoMapper.xml

@@ -1,78 +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="com.miaxis.carousel.mapper.HomePageDataInfoMapper">
-
-    <resultMap type="HomePageDataInfo" id="HomePageDataInfoResult">
-        <result property="id"    column="id"    />
-        <result property="pictureName"    column="picture_name"    />
-        <result property="fileId"    column="file_id"    />
-        <result property="jump_url"    column="jumpUrl"    />
-        <result property="jump_url_type"    column="jumpUrlType"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="weight"    column="weight"    />
-        <result property="dataType"    column="data_type"    />
-        <result property="dataDescribe"    column="data_describe"    />
-        <result property="status"    column="status"    />
-    </resultMap>
-
-    <sql id="selectHomePageDataInfoVo">
-        select id, picture_name, file_id ,jump_url, jump_url_type, create_time, update_time, weight,data_type,data_describe, status from home_page_data_info
-    </sql>
-
-    <select id="selectHomePageDataInfoList" resultType="com.miaxis.carousel.vo.HomePageDataInfoVo">
-        select
-        ci.id,
-        ci.file_id as fileId,
-        ci.picture_name as pictureName,
-        ci.jump_url as jumpUrl,
-        ci.jump_url_type as jumpUrlType,
-        f.file_url as fileUrl,
-        ci.weight,
-        ci.`data_type` as dataType,
-        ci.`data_describe` as dataDescribe,
-        ci.status
-        from home_page_data_info ci
-        LEFT JOIN file_info f on f.file_id = ci.file_id
-        <where>
-            <if test="pictureName != null  and pictureName != ''"> and picture_name like concat('%', #{pictureName}, '%')</if>
-            <if test="fileId != null "> and file_id = #{fileId}</if>
-            <if test="dataType != null and dataType != ''"> and data_type = #{dataType}</if>
-            <if test="status != null and status != ''"> and status = #{status}</if>
-        </where>
-        ORDER BY ci.weight DESC
-    </select>
-
-    <select id="getHomePageDataById" resultType="com.miaxis.carousel.vo.HomePageDataInfoVo">
-        select
-        ci.id,
-        ci.file_id as fileId,
-        ci.picture_name as pictureName,
-        ci.jump_url as jumpUrl,
-        ci.jump_url_type as jumpUrlType,
-        f.file_url as fileUrl,
-        ci.weight,
-        ci.`data_type` as dataType,
-        ci.`data_describe` as dataDescribe,
-        ci.status
-        from home_page_data_info ci
-        LEFT JOIN file_info f on f.file_id = ci.file_id
-        where ci.id = #{id}
-    </select>
-
-
-
-    <update id="updateHomePageDataByPictureName" parameterType="com.miaxis.carousel.vo.HomePageDataInfoVo">
-        update home_page_data_info f
-        <set>
-            <if test="jumpUrl!=null">
-                f.jump_url= #{jumpUrl}
-            </if>
-        </set>
-        where f.picture_name = #{pictureName}
-    </update>
-
-
-</mapper>

jsjp-service/src/main/resources/mapper/file/FileInfoMapper.xml

@@ -1,31 +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="com.miaxis.file.mapper.FileInfoMapper">
-
-    <resultMap type="FileInfo" id="FileInfoResult">
-        <result property="fileId"    column="file_id"    />
-        <result property="seq"    column="seq"    />
-        <result property="fileType"    column="file_type"    />
-        <result property="fileUrl"    column="file_url"    />
-        <result property="filePath"    column="file_path"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectFileInfoVo">
-        select file_id, seq, file_url, file_path, create_time, update_time from file_info
-    </sql>
-
-    <select id="selectFileInfoList" parameterType="FileInfo" resultMap="FileInfoResult">
-        <include refid="selectFileInfoVo"/>
-        <where>
-            <if test="seq != null "> and seq = #{seq}</if>
-            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
-            <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
-            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
-        </where>
-    </select>
-
-</mapper>

jsjp-service/src/main/resources/mapper/fulu/FuluCommodityInfoMapper.xml

@@ -1,80 +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="com.miaxis.fulu.mapper.FuluCommodityInfoMapper">
-
-    <resultMap type="FuluCommodityInfo" id="FuluCommodityInfoResult">
-        <result property="id"    column="id"    />
-        <result property="iconId"    column="icon_id"    />
-        <result property="name"    column="name"    />
-        <result property="introduction"    column="introduction"    />
-        <result property="remark"    column="remark"    />
-        <result property="productIds"    column="product_ids"    />
-        <result property="fuluGoodsType"    column="fulu_goods_type"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectFuluCommodityInfoVo">
-        select * from fulu_commodity_info
-    </sql>
-
-    <select id="selectFuluCommodityInfoList" resultType="com.miaxis.fulu.vo.FuluCommodityInfoVo">
-        select
-        ci.id,
-        ci.`name`,
-        ci.introduction,
-        ci.`remark`,
-        f.file_url AS iconUrl,
-        ci.product_ids,
-        ci.fulu_goods_type,
-        dd.dict_label as fuluGoodsTypeName,
-        ci.create_time,
-        ci.update_time,
-        ci.`status`
-        from fulu_commodity_info ci
-        LEFT JOIN file_info f on f.file_id = ci.icon_id
-        LEFT JOIN sys_dict_data dd ON dd.dict_type = 'fulu_goods_type' and dd.dict_value = ci.fulu_goods_type
-        <where>
-            <if test="name != null  and name != ''"> and ci.name like concat('%', #{name}, '%')</if>
-            <if test="productIds != null  and productIds != ''"> and ci.product_ids like concat('%', #{productIds}, '%')</if>
-            <if test="fuluGoodsType != null "> and ci.fulu_goods_type = #{fuluGoodsType}</if>
-            <if test="status != null  and status != ''"> and ci.status = #{status}</if>
-        </where>
-    </select>
-
-
-    <select id="getFuLuById" resultType="com.miaxis.fulu.vo.FuluCommodityInfoVo">
-        select
-        ci.id,
-        ci.`name`,
-        ci.introduction,
-        ci.`remark`,
-        f.file_url AS iconUrl,
-        ci.product_ids,
-        ci.fulu_goods_type,
-        ci.`status`
-        from fulu_commodity_info ci
-        LEFT JOIN file_info f on f.file_id = ci.icon_id
-        LEFT JOIN sys_dict_data dd ON dd.dict_type = 'fulu_goods_type' and dd.dict_value = ci.fulu_goods_type
-        where ci.id = #{id}
-    </select>
-
-    <select id="getFuluDataList" resultType="com.miaxis.fulu.vo.FuluCommodityInfoVo">
-        select
-        ci.id,
-        ci.`name`,
-        ci.introduction,
-        ci.`remark`,
-        f.file_url AS iconUrl,
-        ci.product_ids,
-        ci.fulu_goods_type,
-        ci.`status`
-        from fulu_commodity_info ci
-        LEFT JOIN file_info f on f.file_id = ci.icon_id
-        where ci.status = '0'
-    </select>
-
-</mapper>

jsjp-service/src/main/resources/mapper/newgzpt/GzptUserInfoMapper.xml

@@ -18,4 +18,17 @@
     <select id="getInfoById"  resultType="com.miaxis.newgzpt.domain.GzptUserInfo">
         select * from GZPT_USER_INFO where id =#{id}
     </select>
+
+
+    <select id="getGzptVideoVipByUserId" resultType="com.miaxis.newgzpt.domain.GzptVideoVip" parameterType="com.miaxis.userInfo.dto.UserVipDTO">
+        select * from GZPT_VIDEO_VIP
+        <where>
+            and user_id = #{userId}
+        </where>
+    </select>
+
+    <delete id="removeByUserId" parameterType="long">
+        delete from user_vip where user_id = #{userId}
+    </delete>
+
 </mapper>

jsjp-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -1,71 +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="com.miaxis.user.mapper.UserInfoMapper">
-
-    <resultMap type="UserInfo" id="UserInfoResult">
-        <result property="id"    column="id"    />
-        <result property="inscode"    column="inscode"    />
-        <result property="name"    column="name"    />
-        <result property="sex"    column="sex"    />
-        <result property="cardtype"    column="cardtype"    />
-        <result property="idcard"    column="idcard"    />
-        <result property="birthday"    column="birthday"    />
-        <result property="phone"    column="phone"    />
-        <result property="password"    column="password"    />
-        <result property="wechar"    column="wechar"    />
-        <result property="openid"    column="openid"    />
-        <result property="busitype"    column="busitype"    />
-        <result property="perdritype"    column="perdritype"    />
-        <result property="traintype"    column="traintype"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="coachnum"    column="coachnum"    />
-        <result property="status"    column="status"    />
-        <result property="photo"    column="photo"    />
-        <result property="schoolClassTypeId"    column="school_class_type_id"    />
-    </resultMap>
-
-    <sql id="selectUserInfoVo">
-        select id, name, sex, cardtype, idcard, birthday, phone, password,  wechar, openid, busitype, perdritype, traintype, create_time, update_time, coachnum, status,photo,school_class_type_id from user_info
-    </sql>
-
-
-    <select id="selectUserInfoById" parameterType="Long" resultMap="UserInfoResult">
-        <include refid="selectUserInfoVo"/>
-        where id = #{id}
-    </select>
-
-    <select id="selectUserInfoByMobile"  resultMap="UserInfoResult">
-        <include refid="selectUserInfoVo"/>
-        where phone = #{phone}
-    </select>
-
-    <delete id="deleteUserInfoById" parameterType="Long">
-        delete from user_info where id = #{id}
-    </delete>
-
-    <delete id="deleteUserInfoByIds" parameterType="String">
-        delete from user_info where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="getMyRegistrationInformation" resultType="UserVo">
-        SELECT
-        u.name,
-        u.phone,
-        DATE_FORMAT(u.create_time,'%Y-%m-%d %H:%i:%s') AS createDate,
-        s.name as schoolName,
-        sct.class_name as className,
-        sct.total_price as price
-        FROM
-        user_info u
-        LEFT JOIN sys_dept s ON s.inscode = u.inscode
-        LEFT JOIN school_class_type sct ON sct.id = u.school_class_type_id
-        where u.id = #{userId}
-    </select>
-
-</mapper>

jsjp-service/src/main/resources/mapper/user/UserRegisterMapper.xml

@@ -1,87 +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="com.miaxis.user.mapper.UserRegisterMapper">
-
-    <resultMap type="UserRegister" id="UserRegisterResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="inscode"    column="inscode"    />
-        <result property="bmcx"    column="bmcx"    />
-        <result property="coachnum"    column="coachnum"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="classId"    column="class_id"    />
-    </resultMap>
-
-    <sql id="selectUserRegisterVo">
-        select id, user_id, create_time, inscode, bmcx, coachnum, update_time, class_id from user_register
-    </sql>
-
-    <select id="selectUserRegisterList" parameterType="UserRegister" resultMap="UserRegisterResult">
-        <include refid="selectUserRegisterVo"/>
-        <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="inscode != null  and inscode != ''"> and inscode = #{inscode}</if>
-            <if test="bmcx != null  and bmcx != ''"> and bmcx = #{bmcx}</if>
-            <if test="coachnum != null  and coachnum != ''"> and coachnum = #{coachnum}</if>
-            <if test="classId != null "> and class_id = #{classId}</if>
-        </where>
-    </select>
-
-    <select id="selectUserRegisterById" parameterType="Long" resultMap="UserRegisterResult">
-        <include refid="selectUserRegisterVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertUserRegister" parameterType="UserRegister">
-        insert into user_register
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="inscode != null">inscode,</if>
-            <if test="bmcx != null">bmcx,</if>
-            <if test="coachnum != null">coachnum,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="classId != null">class_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="inscode != null">#{inscode},</if>
-            <if test="bmcx != null">#{bmcx},</if>
-            <if test="coachnum != null">#{coachnum},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="classId != null">#{classId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateUserRegister" parameterType="UserRegister">
-        update user_register
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="inscode != null">inscode = #{inscode},</if>
-            <if test="bmcx != null">bmcx = #{bmcx},</if>
-            <if test="coachnum != null">coachnum = #{coachnum},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="classId != null">class_id = #{classId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteUserRegisterById" parameterType="Long">
-        delete from user_register where id = #{id}
-    </delete>
-
-    <delete id="deleteUserRegisterByIds" parameterType="String">
-        delete from user_register where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-</mapper>

jsjp-service/src/main/resources/mapper/userInfo/UserVipMapper.xml

@@ -0,0 +1,48 @@
+<?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.userInfo.mapper.UserVipMapper">
+
+    <resultMap type="UserVip" id="UserVipResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="subject1"    column="subject1"    />
+        <result property="subject2"    column="subject2"    />
+        <result property="subject3"    column="subject3"    />
+        <result property="subject4"    column="subject4"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectUserVipVo">
+        select * from user_vip
+    </sql>
+
+    <select id="selectUserVipList" parameterType="UserVip" resultMap="UserVipResult">
+        <include refid="selectUserVipVo"/>
+        <where>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="subject1 != null "> and subject1 = #{subject1}</if>
+            <if test="subject2 != null "> and subject2 = #{subject2}</if>
+            <if test="subject3 != null "> and subject3 = #{subject3}</if>
+            <if test="subject4 != null "> and subject4 = #{subject4}</if>
+        </where>
+    </select>
+
+    <delete id="removeByUserId" parameterType="long">
+        delete from user_vip where user_id = #{userId}
+    </delete>
+
+
+    <select id="getUserVipByUserId" resultType="com.miaxis.userInfo.domain.UserVip" parameterType="com.miaxis.userInfo.dto.UserVipDTO">
+        select * from user_vip
+        <where>
+            and user_id = #{userId}
+        </where>
+    </select>
+
+
+</mapper>