微信支付

jsjp-admin/src/main/java/com/miaxis/app/controller/car/AppletCarController.java

@@ -1,37 +0,0 @@
-package com.miaxis.app.controller.car;
-
-import com.miaxis.car.service.ICarBrandInfoService;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/5/24 10:10
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/car")
-@Api(tags={"【小程序-汽车品牌】"})
-public class AppletCarController extends BaseController {
-
-    private final ICarBrandInfoService carBrandInfoService;
-
-    /**
-     * 查询汽车品牌列表
-     */
-    @GetMapping("/list")
-    @ApiOperation("查询汽车品牌列表")
-    public Response list(){
-        return carBrandInfoService.selectCarBrandInfoList();
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/car/AppletUsedCarInfoController.java

@@ -1,111 +0,0 @@
-package com.miaxis.app.controller.car;
-
-import com.miaxis.car.domain.UsedCarInfo;
-import com.miaxis.car.dto.UsedCarInfoDto;
-import com.miaxis.car.service.IUsedCarInfoService;
-import com.miaxis.common.annotation.Log;
-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.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 二手车 Controller
- * @author wwl
- * @version 1.0
- * @date 2021/5/27 13:32
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/usedCar")
-@Api(tags={"【小程序-二手车】"})
-public class AppletUsedCarInfoController extends BaseController {
-
-    private final IUsedCarInfoService usedCarInfoService;
-
-    /**
-     * 查询二手车参数列表
-     */
-    @GetMapping("/dictDataCarList/{parameterTypes}")
-    @ApiOperation("查询二手车参数列表")
-    public Response dictDataCarList(@ApiParam(name = "parameterTypes",value = "参数类型",required = true)
-                                    @PathVariable("parameterTypes") String[] parameterTypes){
-        return usedCarInfoService.selectDictDataCarList(parameterTypes);
-    }
-
-    /**
-     * 查询二手车列表
-     */
-    @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<UsedCarInfo> list(@ModelAttribute UsedCarInfo usedCarInfo){
-        startPage();
-        List<UsedCarInfo> list = usedCarInfoService.selectUsedCarInfoList(usedCarInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 发布二手车
-     */
-    @PostMapping
-    @ApiOperation("发布二手车")
-    public Response add(@RequestBody UsedCarInfoDto usedCarInfoDto){
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        usedCarInfoDto.setUserId(userInfo.getId());
-        return usedCarInfoService.saveUsedCarInfo(usedCarInfoDto);
-    }
-
-
-    /**
-     * 编辑二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    @PutMapping
-    @ApiOperation("编辑二手车")
-    public Response edit(@RequestBody UsedCarInfoDto usedCarInfoDto){
-        return usedCarInfoService.editUsedCarById(usedCarInfoDto);
-    }
-
-
-    /**
-     * 二手商品详细信息
-     */
-    @GetMapping(value = "/{id}")
-    @ApiOperation("二手商品详细信息")
-    public Response getInfo(
-            @ApiParam(name = "id", value = "首页数据id", required = true)
-            @PathVariable("id") Long id
-    ){
-        return usedCarInfoService.getUsedCarById(id);
-    }
-
-
-    /**
-     * 删除二手车(伪删除)
-     */
-    @Log(title = "删除二手车", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除二手车")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "二手车ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return usedCarInfoService.removeUsedCarByIds(ids);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/carousel/AppletHomePageDataInfoController.java

@@ -1,52 +0,0 @@
-package com.miaxis.app.controller.carousel;
-
-import com.miaxis.carousel.service.IHomePageDataInfoService;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-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;
-
-/**
- * 【小程序-首页数据】Controller
- * @author wwl
- * @version 1.0
- * @date 2021/4/16 16:13
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/homePage")
-@Api(tags = {"【小程序-首页数据】"})
-public class AppletHomePageDataInfoController extends BaseController {
-
-    private final IHomePageDataInfoService homePageDataInfoService;
-
-    /**
-     * 查询首页数据列表
-     */
-    @GetMapping(value = "/getHomePageDataList")
-    @ApiOperation("查询首页数据列表")
-    public Response getHomePageDataList() {
-
-        return homePageDataInfoService.getHomePageDataList();
-    }
-
-
-    /**
-     * 查询首页数据列表--字典参数
-     */
-    @GetMapping("/dictValueHomePageDataList/{dictValues}")
-    @ApiOperation("查询首页数据列表--字典参数")
-    public Response dictValueHomePageDataList(@ApiParam(name = "dictValues",value = "字典参数",required = true)
-                                    @PathVariable("dictValues") String[] dictValues){
-        return homePageDataInfoService.dictValueHomePageDataList(dictValues);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/collection/AppletCollectionInfoController.java

@@ -1,103 +0,0 @@
-package com.miaxis.app.controller.collection;
-
-import com.miaxis.collection.service.ICollectionInfoService;
-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.core.page.ResponsePageInfo;
-import com.miaxis.common.utils.SecurityUtils;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-
-/**
- * 【小程序-收藏管理】Controller
- *
- * @author miaxis
- * @date 2021-03-10
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/collection")
-@Api(tags = {"【小程序-收藏管理】"})
-public class AppletCollectionInfoController extends BaseController {
-
-    private final ICollectionInfoService collectionInfoService;
-
-
-    /**
-     * 查询用户收藏列表
-     */
-    @GetMapping("/collectionList")
-    @ApiOperation("查询用户收藏列表")
-    @ApiImplicitParam(name = "collectionType", value = "收藏类别", dataType = "string", required = true)
-    public Response collectionList(String collectionType) {
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return collectionInfoService.collectionList(userInfo,collectionType);
-    }
-
-    /**
-     * 通用收藏接口
-     * @param id
-     * @param collectionType
-     * @return
-     */
-    @PutMapping(value = Constants.STUDENT_PREFIX+"/collectionBusiness")
-    @ApiOperation("通用收藏接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "收藏id", dataType = "int", required = true),
-            @ApiImplicitParam(name = "collectionType", value = "收藏类别", dataType = "string", required = true),
-    })
-    public Response collectionOperation(Long id, String collectionType){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return collectionInfoService.collectionOperation(userInfo,id,collectionType);
-    }
-
-    /**
-     * 通用取消收藏
-     */
-    @DeleteMapping(value = "/collectionCancel/{ids}")
-    @ApiOperation("通用取消收藏")
-    public Response collectionCancel(
-            @ApiParam(name = "ids", value = "ids", required = true)
-            @PathVariable("ids") Long[] ids
-    ){
-        return toResponse(collectionInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-
-
-    /**
-     * 收藏商家
-     */
-    @PutMapping(value = "/collectionBusiness/{id}")
-    @ApiOperation("收藏商家")
-    public Response collectionBusiness(
-            @ApiParam(name = "id",value = "商家id",required = true)
-            @PathVariable("id") Long id
-    ){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return collectionInfoService.collectionBusiness(userInfo,id);
-    }
-
-    /**
-     * 取消收藏商家
-     */
-    @DeleteMapping(value = "/cancelCollection/{ids}")
-    @ApiOperation("取消收藏")
-    public Response cancelCollection(
-            @ApiParam(name = "ids", value = "商家id", required = true)
-            @PathVariable Long[] ids
-    ){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return collectionInfoService.removeCollectionByIds(userInfo.getId(),ids);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/customer/AppletCustomerInfoController.java

@@ -1,50 +0,0 @@
-package com.miaxis.app.controller.customer;
-
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.customer.dto.AppletCustomerInfoDto;
-import com.miaxis.customer.service.ICustomerInfoService;
-import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【小程序-客户信息】Controller
- *
- * @author miaxis
- * @date 2021-03-10
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/customer")
-@Api(tags = {"【小程序-客户信息】"})
-public class AppletCustomerInfoController extends BaseController {
-
-    private final ICustomerInfoService customerInfoService;
-
-
-    /**
-     * 查询商家列表
-     */
-    @GetMapping(value = "/getCustomerListByProductId/{id}")
-    @ApiOperation("查询商家列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<ExhibitionCustomerInfoVo> getCustomerListByProductId(@ModelAttribute AppletCustomerInfoDto appletCustomerInfoDto) {
-        startPage();
-        //获取当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        List<ExhibitionCustomerInfoVo> list = customerInfoService.getCustomerListByProductId(appletCustomerInfoDto,userInfo.getId());
-        return toResponsePageInfo(list);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/dict/DictCityController.java

@@ -1,58 +0,0 @@
-package com.miaxis.app.controller.dict;
-
-import com.miaxis.common.constant.Constants;
-import java.util.List;
-import java.util.Arrays;
-import io.swagger.annotations.*;
-import com.miaxis.common.core.domain.Response;
-import org.springframework.security.access.prepost.PreAuthorize;
-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.dict.domain.DictCity;
-import com.miaxis.dict.service.IDictCityService;
-import com.miaxis.common.utils.poi.ExcelUtil;
-import com.miaxis.common.core.page.ResponsePageInfo;
-
-/**
- * 【全国城市】Controller
- *
- * @author miaxis
- * @date 2021-03-18
- */
-@RestController
-@RequestMapping(Constants.STUDENT_PREFIX+"/dict/city")
-@Api(tags={"【小程序-全国城市】"})
-public class DictCityController extends BaseController{
-    @Autowired
-    private IDictCityService dictCityService;
-
-    /**
-     * 查询全国城市列表
-     */
-
-    @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<DictCity> list(@ModelAttribute DictCity dictCity){
-        startPage();
-        List<DictCity> list = dictCityService.selectDictCityList(dictCity);
-        return toResponsePageInfo(list);
-    }
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/film/FilmController.java

@@ -1,109 +0,0 @@
-package com.miaxis.app.controller.film;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.feign.dto.FilmDTO;
-import com.miaxis.wx.service.IWxOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import static com.miaxis.common.constant.Constants.FILM_BLACK_LIST;
-
-/**
- * 【小程序-客户信息】Controller
- *
- * @author miaxis
- * @date 2021-03-10
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/film/order")
-@Api(tags = {"【小程序-电影】"})
-@Slf4j
-public class FilmController extends BaseController {
-
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-    /**
-     * 以form表单形式提交数据，发送post请求
-     * @explain
-     *   1.请求头：httppost.setHeader("Content-Type","application/x-www-form-urlencoded")
-     *   2.提交的数据格式：key1=value1&key2=value2...
-     * @return 服务器返回数据
-     */
-    @PostMapping(value = "/fileCommonApi")
-    @ApiOperation("电影通用接口")
-    public  Response<JSONObject>  httpPostWithForm(@RequestBody FilmDTO filmDTO) throws IOException {
-
-        //检查api
-        if (Arrays.asList(FILM_BLACK_LIST).contains(filmDTO.getUrl())){
-            throw new CustomException("该api不允许用户直接访问");
-        }
-        // 用于接收返回的结果
-        String resultData = wxOrderService.excuteFilmApi(filmDTO);
-        return Response.success(JSONObject.parseObject(resultData));
-    }
-
-
-
-
-
-
-
-
-
-
-
-//    /**
-//     * 微信支付查单接口
-//     */
-//    @GetMapping(value = "/wxorder/{outTradeNo}")
-//    @ApiOperation("根据订单号查询订单状态")
-//    public Response<String> getOrderInfo(
-//            @ApiParam(name = "outTradeNo", value = "商户订单号", required = true)
-//            @PathVariable("outTradeNo") String outTradeNo
-//    ) throws IOException {
-//        HttpGet get = new HttpGet("https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/"
-//                +outTradeNo+"?mchid="+wxpayConfig.getMerchantId());
-//        get.addHeader("Accept", "application/json");
-//        HttpResponse response = httpClient.execute(get);
-//        String bodyAsString = EntityUtils.toString(response.getEntity());
-//        JSONObject jsonObject = JSONObject.parseObject(bodyAsString);
-//        int statusCode = response.getStatusLine().getStatusCode();
-//        if (statusCode == 200) {
-//            return Response.success(jsonObject.getString("trade_state"));
-//        } else {
-//            throw new CustomException(EntityUtils.toString(response.getEntity()));
-//        }
-//    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/film/FilmNotifyController.java

@@ -1,193 +0,0 @@
-package com.miaxis.app.controller.film;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.common.config.WxpayConfig;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.enums.OrderStatusEnum;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.feign.dto.WxSend;
-import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.dto.FilmWxOrderJsonData;
-import com.miaxis.wx.dto.WxOrderNotifyDTO;
-import com.miaxis.wx.service.IRefundRecordService;
-import com.miaxis.wx.service.IWxOrderService;
-import com.miaxis.wx.service.IWxXcxMessageService;
-import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
-
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.OPEN_PREFIX+"/film/notify")
-@Api(tags = {"【小程序-电影回调】"})
-@Slf4j
-public class FilmNotifyController {
-
-
-    @Autowired
-    private WxpayConfig wxpayConfig;
-
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-    @Autowired
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-    @Autowired
-    private  IRefundRecordService  refundRecordService;
-
-    @Autowired
-    IWxXcxMessageService wxXcxMessageService;
-
-    @Resource
-    private IWxSendService wxSendService;
-
-
-
-    /**
-     * 电影回调接口
-     */
-    @PostMapping(value = "/filmOrder")
-    @ApiOperation("电影订单回调")
-    public FilmNotifyReturnDTO wxOrderNotify(WxOrderNotifyDTO wxOrderNotifyDTO ,String sign, String appKey) {
-        log.info("电影回调订单:"+wxOrderNotifyDTO.getThirdOrderId()+",入参:"+JSONObject.toJSONString(wxOrderNotifyDTO));
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo(wxOrderNotifyDTO.getThirdOrderId());
-       //todo 检查sign
-        String orderDataJson = wxOrder.getOrderDataJson();
-        FilmWxOrderJsonData wxOrderJsonData = JSONObject.parseObject(orderDataJson, FilmWxOrderJsonData.class);
-        WxOrderNotifyDTO dbWxOrderNotifyDTO= wxOrderJsonData.getWxOrderNotifyDTO();
-        if (dbWxOrderNotifyDTO == null){
-            dbWxOrderNotifyDTO = wxOrderNotifyDTO;
-        }else{
-            dbWxOrderNotifyDTO.setEventName(wxOrderNotifyDTO.getEventName());
-            if (wxOrderNotifyDTO.getOrderPrice()!= null)
-                dbWxOrderNotifyDTO.setOrderPrice(wxOrderNotifyDTO.getOrderPrice());
-            if (wxOrderNotifyDTO.getCloseCause()!= null)
-                dbWxOrderNotifyDTO.setCloseCause(wxOrderNotifyDTO.getCloseCause());
-            if (wxOrderNotifyDTO.getRealSeat()!= null)
-                dbWxOrderNotifyDTO.setRealSeat(wxOrderNotifyDTO.getRealSeat());
-            if (wxOrderNotifyDTO.getTicketCode()!= null)
-                dbWxOrderNotifyDTO.setTicketCode(wxOrderNotifyDTO.getTicketCode());
-            if (wxOrderNotifyDTO.getTicketImage()!= null)
-                dbWxOrderNotifyDTO.setTicketImage(wxOrderNotifyDTO.getTicketImage());
-        }
-        wxOrderJsonData.setWxOrderNotifyDTO(dbWxOrderNotifyDTO);
-        wxOrder.setOrderDataJson(JSONObject.toJSONString(wxOrderJsonData));
-        //UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        //如果订单状态成功，则调用小程序推送服务
-        if ("TICKET_SUCCESS".equals(wxOrderNotifyDTO.getEventName())){
-            wxOrder.setOrderStatus(OrderStatusEnum.SUCCESS.getCode());
-            threadPoolTaskExecutor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        sendXcxMessage(wxOrder);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        throw new CustomException("订单:"+wxOrder.getOutTradeNo()+"推送消息失败");
-                    }
-                }
-            });
-
-        }
-
-
-
-        //如果回调回来的订单关闭，则调用退款
-        if ("ORDER_CLOSE".equals(wxOrderNotifyDTO.getEventName())){
-            String refundCode = getOrderCode(null);
-            wxOrder.setOrderStatus(OrderStatusEnum.FAILD.getCode());
-            wxOrder.setOutRefundNo(refundCode);
-            wxOrder.setRefundReason(wxOrderNotifyDTO.getCloseCause());
-            threadPoolTaskExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                    try {
-                        refundRecordService.refund(wxOrder,refundCode,"电影购票失败,原因:"+wxOrderNotifyDTO.getCloseCause());
-                    } catch (Exception e) {
-                        throw new CustomException("订单:"+wxOrder.getOutTradeNo()+"退款失败");
-                    }
-                }
-            });
-
-        }
-
-        wxOrderService.updateById(wxOrder);
-
-        FilmNotifyReturnDTO filmNotifyReturnDTO = new FilmNotifyReturnDTO();
-        filmNotifyReturnDTO.setCode("200");
-        filmNotifyReturnDTO.setMessage("请求成功");
-        filmNotifyReturnDTO.setSuccess(true);
-        return filmNotifyReturnDTO;
-    }
-
-    private void sendXcxMessage(WxOrder wxOrder) {
-        String xcxMessageToken = wxXcxMessageService.getXcxMessageToken();
-        WxSend wxSend = new WxSend();
-        //wxSend.setAccess_token(xcxMessageToken);
-        String openid = wxOrder.getOpenid();
-        wxSend.setTouser(openid);
-        wxSend.setTemplate_id("Q4-tQrDwtzFUSLt_PR2kuTxBJ3d62V4Yp2iwx4PAcIE");
-        wxSend.setPage("/pages/cinema/orderdes?outTradeNo="+wxOrder.getOutTradeNo());
-
-        JSONObject jsonObject = new JSONObject();
-        JSONObject jsonObject1 = new JSONObject();
-        JSONObject jsonObject2 = new JSONObject();
-        JSONObject jsonObject3 = new JSONObject();
-        JSONObject jsonObject4 = new JSONObject();
-        JSONObject jsonObject5 = new JSONObject();
-
-        jsonObject1.put("value",wxOrder.getOutTradeNo());
-        jsonObject2.put("value","￥"+wxOrder.getTotal()/100.0);
-        jsonObject3.put("value",new SimpleDateFormat("yyyy年MM月dd日 HH:mm").format(new Date()));
-        jsonObject4.put("value","电影票");
-        jsonObject5.put("value","点击查看取票二维码");
-
-        jsonObject.put("character_string1",jsonObject1);
-        jsonObject.put("amount3",jsonObject2);
-        jsonObject.put("date4",jsonObject3);
-        jsonObject.put("thing6",jsonObject4);
-        jsonObject.put("thing5",jsonObject5);
-
-
-        wxSend.setData(jsonObject);
-
-        log.info("发送推送请求数据:"+jsonObject);
-//        wxSend.setMiniprogram_state("developer");
-        wxSend.setLang("zh_CN");
-        String result = wxSendService.sendMessage(xcxMessageToken,wxSend);
-        log.info("小程序推送请求数据返回值:"+result);
-    }
-
-
-    @Data
-    public class FilmNotifyReturnDTO {
-        String code;
-        String message;
-        Boolean success;
-    }
-
-    public static void main(String[] args) {
-        System.out.println(3680/100.0);
-    }
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/fulu/AppletFuluCommodityInfoController.java

@@ -1,38 +0,0 @@
-package com.miaxis.app.controller.fulu;
-
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.fulu.service.IFuluCommodityInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【福禄商品】Controller
- * @author wwl
- * @version 1.0
- * @date 2021/6/25 11:50
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/fulu")
-@Api(tags={"【小程序-福禄商品】"})
-public class AppletFuluCommodityInfoController extends BaseController {
-
-    private final IFuluCommodityInfoService fuluCommodityInfoService;
-
-    /**
-     * 查询福禄商品列表
-     */
-    @GetMapping("/list")
-    @ApiOperation("查询福禄商品列表")
-    public Response list(){
-        return fuluCommodityInfoService.queryFuluCommodityInfoList();
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/fulu/FuluController.java

@@ -1,70 +0,0 @@
-package com.miaxis.app.controller.fulu;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.feign.dto.FilmDTO;
-import com.miaxis.feign.dto.fulu.FuluCommonApiDTO;
-import com.miaxis.feign.dto.fulu.FuluDTO;
-import com.miaxis.feign.dto.fulu.FuluResult;
-import com.miaxis.feign.service.IFuluService;
-import com.miaxis.wx.service.IWxOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-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;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-
-import static com.miaxis.common.constant.Constants.FILM_BLACK_LIST;
-
-/**
- * 【小程序-客户信息】Controller
- *
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/fulu")
-@Api(tags = {"【小程序-福禄】"})
-@Slf4j
-public class FuluController extends BaseController {
-
-
-    @Autowired
-    private IFuluService fuluService;
-
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-    @Value("${fulu.appKey}")
-    private String appKey;
-    @Value("${fulu.appSecret}")
-    private String appSecret;
-
-    @PostMapping(value = "/fuluCommonApi")
-    @ApiOperation("福禄通用接口")
-    public  Response<FuluResult>  httpPostWithForm(@RequestBody FuluCommonApiDTO fuluCommonApiDTO) {
-
-
-        FuluDTO fuluDTO = new FuluDTO();
-        wxOrderService.init(fuluDTO,fuluCommonApiDTO);
-        // 用于接收返回的结果
-        return Response.success(fuluService.fuluCommonApi(fuluDTO));
-    }
-
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/fulu/FuluNotifyController.java

@@ -1,176 +0,0 @@
-package com.miaxis.app.controller.fulu;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.common.config.WxpayConfig;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.enums.OrderStatusEnum;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.feign.dto.WxSend;
-import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.dto.FilmWxOrderJsonData;
-import com.miaxis.wx.dto.FuluWxOrderJsonData;
-import com.miaxis.wx.dto.WxFuluOrderDetailDTO;
-import com.miaxis.wx.dto.WxOrderNotifyDTO;
-import com.miaxis.wx.service.IRefundRecordService;
-import com.miaxis.wx.service.IWxOrderService;
-import com.miaxis.wx.service.IWxXcxMessageService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-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;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
-
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.OPEN_PREFIX+"/fulu/notify")
-@Api(tags = {"【小程序-福禄回调】"})
-@Slf4j
-public class FuluNotifyController {
-
-
-    @Autowired
-    private WxpayConfig wxpayConfig;
-
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-    @Autowired
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-    @Autowired
-    private  IRefundRecordService  refundRecordService;
-
-    @Autowired
-    IWxXcxMessageService wxXcxMessageService;
-
-    @Resource
-    private IWxSendService wxSendService;
-
-
-
-    /**
-     * 电影回调接口
-     */
-    @PostMapping(value = "/fuluOrder")
-    @ApiOperation("福禄订单回调")
-    public FilmNotifyReturnDTO wxOrderNotify(@RequestBody WxFuluOrderDetailDTO wxFuluOrderDetailDTO) {
-        log.info("福禄回调订单:"+wxFuluOrderDetailDTO.getCustomer_order_no()+",入参:"+JSONObject.toJSONString(wxFuluOrderDetailDTO));
-        //todo 验签sign
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo(wxFuluOrderDetailDTO.getCustomer_order_no());
-        String orderDataJson = wxOrder.getOrderDataJson();
-        FuluWxOrderJsonData fuluWxOrderJsonData = JSONObject.parseObject(orderDataJson, FuluWxOrderJsonData.class);
-        WxFuluOrderDetailDTO dbWxFuluOrderDetailDTO= fuluWxOrderJsonData.getWxFuluOrderDetailDTO();
-        if (wxFuluOrderDetailDTO.getCharge_finish_time()!=null){
-            dbWxFuluOrderDetailDTO.setCharge_finish_time(wxFuluOrderDetailDTO.getCharge_finish_time());
-        }
-        if (wxFuluOrderDetailDTO.getRecharge_description()!=null){
-            dbWxFuluOrderDetailDTO.setRecharge_description(wxFuluOrderDetailDTO.getRecharge_description());
-        }
-        dbWxFuluOrderDetailDTO.setOrder_status(wxFuluOrderDetailDTO.getOrder_status());
-        //如果订单失败，则调用微信退款
-        if ("failed".equals(wxFuluOrderDetailDTO.getOrder_status())){
-            String refundCode = getOrderCode(null);
-            wxOrder.setOutRefundNo(refundCode);
-            wxOrder.setOrderStatus(OrderStatusEnum.FAILD.getCode());
-            wxOrder.setRefundReason("福禄发货失败");
-            threadPoolTaskExecutor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        refundRecordService.refund(wxOrder,refundCode,"商品购买失败");
-                    } catch (Exception e) {
-                        throw new CustomException("订单:"+wxOrder.getOutTradeNo()+"退款失败");
-                    }
-                }
-            });
-        }
-
-        //如果订单成功，则调用小程序推送
-        if ("success".equals(wxFuluOrderDetailDTO.getOrder_status())){
-            wxOrder.setOrderStatus(OrderStatusEnum.SUCCESS.getCode());
-            threadPoolTaskExecutor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        sendXcxMessage(wxOrder);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        throw new CustomException("订单:"+wxOrder.getOutTradeNo()+"推送消息失败");
-                    }
-                }
-            });
-        }
-
-
-
-        fuluWxOrderJsonData.setWxFuluOrderDetailDTO(dbWxFuluOrderDetailDTO);
-        wxOrder.setOrderDataJson(JSONObject.toJSONString(fuluWxOrderJsonData));
-        wxOrderService.updateById(wxOrder);
-
-        FilmNotifyReturnDTO filmNotifyReturnDTO = new FilmNotifyReturnDTO();
-        filmNotifyReturnDTO.setCode("200");
-        filmNotifyReturnDTO.setMessage("请求成功");
-        filmNotifyReturnDTO.setSuccess(true);
-        return filmNotifyReturnDTO;
-    }
-
-    private void sendXcxMessage(WxOrder wxOrder) {
-        String xcxMessageToken = wxXcxMessageService.getXcxMessageToken();
-        WxSend wxSend = new WxSend();
-        String openid = wxOrder.getOpenid();
-        wxSend.setTouser(openid);
-        wxSend.setTemplate_id("Q4-tQrDwtzFUSLt_PR2kuTxBJ3d62V4Yp2iwx4PAcIE");
-        wxSend.setPage("/pages/fulu/orderdes?outTradeNo="+wxOrder.getOutTradeNo());
-
-        JSONObject jsonObject = new JSONObject();
-        JSONObject jsonObject1 = new JSONObject();
-        JSONObject jsonObject2 = new JSONObject();
-        JSONObject jsonObject3 = new JSONObject();
-        JSONObject jsonObject4 = new JSONObject();
-        JSONObject jsonObject5 = new JSONObject();
-
-        jsonObject1.put("value",wxOrder.getOutTradeNo());
-        jsonObject2.put("value","￥"+wxOrder.getTotal()/100.0);
-        jsonObject3.put("value",new SimpleDateFormat("yyyy年MM月dd日 HH:mm").format(new Date()));
-        jsonObject4.put("value","视频会员");
-        jsonObject5.put("value","点击查看详情");
-
-        jsonObject.put("character_string1",jsonObject1);
-        jsonObject.put("amount3",jsonObject2);
-        jsonObject.put("date4",jsonObject3);
-        jsonObject.put("thing6",jsonObject4);
-        jsonObject.put("thing5",jsonObject5);
-
-
-        wxSend.setData(jsonObject);
-
-        wxSend.setLang("zh_CN");
-        String result = wxSendService.sendMessage(xcxMessageToken,wxSend);
-        log.info("小程序推送请求数据返回值，订单号:"+wxOrder.getOutTradeNo()+result);
-    }
-
-
-
-    @Data
-    public class FilmNotifyReturnDTO {
-        String code;
-        String message;
-        Boolean success;
-    }
-
-}

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

@@ -31,7 +31,6 @@ public class GzptUserInfoController extends BaseController {
     @Autowired
     private IGzptUserInfoService gzptUserInfoService;
 
-
     @Autowired
     private IUserInfoService userInfoService;
 
@@ -42,7 +41,6 @@ public class GzptUserInfoController extends BaseController {
     @GetMapping
     @ApiOperation("获取学员详细信息")
     public Response<GzptUserInfo> getInfo(){
-
         UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
         return Response.success(gzptUserInfoService.getInfoById(userInfo.getGzptUserId()));
     }

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

@@ -0,0 +1,48 @@
+package com.miaxis.app.controller.gzpt;
+
+
+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.exception.CustomException;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.domain.GzptVideoVip;
+import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
+import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
+import com.miaxis.newgzpt.service.IGzptVideoVipService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 学员基本信息表 前端控制器
+ * </p>
+ *
+ * @since 2021-03-09
+ */
+@RestController
+@Api(tags = "【app-学员视频VIP信息】")
+@RequestMapping(Constants.OPEN_PREFIX+"/gzpt/videoVip")
+public class GzptVideoVipController extends BaseController {
+
+    @Autowired
+    private IGzptVideoVipService gzptVideoVipService;
+
+
+    /**
+     * 获取用户vip信息
+     */
+    @GetMapping
+    @ApiOperation("获取用户vip信息")
+    public Response<GzptVideoVip> getVideoVip(GzptVideoVipDTO gzptVideoVipDTO){
+        GzptVideoVip gzptVideoVip  = gzptVideoVipService.getGzptVideoVipByUserId(gzptVideoVipDTO);
+        return Response.success(gzptVideoVip);
+    }
+
+
+}
+

jsjp-admin/src/main/java/com/miaxis/app/controller/product/AppletProductTypeInfoController.java

@@ -1,44 +0,0 @@
-package com.miaxis.app.controller.product;
-
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.product.service.IProductTypeInfoService;
-import com.miaxis.product.vo.AppletProductTypeInfoVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 【小程序-品类管理】Controller
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/product/info")
-@Api(tags={"【小程序-品类管理】"})
-public class AppletProductTypeInfoController extends BaseController{
-
-    private final IProductTypeInfoService productTypeInfoService;
-
-
-    /**
-     * 查询品类列表
-     */
-    @GetMapping("/list")
-    @ApiOperation("查询品类列表")
-    public ResponsePageInfo<AppletProductTypeInfoVo> list(){
-        List<AppletProductTypeInfoVo> list = productTypeInfoService.selectAppletProductTypeInfoList();
-        return toResponsePageInfo(list);
-    }
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/record/AppletBrowseRecordInfoController.java

@@ -1,81 +0,0 @@
-package com.miaxis.app.controller.record;
-
-import com.miaxis.common.annotation.Log;
-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.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.customer.vo.BrowseRecordCustomerInfoVo;
-import com.miaxis.record.service.IBrowseRecordInfoService;
-import com.miaxis.record.vo.BrowseRecordCustomerVo;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【浏览记录】Controller
- *
- * @author miaxis
- * @date 2021-03-23
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/applet/record/info")
-@Api(tags={"【小程序-浏览记录】"})
-public class AppletBrowseRecordInfoController extends BaseController{
-
-    private final IBrowseRecordInfoService browseRecordInfoService;
-
-    private final RedisTemplate redisTemplate;
-
-    /**
-     * 查询浏览记录列表
-     */
-    @GetMapping("/getBrowseRecordInfoList")
-    @ApiOperation("查询浏览记录列表")
-    public ResponsePageInfo<BrowseRecordCustomerInfoVo> getBrowseRecordInfoList(){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        List<BrowseRecordCustomerInfoVo> list = browseRecordInfoService.getBrowseRecordInfoList(userInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 新增浏览记录
-     */
-    @PutMapping(value = "/insertBrowseRecord/{id}")
-    @ApiOperation("新增浏览记录")
-    public Response insertBrowseRecord(
-            @ApiParam(name = "id",value = "商家id",required = true)
-            @PathVariable("id") Long id
-    ){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return browseRecordInfoService.insertBrowseRecord(userInfo,id);
-    }
-
-
-    /**
-     * 删除浏览记录
-     */
-    @Log(title = "浏览记录", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除浏览记录")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "商家ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        //当前用户
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        return browseRecordInfoService.removeBrowseRecord(userInfo,ids);
-    }
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/teachingDsp/AppTeachingDspInfoController.java

@@ -1,61 +0,0 @@
-package com.miaxis.app.controller.teachingDsp;
-
-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.page.ResponsePageInfo;
-import com.miaxis.teachingDsp.domain.TeachingDspInfo;
-import com.miaxis.teachingDsp.service.ITeachingDspInfoService;
-import com.miaxis.teachingDsp.vo.TeachingDspInfoVo;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【学车短视频】Controller
- *
- * @author miaxis
- * @date 2021-12-09
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(Constants.OPEN_PREFIX+"/teachingDsp/dsp")
-@Api(tags={"【小程序-学车短视频】"})
-public class AppTeachingDspInfoController extends BaseController{
-    @Autowired
-    private ITeachingDspInfoService teachingDspInfoService;
-
-    /**
-     * 查询学车短视频列表
-     */
-    @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<TeachingDspInfoVo> list(@ModelAttribute TeachingDspInfo teachingDspInfo){
-        startPage();
-        List<TeachingDspInfoVo> list = teachingDspInfoService.selectTeachingDspInfoList(teachingDspInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取学车短视频详细信息
-     */
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取学车短视频详细信息")
-    public Response<TeachingDspInfoVo> getInfo(
-            @ApiParam(name = "id", value = "学车短视频参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return teachingDspInfoService.getTeachingDspDetailsById(id);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/app/controller/teachingVideo/AppletTeachingVideoInfoController.java

@@ -1,94 +0,0 @@
-package com.miaxis.app.controller.teachingVideo;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.teachingVideo.domain.TeachingVideoTypeInfo;
-import com.miaxis.teachingVideo.dto.TeachingVideoInfoTypeIdDto;
-import com.miaxis.teachingVideo.service.ITeachingVideoInfoService;
-import com.miaxis.teachingVideo.service.ITeachingVideoTypeInfoService;
-import com.miaxis.teachingVideo.vo.AppletTeachingVideoTypeInfoVo;
-import com.miaxis.teachingVideo.vo.TeachingVideoInfoVo;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 【教学视频】Controller
- * @author wwl
- * @version 1.0
- * @date 2021/7/7 14:49
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping(Constants.OPEN_PREFIX+"/teachingVideo/info")
-@Api(tags={"【小程序-教学视频】"})
-public class AppletTeachingVideoInfoController extends BaseController {
-
-    private final ITeachingVideoInfoService teachingVideoInfoService;
-
-    private final ITeachingVideoTypeInfoService videoTypeInfoService;
-
-    @GetMapping("/typeList")
-    @ApiOperation("查询教学视频一级分类列表")
-    public Response typeList(){
-        return Response.success(videoTypeInfoService.list(new QueryWrapper<TeachingVideoTypeInfo>().eq("pid",0).eq("status",0).orderByAsc("type_sort")));
-    }
-
-    /**
-     * 查询教学视频列表1
-
-    @GetMapping("/list/{pid}")
-    @ApiOperation("查询教学视频列表")
-    public Response list(@ApiParam(name = "pid", value = "分类id", required = true)
-                             @PathVariable("pid") String pid){
-        return teachingVideoInfoService.queryTeachingVideoInfoList(pid);
-    }
-     */
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取教学视频详细信息")
-    public Response<TeachingVideoInfoVo> getInfo(
-            @ApiParam(name = "id", value = "教学视频参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return teachingVideoInfoService.getTeachingVideoDetailsById(id);
-    }
-
-
-    /**
-     * 关键字搜索教学视频
-     */
-    @GetMapping("/search")
-    @ApiOperation("关键字搜索教学视频")
-    public Response search(String keyword){
-        return teachingVideoInfoService.searchTeachingVideoInfoByKeyword(keyword);
-    }
-
-
-    /**
-     * 根据分类ID 查询教学视频
-     */
-    @GetMapping("/getTeachingVideoByTypeId")
-    @ApiOperation("根据分类ID查询教学视频")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public Response getTeachingVideoByTypeId(@ModelAttribute TeachingVideoInfoTypeIdDto teachingVideoInfoTypeIdDto){
-        startPage();
-        return teachingVideoInfoService.getTeachingVideoByTypeId(teachingVideoInfoTypeIdDto.getVideoTypeId());
-    }
-
-
-    /**
-     * 查询教学视频分类树形列表
-     */
-    @GetMapping("/treeList")
-    @ApiOperation("查询教学视频分类树形列表")
-    public Response<List<AppletTeachingVideoTypeInfoVo>> treeList(){
-        return videoTypeInfoService.selectAppletTeachingVideoTypeInfoTreeList();
-    }
-}

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

@@ -3,20 +3,18 @@ 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.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.StringUtils;
-import com.miaxis.user.dto.UserDto;
 import com.miaxis.user.dto.UserInfoUpdateDto;
 import com.miaxis.user.service.IUserInfoService;
-import com.miaxis.user.vo.UserVo;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+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

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

@@ -1,250 +0,0 @@
-package com.miaxis.app.controller.wx;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.miaxis.common.config.WxpayConfig;
-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.core.page.ResponsePageInfo;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.SecurityUtils;
-import com.miaxis.common.utils.uuid.CommonUtils;
-import com.miaxis.system.service.ISysDictDataService;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.dto.WxOrderCreateDTO;
-import com.miaxis.wx.dto.WxOrderCreateFuluDTO;
-import com.miaxis.wx.dto.WxOrderCreatePhoneBillDTO;
-import com.miaxis.wx.dto.WxOrderListDTO;
-import com.miaxis.wx.service.IWxOrderService;
-import io.swagger.annotations.*;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.util.Base64;
-import java.util.List;
-
-import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
-
-/**
- * 【小程序-微信支付】Controller
- *
- * @author miaxis
- * @date 2021-03-10
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(Constants.STUDENT_PREFIX+"/wx")
-@Api(tags = {"【小程序-微信支付】"})
-@Slf4j
-public class WxController extends BaseController {
-
-    @Autowired
-    private HttpClient httpClient;
-
-    @Autowired
-    private WxpayConfig wxpayConfig;
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-
-    @Autowired
-    private ISysDictDataService dictDataService;
-
-    @Value("${app.appid}")
-    private String appid;
-    @Value("${wxpay.notifyUrl}")
-    private  String notifyUrl ;
-
-
-
-
-
-
-    @GetMapping("/order/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<WxOrder> list(@ModelAttribute WxOrderListDTO wxOrderListDTO){
-
-        String openid = SecurityUtils.getLoginUser().getStudent().getOpenid();
-        startPage();
-        wxOrderListDTO.setOpenid(openid);
-        List<WxOrder> list = wxOrderService.selectOrderList(wxOrderListDTO);
-        return toResponsePageInfo(list);
-    }
-
-    /**
-     * 微信支付获取预订单id
-     */
-    @PostMapping(value = "/prepareOrderForPhoneBill")
-    @ApiOperation("微信支付活动话费下单")
-    public Response<JSONObject> getPrepareOrderIdForFulu(@RequestBody WxOrderCreatePhoneBillDTO wxOrderCreatePhoneBillDTO) throws Exception{
-
-        //创建本地微信订单
-        WxOrder order = new WxOrder();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        String orderCode = getOrderCode(student.getId());
-        order.setOutTradeNo(orderCode);
-        order.setOpenid(student.getOpenid());
-        order.setGoodsType("3");
-        order.setGoodsPictureUrl(wxOrderCreatePhoneBillDTO.getGoodsPictureUrl());
-        wxOrderService.createPhoneBillOrder(order,wxOrderCreatePhoneBillDTO);
-        wxOrderService.save(order);
-        return Response.success(placeWxOrder(order, "活动-话费充值"));
-
-
-    }
-
-    /**
-     * 微信支付获取预订单id
-     */
-    @PostMapping(value = "/prepareOrderForFulu")
-    @ApiOperation("微信支付福禄下单")
-    public Response<JSONObject> getPrepareOrderIdForFulu(@RequestBody WxOrderCreateFuluDTO wxOrderCreateFuluDTO) throws Exception{
-
-        //创建本地微信订单
-        WxOrder order = new WxOrder();
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        String orderCode = getOrderCode(student.getId());
-        order.setOutTradeNo(orderCode);
-        order.setOpenid(student.getOpenid());
-        order.setGoodsType("2");
-        order.setGoodsPictureUrl(wxOrderCreateFuluDTO.getGoodsPictureUrl());
-        //保存电影下单数据
-        wxOrderService.createFuluOrder(order,wxOrderCreateFuluDTO);
-        wxOrderService.save(order);
-        return Response.success(placeWxOrder(order, "视频会员"));
-
-
-    }
-
-    /**
-     * 微信支付获取预订单id
-     */
-    @PostMapping(value = "/prepareOrder")
-    @ApiOperation("微信支付电影下单")
-    public Response<JSONObject> getPrepareOrderId(@RequestBody WxOrderCreateDTO wxOrderCreateDTO) throws Exception{
-        UserInfo student = SecurityUtils.getLoginUser().getStudent();
-        //创建本地微信订单
-        WxOrder order = new WxOrder();
-        String orderCode = getOrderCode(student.getId());
-        order.setOutTradeNo(orderCode);
-        order.setOpenid(student.getOpenid());
-        order.setGoodsType("1");
-        order.setGoodsPictureUrl(wxOrderCreateDTO.getGoodsPictureUrl());
-        //保存电影下单数据
-        wxOrderService.createFilmOrder(order,wxOrderCreateDTO);
-        wxOrderService.save(order);
-        // 2 调用微信接口生成预订单,并返回调起支付所需json数据
-        return Response.success(placeWxOrder(order, "电影票"));
-
-    }
-
-    //下单
-    private JSONObject placeWxOrder(WxOrder order, String goodsName) throws Exception {
-        HttpPost httpPost = initHttpPost();
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ObjectMapper objectMapper = new ObjectMapper();
-        ObjectNode rootNode = objectMapper.createObjectNode();
-        rootNode.put("mchid",wxpayConfig.getMerchantId())
-                .put("appid", appid)
-                .put("description", goodsName)
-                .put("notify_url", notifyUrl)
-                .put("out_trade_no", order.getOutTradeNo());
-        rootNode.putObject("amount")
-                .put("total", order.getTotal());
-        rootNode.putObject("payer")
-                .put("openid", order.getOpenid());
-        objectMapper.writeValue(bos, rootNode);
-        httpPost.setEntity(new StringEntity(rootNode.toString(), "utf-8"));
-        HttpResponse response = httpClient.execute(httpPost);
-        String bodyAsString = EntityUtils.toString(response.getEntity());
-        if (JSONObject.parseObject(bodyAsString).get("prepay_id") == null){
-            throw new CustomException(JSONObject.parseObject(bodyAsString).get("message").toString());
-        }
-        return getWxParamJson(bodyAsString,order.getOutTradeNo());
-
-    }
-
-    // 生成前端小程序调用调起微信支付所需参数
-    private JSONObject getWxParamJson(String bodyAsString, String orderCode) throws Exception {
-        String  packageStr = "prepay_id="+JSONObject.parseObject(bodyAsString).get("prepay_id");
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("package",packageStr);
-        String nonce_str = RandomStringUtils.randomAlphanumeric(32);
-        jsonObject.put("nonceStr",nonce_str);
-        long timestamp =  System.currentTimeMillis()/1000;
-        jsonObject.put("timeStamp",String.valueOf(timestamp));
-        jsonObject.put("signType","RSA");
-        StringBuffer sb = new StringBuffer();
-        sb.append(appid + "\n");
-        sb.append(timestamp + "\n");
-        sb.append(nonce_str + "\n");
-        sb.append(packageStr+ "\n");
-        System.out.println(sb);
-
-        File file = new ClassPathResource("wechatpay/apiclient_key.pem").getFile();
-        String realPath =file.getAbsolutePath();
-        PrivateKey privateKey = CommonUtils.getPrivateKey(realPath);
-        // 进行签名服务
-        Signature signature = Signature.getInstance("SHA256withRSA");
-        signature.initSign(privateKey);
-        signature.update(sb.toString().getBytes("UTF-8"));
-        byte[] signedData = signature.sign();
-        String base64Str =  Base64.getEncoder().encodeToString(signedData);
-        jsonObject.put("paySign",base64Str);
-        jsonObject.put("outTradeNo",orderCode);
-        return jsonObject;
-    }
-
-    private HttpPost initHttpPost() {
-        HttpPost httpPost = new HttpPost(wxpayConfig.getV3url());
-        httpPost.addHeader("Accept", "application/json");
-        httpPost.addHeader("Content-type","application/json; charset=utf-8");
-        return httpPost;
-    }
-
-    /**
-     * 获取微信订单详细信息
-     */
-    @GetMapping(value = "/{outTradeNo}")
-    @ApiOperation("获取微信订单详细信息")
-    public Response<WxOrder> getInfo(
-            @ApiParam(name = "outTradeNo", value = "商家订单号", required = true)
-            @PathVariable("outTradeNo") String outTradeNo
-    ){
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);
-        if (!wxOrder.getOpenid().equals(SecurityUtils.getLoginUser().getStudent().getOpenid())){
-            throw new CustomException("该用户无访问此订单权限");
-        }
-        return Response.success(wxOrder);
-    }
-
-
-
-
-
-
-
-
-}

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

@@ -0,0 +1,202 @@
+package com.miaxis.app.controller.wx;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.miaxis.common.config.WxpayConfig;
+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.enums.OrderStatusEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.uuid.CommonUtils;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import com.miaxis.system.service.ISysDictDataService;
+import com.miaxis.wx.domain.WxJsOrder;
+import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.WxOrderDTO;
+import com.miaxis.wx.service.IWxJsOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+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;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.util.Base64;
+
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
+/**
+ * 【小程序-微信支付】Controller
+ *
+ * @author miaxis
+ * @date 2021-03-10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/wxjs")
+@Api(tags = {"【APP-微信支付】"})
+@Slf4j
+public class WxJsjpController extends BaseController {
+
+    @Autowired
+    private HttpClient httpClient;
+
+    @Autowired
+    private WxpayConfig wxpayConfig;
+
+    @Autowired
+    private IWxJsOrderService wxJsOrderService;
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Value("${app.appid}")
+    private String appid;
+    @Value("${wxpay.notifyUrl}")
+    private  String notifyUrl ;
+
+    @Autowired
+    private IGzptUserInfoService userInfoService;
+
+
+
+
+    /**
+     * 微信支付获取预订单id
+     */
+    @PostMapping(value = "/prepareOrder")
+    @ApiOperation("极速驾培微信下单")
+    public Response<WxParamEntity> getPrepareOrder(@RequestBody WxOrderDTO wxOrderDTO) throws Exception{
+        SysDictData sysDictData = dictDataService.selectDictDataById(wxOrderDTO.getDictCode());
+        String[] values = sysDictData.getDictValue().split(",");
+
+        //创建本地微信订单
+        WxJsOrder order = new WxJsOrder();
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        GzptUserInfo gzptUserInfo = userInfoService.getInfoById(68l);
+
+        String orderCode = getOrderCode(student.getId());
+        order.setOutTradeNo(orderCode);
+        order.setUserId(gzptUserInfo.getId());
+        order.setUserName(gzptUserInfo.getUserName());
+        order.setGoodsName(sysDictData.getDictLabel());
+        Double price = Double.parseDouble(values[0])*100;
+        int b =  new Double(price).intValue();
+        System.out.println(b);
+        order.setTotal(b);
+        order.setOrderStatus(OrderStatusEnum.PROCESSING.getCode());
+
+        wxJsOrderService.save(order);
+        return Response.success(placeWxOrder(order, sysDictData.getDictLabel()));
+
+    }
+
+
+    //下单
+    private WxParamEntity placeWxOrder(WxJsOrder order, String goodsName) throws Exception {
+        HttpPost httpPost = initHttpPost();
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectNode rootNode = objectMapper.createObjectNode();
+        rootNode.put("mchid",wxpayConfig.getMerchantId())
+                .put("appid", appid)
+                .put("description", goodsName)
+                .put("notify_url", notifyUrl)
+                .put("out_trade_no", order.getOutTradeNo());
+        rootNode.putObject("amount").put("total", order.getTotal());
+        objectMapper.writeValue(bos, rootNode);
+        httpPost.setEntity(new StringEntity(rootNode.toString(), "utf-8"));
+        HttpResponse response = httpClient.execute(httpPost);
+        String bodyAsString = EntityUtils.toString(response.getEntity());
+        if (JSONObject.parseObject(bodyAsString).get("prepay_id") == null){
+            throw new CustomException(JSONObject.parseObject(bodyAsString).get("message").toString());
+        }
+        return getWxParamJson(bodyAsString,order.getOutTradeNo());
+
+    }
+
+    // 生成调用调起微信支付所需参数
+    private WxParamEntity getWxParamJson(String bodyAsString, String orderCode) throws Exception {
+        WxParamEntity wxParamEntity = new WxParamEntity();
+        wxParamEntity.setAppId(appid);
+        wxParamEntity.setPartnerId(wxpayConfig.getMerchantId());
+        String  prepayId = JSONObject.parseObject(bodyAsString).getString("prepay_id");
+        wxParamEntity.setPrepayId(prepayId);
+        wxParamEntity.setPackageValue("Sign=WXPay");
+        String nonce_str = RandomStringUtils.randomAlphanumeric(32);
+        wxParamEntity.setNonceStr(nonce_str);
+        String timestamp = String.valueOf(System.currentTimeMillis()/1000);
+        wxParamEntity.setTimeStamp(timestamp);
+
+        StringBuffer sb = new StringBuffer();
+        sb.append(appid + "\n");
+        sb.append(timestamp + "\n");
+        sb.append(nonce_str + "\n");
+        sb.append(prepayId+ "\n");
+
+
+        File file = new ClassPathResource("wechatpay/apiclient_key.pem").getFile();
+        String realPath =file.getAbsolutePath();
+        PrivateKey privateKey = CommonUtils.getPrivateKey(realPath);
+        // 进行签名服务
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initSign(privateKey);
+        signature.update(sb.toString().getBytes("UTF-8"));
+        byte[] signedData = signature.sign();
+        String base64Str =  Base64.getEncoder().encodeToString(signedData);
+        wxParamEntity.setSign(base64Str);
+
+        return wxParamEntity;
+    }
+
+    private HttpPost initHttpPost() {
+        HttpPost httpPost = new HttpPost(wxpayConfig.getV3url());
+        httpPost.addHeader("Accept", "application/json");
+        httpPost.addHeader("Content-type","application/json; charset=utf-8");
+        return httpPost;
+    }
+
+    @Data
+    class  WxParamEntity{
+        String appId;
+        String partnerId;
+        String prepayId;
+        String packageValue;
+        String nonceStr;
+        String timeStamp;
+        String sign;
+
+    }
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -4,17 +4,14 @@ package com.miaxis.app.controller.wx;
 import com.alibaba.fastjson.JSONObject;
 import com.miaxis.common.config.WxpayConfig;
 import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.AesUtil;
-import com.miaxis.feign.dto.FilmDTO;
-import com.miaxis.feign.dto.FilmMcpData;
-import com.miaxis.feign.dto.FilmXdResult;
 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.service.IRefundRecordService;
-import com.miaxis.wx.service.IWxOrderService;
+import com.miaxis.wx.service.IWxJsOrderService;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,7 +21,6 @@ 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.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,24 +35,18 @@ import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.cert.X509Certificate;
 
-import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(Constants.OPEN_PREFIX+"/wx/notify")
-@Api(tags = {"【小程序-微信回调】"})
+@Api(tags = {"【APP-微信回调】"})
 @Slf4j
 public class WxNotifyController {
 
-
     @Autowired
     private WxpayConfig wxpayConfig;
 
-
     @Autowired
-    private IWxOrderService wxOrderService;
-
-
+    private IWxJsOrderService wxJsOrderService;
 
     @Autowired
     private  IRefundRecordService  refundRecordService;
@@ -65,9 +55,6 @@ public class WxNotifyController {
     private AutoUpdateCertificatesVerifier verifier;
 
 
-    @Value("${film.notifyUrl}")
-    private  String notifyUrl ;
-
     /**
      * 微信支付回调接口
      */
@@ -193,44 +180,26 @@ public class WxNotifyController {
 
     @Transactional
     public void writeNotifyDataToDb(JSONObject jsonObject) {
+        System.out.println(jsonObject);
         String outTradeNo = jsonObject.getString("out_trade_no");
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);
-        if (wxOrder == null) {
+        WxJsOrder wxJsOrder = wxJsOrderService.getByOutTradeNo(outTradeNo);
+        if (wxJsOrder == null) {
             throw new CustomException("该订单不存在");
         }
-        wxOrder.setTransactionId(jsonObject.getString("transaction_id"));
+        wxJsOrder.setTransactionId(jsonObject.getString("transaction_id"));
         JSONObject amount = jsonObject.getJSONObject("amount");
-        wxOrder.setPayerTotal(amount.getInteger("payer_total"));
-        wxOrder.setTotal(amount.getInteger("total"));
-        wxOrder.setCurrency(amount.getString("currency"));
-        wxOrder.setPayerCurrency(amount.getString("payer_currency"));
-        wxOrder.setTradeState(jsonObject.getString("trade_state"));
-        wxOrder.setBankType(jsonObject.getString("bank_type"));
+        wxJsOrder.setPayerTotal(amount.getInteger("payer_total"));
+        wxJsOrder.setTotal(amount.getInteger("total"));
+        wxJsOrder.setCurrency(amount.getString("currency"));
+        wxJsOrder.setPayerCurrency(amount.getString("payer_currency"));
+        wxJsOrder.setTradeState(jsonObject.getString("trade_state"));
+        wxJsOrder.setBankType(jsonObject.getString("bank_type"));
         DateTime dateTime  = new DateTime(jsonObject.getString("success_time"));
-        wxOrder.setSuccessTime(dateTime.toDate());
-        wxOrder.setTradeStateDesc(jsonObject.getString("trade_state_desc"));
-        wxOrder.setTradeType(jsonObject.getString("trade_type"));
-        wxOrder.setAttach(jsonObject.getString("attach"));
-        JSONObject sceneInfo = jsonObject.getJSONObject("scene_info");
-        if (sceneInfo != null){
-            wxOrder.setDeviceId(sceneInfo.getString("device_id"));
-        }
-        //购买电影票
-        if ( "1".equals(wxOrder.getGoodsType())){
-            wxOrderService.buyFilmOrder(wxOrder);
-        }
-        //购买福禄视频会员
-        else if ( "2".equals(wxOrder.getGoodsType())){
-            wxOrderService.buyFuluOrder(wxOrder);
-        }
-
-        //购买活动-话费充值
-        else if ( "3".equals(wxOrder.getGoodsType())){
-            wxOrderService.buyPhoneBillOrder(wxOrder);
-        }
-
-
-
+        wxJsOrder.setSuccessTime(dateTime.toDate());
+        wxJsOrder.setTradeStateDesc(jsonObject.getString("trade_state_desc"));
+        wxJsOrder.setTradeType(jsonObject.getString("trade_type"));
+        wxJsOrder.setAttach(jsonObject.getString("attach"));
+        wxJsOrderService.updateById(wxJsOrder);
 
     }
 

jsjp-admin/src/main/java/com/miaxis/pc/controller/car/CarController.java

@@ -1,24 +0,0 @@
-package com.miaxis.pc.controller.car;
-
-import com.miaxis.car.service.ICarBrandInfoService;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/5/21 10:05
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/pc/car")
-@Api(tags={"【pc-汽车品牌】"})
-public class CarController {
-
-    private final ICarBrandInfoService carBrandInfoService;
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/car/UsedCarInfoController.java

@@ -1,104 +0,0 @@
-package com.miaxis.pc.controller.car;
-
-import com.miaxis.car.domain.UsedCarInfo;
-import com.miaxis.car.dto.ExamineUsedCarDto;
-import com.miaxis.car.dto.UsedCarInfoDto;
-import com.miaxis.car.service.IUsedCarInfoService;
-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.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 二手车 controller
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 13:45
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/pc/usedCar")
-@Api(tags={"【pc-二手车】"})
-public class UsedCarInfoController extends BaseController {
-
-    private final IUsedCarInfoService usedCarInfoService;
-
-    /**
-     * 查询二手车列表
-     */
-    @PreAuthorize("@ss.hasPermi('usedCar:usedCar: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<UsedCarInfo> list(@ModelAttribute UsedCarInfo usedCarInfo){
-        startPage();
-        List<UsedCarInfo> list = usedCarInfoService.selectUsedCarInfoList(usedCarInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取二手车详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('usedCar:usedCar:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取二手车详细信息")
-    public Response getInfo(
-            @ApiParam(name = "id", value = "首页数据id", required = true)
-            @PathVariable("id") Long id
-    ){
-        return usedCarInfoService.getUsedCarById(id);
-    }
-
-
-    /**
-     * 修改二手车
-     */
-    @PreAuthorize("@ss.hasPermi('usedCar:usedCar:edit')")
-    @Log(title = "二手车", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改二手车")
-    public Response edit(@RequestBody UsedCarInfoDto usedCarInfoDto){
-        return usedCarInfoService.updateUsedCarById(usedCarInfoDto);
-    }
-
-
-    /**
-     * 二手车审核
-     */
-    @Log(title = "二手车审核", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/usedCarExamine")
-    @ApiOperation("二手车审核")
-    public Response usedCarExamine(ExamineUsedCarDto examineUsedCarDto){
-        return usedCarInfoService.usedCarExamine(examineUsedCarDto);
-    }
-
-
-    /**
-     * 删除二手车(伪删除)
-     */
-    @PreAuthorize("@ss.hasPermi('usedCar:usedCar:remove')")
-    @Log(title = "删除二手车", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除二手车")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "二手车ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return usedCarInfoService.removeUsedCarByIds(ids);
-    }
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/customer/CustomerInfoController.java

@@ -1,117 +0,0 @@
-package com.miaxis.pc.controller.customer;
-
-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.poi.ExcelUtil;
-import com.miaxis.customer.domain.CustomerInfo;
-import com.miaxis.customer.service.ICustomerInfoService;
-import com.miaxis.customer.vo.CustomerInfoVo;
-import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
-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-10
- */
-@RestController
-// @RequiredArgsConstructor 代替@AutoWired注解，注意在注入时需要用final定义，或者使用@notnull注解
-@RequiredArgsConstructor
-@RequestMapping("/pc/customer")
-@Api(tags = {"【pc-客户信息】"})
-public class CustomerInfoController extends BaseController {
-
-    private final ICustomerInfoService customerInfoService;
-
-    /**
-     * 查询客户信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('customer:customer: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<CustomerInfoVo> list(@ModelAttribute CustomerInfo customerInfo) {
-        startPage();
-        List<CustomerInfoVo> list = customerInfoService.selectCustomerInfoList(customerInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取客户信息详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('customer:customer:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取客户信息详细信息")
-    public Response<CustomerInfoVo> getInfo(
-            @ApiParam(name = "id", value = "客户信息参数", required = true)
-            @PathVariable("id") Long id
-    ) {
-        return customerInfoService.getCustomerById(id);
-    }
-
-    /**
-     * 新增客户信息
-     */
-    @PreAuthorize("@ss.hasPermi('customer:customer:add')")
-    @Log(title = "客户信息", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增客户信息")
-    public Response<Integer> add(@RequestBody CustomerInfo customerInfo) {
-        return toResponse(customerInfoService.save(customerInfo) ? 1 : 0);
-    }
-
-    /**
-     * 修改客户信息
-     */
-    @PreAuthorize("@ss.hasPermi('customer:customer:edit')")
-    @Log(title = "客户信息", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改客户信息")
-    public Response<Integer> edit(@RequestBody CustomerInfo customerInfo) {
-        return toResponse(customerInfoService.updateById(customerInfo) ? 1 : 0);
-    }
-
-    /**
-     * 更新 0：上架 / 1：下架
-     */
-    @PreAuthorize("@ss.hasPermi('customer:customer:updateShelfStatus')")
-    @Log(title = "客户信息", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/updateShelfStatus")
-    @ApiOperation("上架、下架")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "客户信息ids参数", dataType = "List", required = true),
-            @ApiImplicitParam(name = "shelfStatus", value = "上架状态  0：上架、1：下架", dataType = "int", required = true),
-    })
-    public Response updateShelfStatus(Long[] ids,Integer shelfStatus) {
-        return customerInfoService.updateShelfStatus(ids,shelfStatus);
-    }
-
-
-    /**
-     * 删除客户信息(伪删除)
-     */
-    @PreAuthorize("@ss.hasPermi('customer:customer:remove')")
-    @Log(title = "客户信息", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除客户信息")
-    public Response remove(
-            @ApiParam(name = "ids", value = "客户信息ids参数", required = true)
-            @PathVariable Long[] ids
-    ) {
-        return customerInfoService.removeCustomerByIds(ids);
-    }
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/product/ProductTypeInfoController.java

@@ -1,97 +0,0 @@
-package com.miaxis.pc.controller.product;
-
-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.product.domain.ProductTypeInfo;
-import com.miaxis.product.service.IProductTypeInfoService;
-import com.miaxis.product.vo.ProductTypeInfoVo;
-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/product/info")
-@Api(tags={"【pc-品类管理】"})
-public class ProductTypeInfoController extends BaseController{
-
-    private final IProductTypeInfoService productTypeInfoService;
-
-    /**
-     * 查询品类列表
-     */
-    @PreAuthorize("@ss.hasPermi('product: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<ProductTypeInfoVo> list(@ModelAttribute ProductTypeInfo productTypeInfo){
-        startPage();
-        List<ProductTypeInfoVo> list = productTypeInfoService.selectProductTypeInfoList(productTypeInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取品类详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('product:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取品类详细信息")
-    public Response<ProductTypeInfoVo> getInfo(
-            @ApiParam(name = "id", value = "品类参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return productTypeInfoService.getProductDetailsById(id);
-    }
-
-    /**
-     * 新增品类
-     */
-    @PreAuthorize("@ss.hasPermi('product:info:add')")
-    @Log(title = "品类", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增品类")
-    public Response add(@RequestBody ProductTypeInfo productTypeInfo){
-        return productTypeInfoService.saveProductTypeInfo(productTypeInfo);
-    }
-
-    /**
-     * 修改品类
-     */
-    @PreAuthorize("@ss.hasPermi('product:info:edit')")
-    @Log(title = "品类", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改品类")
-    public Response<Integer> edit(@RequestBody ProductTypeInfo productTypeInfo){
-        return toResponse(productTypeInfoService.updateById(productTypeInfo) ? 1 : 0);
-    }
-
-    /**
-     * 删除品类
-     */
-    @PreAuthorize("@ss.hasPermi('product:info:remove')")
-    @Log(title = "品类", businessType = BusinessTypeEnum.UPDATE)
-	@PutMapping("/{ids}")
-    @ApiOperation("删除品类")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "品类ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return productTypeInfoService.removeProductByIds(ids);
-    }
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/teachingDsp/TeachingDspInfoController.java

@@ -1,165 +0,0 @@
-package com.miaxis.pc.controller.teachingDsp;
-
-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.exception.CustomException;
-import com.miaxis.common.utils.StringUtils;
-import com.miaxis.teachingDsp.domain.TeachingDspInfo;
-import com.miaxis.teachingDsp.dto.TeachingDspInfoDto;
-import com.miaxis.teachingDsp.service.ITeachingDspInfoService;
-import com.miaxis.teachingDsp.vo.TeachingDspInfoVo;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【学车短视频】Controller
- *
- * @author miaxis
- * @date 2021-12-09
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/pc/teachingDsp/dsp")
-@Api(tags={"【pc-学车短视频】"})
-public class TeachingDspInfoController extends BaseController{
-    @Autowired
-    private ITeachingDspInfoService teachingDspInfoService;
-
-    /**
-     * 查询学车短视频列表
-     */
-    @PreAuthorize("@ss.hasPermi('teachingDsp:dsp: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<TeachingDspInfoVo> list(@ModelAttribute TeachingDspInfo teachingDspInfo){
-        startPage();
-        List<TeachingDspInfoVo> list = teachingDspInfoService.selectTeachingDspInfoList(teachingDspInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-
-
-
-    /**
-     * 新增学车短视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingDsp:info:add')")
-    @Log(title = "新增学车短视频", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增教学视频")
-    public Response add(@RequestBody TeachingDspInfoDto teachingDspInfoDto){
-        return teachingDspInfoService.saveTeachingDsp(teachingDspInfoDto);
-    }
-
-
-    /**
-     * 修改学车短视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingDsp:info:edit')")
-    @Log(title = "修改学车短视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改学车短视频")
-    public Response edit(@RequestBody TeachingDspInfoDto teachingDspInfoDto){
-        return teachingDspInfoService.updateTeachingDspById(teachingDspInfoDto);
-    }
-
-
-    /**
-     * 删除学车短视频
-
-    @PreAuthorize("@ss.hasPermi('teachingDsp:dsp: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(teachingDspInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
-     */
-
-    /**
-     * 删除教学视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:remove')")
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除教学视频")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "教学视频ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return teachingDspInfoService.removeTeachingDspByIds(ids);
-    }
-
-    /**
-     * 上架短视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:putShelf')")
-    @Log(title = "上架短视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/putShelf/{ids}")
-    @ApiOperation("上架短视频")
-    public  Response putShelf(
-            @ApiParam(name = "ids", value = "教学视频ids参数", required = true) @PathVariable Long[] ids
-    ){
-        return teachingDspInfoService.removePutShelfByIds(ids);
-    }
-
-    /**
-     * 下架短视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:offShelf')")
-    @Log(title = "下架短视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/offShelf/{ids}")
-    @ApiOperation("下架短视频")
-    public  Response offShelf(
-            @ApiParam(name = "ids", value = "教学视频ids参数", required = true) @PathVariable Long[] ids
-    ){
-        return teachingDspInfoService.removeOffShelfByIds(ids);
-    }
-
-
-    /**
-     * 短视频封面上传
-     */
-    @Log(title = "短视频封面上传", businessType = BusinessTypeEnum.INSERT)
-    @PutMapping("/coverUp")
-    @ApiOperation("短视频封面上传")
-    public Response coverUp(MultipartFile coverFile,
-                            @ApiParam(name = "fileId",value = "云点播fileId",required = true) @RequestParam("fileId") String fileId){
-        if (StringUtils.isEmpty(fileId)){
-            throw new CustomException("视频文件未上传");
-        }
-        return teachingDspInfoService.coverUp(fileId,coverFile);
-    }
-
-    /**
-     * 获取短视频详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('teachingDsp:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取短视频详细信息")
-    public Response<TeachingDspInfoVo> getInfo(
-            @ApiParam(name = "id", value = "获取短视频参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return teachingDspInfoService.getTeachingDspDetailsById(id);
-    }
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/teachingVideo/TeachingVideoInfoController.java

@@ -1,148 +0,0 @@
-package com.miaxis.pc.controller.teachingVideo;
-
-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.exception.CustomException;
-import com.miaxis.common.utils.StringUtils;
-import com.miaxis.teachingVideo.domain.TeachingVideoInfo;
-import com.miaxis.teachingVideo.dto.TeachingVideoInfoDto;
-import com.miaxis.teachingVideo.service.ITeachingVideoInfoService;
-import com.miaxis.teachingVideo.vo.TeachingVideoInfoVo;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * 【教学视频】Controller
- * @author wwl
- * @version 1.0
- * @date 2021/7/1 14:49
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/pc/teachingVideo/info")
-@Api(tags={"【pc-教学视频】"})
-public class TeachingVideoInfoController extends BaseController {
-
-    private final ITeachingVideoInfoService teachingVideoInfoService;
-
-    /**
-     * 查询教学视频列表
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo: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<TeachingVideoInfoVo> list(@ModelAttribute TeachingVideoInfo teachingVideoInfo){
-        startPage();
-        List<TeachingVideoInfoVo> list = teachingVideoInfoService.selectTeachingVideoInfoList(teachingVideoInfo);
-        return toResponsePageInfo(list);
-    }
-
-
-    /**
-     * 获取教学视频详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取教学视频详细信息")
-    public Response<TeachingVideoInfoVo> getInfo(
-            @ApiParam(name = "id", value = "教学视频参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return teachingVideoInfoService.getTeachingVideoDetailsById(id);
-    }
-
-    /**
-     * 新增教学视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:add')")
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增教学视频")
-    public Response add(@RequestBody TeachingVideoInfoDto teachingVideoInfo){
-        return teachingVideoInfoService.saveTeachingVideo(teachingVideoInfo);
-    }
-
-
-    /**
-     * 修改教学视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:edit')")
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改教学视频")
-    public Response edit(@RequestBody TeachingVideoInfoDto teachingVideoInfo){
-        return teachingVideoInfoService.updateTeachingVideoById(teachingVideoInfo);
-    }
-
-    /**
-     * 封面上传
-     */
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.INSERT)
-    @PutMapping("/coverUp")
-    @ApiOperation("封面上传")
-    public Response coverUp(MultipartFile coverFile,
-                            @ApiParam(name = "fileId",value = "云点播fileId",required = true) @RequestParam("fileId") String fileId){
-        if (StringUtils.isEmpty(fileId)){
-            throw new CustomException("视频文件未上传");
-        }
-        return teachingVideoInfoService.coverUp(fileId,coverFile);
-    }
-
-    /**
-     * 删除教学视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:remove')")
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除教学视频")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "教学视频ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return teachingVideoInfoService.removeTeachingVideoByIds(ids);
-    }
-
-
-    /**
-     * 上架教学视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:putShelf')")
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/putShelf/{ids}")
-    @ApiOperation("上架教学视频")
-    public  Response putShelf(
-            @ApiParam(name = "ids", value = "教学视频ids参数", required = true) @PathVariable Long[] ids
-    ){
-        return teachingVideoInfoService.removePutShelfByIds(ids);
-    }
-
-    /**
-     * 下架教学视频
-     */
-    @PreAuthorize("@ss.hasPermi('teachingVideo:info:offShelf')")
-    @Log(title = "教学视频", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/offShelf/{ids}")
-    @ApiOperation("下架教学视频")
-    public  Response offShelf(
-            @ApiParam(name = "ids", value = "教学视频ids参数", required = true) @PathVariable Long[] ids
-    ){
-        return teachingVideoInfoService.removeOffShelfByIds(ids);
-    }
-
-
-
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/teachingVideo/TeachingVideoTypeInfoController.java

@@ -1,109 +0,0 @@
-package com.miaxis.pc.controller.teachingVideo;
-
-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.teachingVideo.domain.TeachingVideoTypeInfo;
-import com.miaxis.teachingVideo.service.ITeachingVideoTypeInfoService;
-import com.miaxis.teachingVideo.vo.TeachingVideoTypeInfoVo;
-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/7/1 13:45
- */
-@AllArgsConstructor
-@RestController
-@RequestMapping("/pc/videoType/info")
-@Api(tags={"【pc-教学视频分类】"})
-public class TeachingVideoTypeInfoController extends BaseController {
-
-    private final ITeachingVideoTypeInfoService teachingVideoTypeInfoService;
-
-    /**
-     * 查询教学视频分类列表
-     */
-    @PreAuthorize("@ss.hasPermi('videoType: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<TeachingVideoTypeInfo> list(@ModelAttribute TeachingVideoTypeInfo teachingVideoTypeInfo){
-        startPage();
-        List<TeachingVideoTypeInfo> list = teachingVideoTypeInfoService.selectTeachingVideoTypeInfoList(teachingVideoTypeInfo);
-        return toResponsePageInfo(list);
-    }
-
-    /**
-     * 查询教学视频分类树形列表
-     */
-    @PreAuthorize("@ss.hasPermi('videoType:info:treeList')")
-    @GetMapping("/treeList")
-    @ApiOperation("查询教学视频分类树形列表")
-    public Response<List<TeachingVideoTypeInfoVo>> treeList(){
-        return teachingVideoTypeInfoService.selectTeachingVideoTypeInfoTreeList();
-    }
-
-
-    /**
-     * 获取教学视频分类详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('videoType:info:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取教学视频分类详细信息")
-    public Response<TeachingVideoTypeInfo> getInfo(
-            @ApiParam(name = "id", value = "教学视频分类参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(teachingVideoTypeInfoService.getById(id));
-    }
-
-    /**
-     * 新增教学视频分类
-     */
-    @PreAuthorize("@ss.hasPermi('videoType:info:add')")
-    @Log(title = "教学视频分类", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增教学视频分类")
-    public Response<Integer> add(@RequestBody TeachingVideoTypeInfo teachingVideoTypeInfo){
-        return toResponse(teachingVideoTypeInfoService.save(teachingVideoTypeInfo) ? 1 : 0);
-    }
-
-    /**
-     * 修改教学视频分类
-     */
-    @PreAuthorize("@ss.hasPermi('videoType:info:edit')")
-    @Log(title = "教学视频分类", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改教学视频分类")
-    public Response<Integer> edit(@RequestBody TeachingVideoTypeInfo teachingVideoTypeInfo){
-        return toResponse(teachingVideoTypeInfoService.updateById(teachingVideoTypeInfo) ? 1 : 0);
-    }
-
-    /**
-     * 删除教学视频分类
-     */
-    @PreAuthorize("@ss.hasPermi('videoType:info:remove')")
-    @Log(title = "教学视频分类", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping("/{ids}")
-    @ApiOperation("删除教学视频分类")
-    public  Response remove(
-            @ApiParam(name = "ids", value = "教学视频分类ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return teachingVideoTypeInfoService.removeVideoTypeByIds(ids);
-    }
-
-
-}

jsjp-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java

@@ -1,84 +0,0 @@
-package com.miaxis.pc.controller.wx;
-
-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.enums.OrderStatusEnum;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.StringUtils;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.dto.PcWxOrderListDTO;
-import com.miaxis.wx.service.IWxOrderService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/activities/wx")
-@Api(tags = {"【pc-活动】"})
-@Slf4j
-class PcWxController extends BaseController {
-
-
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-
-    @GetMapping("/order/list")
-    @ApiOperation("查询订单列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    @PreAuthorize("@ss.hasPermi('activities:phoneBill:list')")
-    public ResponsePageInfo<WxOrder> list(@ModelAttribute PcWxOrderListDTO pcWxOrderListDTO){
-        startPage();
-        List<WxOrder> list = wxOrderService.selectPcOrderList(pcWxOrderListDTO);
-        return toResponsePageInfo(list);
-    }
-
-
-
-    /**
-     * 修改订单
-     */
-    @PreAuthorize("@ss.hasPermi('activities:phoneBill:edit')")
-    @Log(title = "修改订单", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("完成订单")
-    public Response edit(String outTradeNo){
-        if (StringUtils.isEmpty(outTradeNo)){
-            throw new CustomException("订单号必传");
-        }
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);
-        wxOrder.setOrderStatus(OrderStatusEnum.SUCCESS.getCode());
-        return toResponse(wxOrderService.updateById(wxOrder) ? 1 : 0);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -90,8 +90,8 @@ feign:
 
 # 微信小程序
 app:
-    appid:
-    secret: 3509a81880669ffa6fa554b2aa050351
+    appid: wx606fa102dbc4b8ab
+    secret: 93832292771493dc2aae6797edbc387c
 
 # 极速云助手微信公众号
 gzh:
@@ -110,14 +110,26 @@ cos:
 
 
 # 微信支付
+#wxpay:
+#    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+#    v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
+#    merchantId: 1608699504
+#    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
+#    v3key: qqwweerrttyyuuiioopp123456789000
+#    notifyUrl: http://1.15.26.233:8080/jsjp-admin/open-api/wx/notify/wxpay
+#    notifyUrlRefund: http://1.15.26.233:8080/jsjp-admin/open-api/wx/notify/refund
+
+
+# 极速驾培微信支付
 wxpay:
-    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/app
     v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
-    merchantId: 1608699504
-    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
-    v3key: qqwweerrttyyuuiioopp123456789000
-    notifyUrl: http://1.15.26.233:8080/jsjp-admin/open-api/wx/notify/wxpay
-    notifyUrlRefund: http://1.15.26.233:8080/jsjp-admin/open-api/wx/notify/refund
+    merchantId: 1611324484
+    serialNumber: 53EBF541F383371B121D7B57B25305FC0BB04F42
+    v3key: 7hM14893GvG3JK05575jk1l6P4tF042B
+    notifyUrl: http://175.42.30.21:8888/open-api/wx/notify/wxpay
+    notifyUrlRefund: http://175.42.30.21:8888/open-api/wx/notify/refund
+
 
 
 # 电影

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

@@ -89,8 +89,8 @@ feign:
 
 # 微信小程序
 app:
-    appid: wx8f43db501343feab
-    secret: 3509a81880669ffa6fa554b2aa050351
+    appid: wx606fa102dbc4b8ab
+    secret: 93832292771493dc2aae6797edbc387c
 
 # 极速云助手微信公众号
 gzh:
@@ -109,12 +109,22 @@ cos:
 
 
 # 微信支付
+#wxpay:
+#    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+#    v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
+#    merchantId: 1608699504
+#    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
+#    v3key: qqwweerrttyyuuiioopp123456789000
+#    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/wx/notify/wxpay
+#    notifyUrlRefund: http://admin.zzxcx.net/prod-api/open-api/wx/notify/refund
+
+# 极速驾培微信支付
 wxpay:
-    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi
+    v3url: https://api.mch.weixin.qq.com/v3/pay/transactions/app
     v3urlRefund: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
-    merchantId: 1608699504
-    serialNumber: 487159E168001CDBA0EFE2C988249A84023AD6CC
-    v3key: qqwweerrttyyuuiioopp123456789000
+    merchantId: 1611324484
+    serialNumber: 53EBF541F383371B121D7B57B25305FC0BB04F42
+    v3key: 93832292771493dc2aae6797edbc387c
     notifyUrl: http://admin.zzxcx.net/prod-api/open-api/wx/notify/wxpay
     notifyUrlRefund: http://admin.zzxcx.net/prod-api/open-api/wx/notify/refund
 

jsjp-admin/src/main/resources/wechatpay/apiclient_cert.pem

@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIUSHFZ4WgAHNug7+LJiCSahAI61swwDQYJKoZIhvcNAQEL
+MIID8DCCAtigAwIBAgIUU+v1QfODNxsSHXtXslMF/AuwT0IwDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjEwNDIxMDYxNzU4WhcNMjYwNDIwMDYxNzU4WjCBgTETMBEGA1UEAwwK
-MTYwODY5OTUwNDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
+Q0EwHhcNMjIwMTI2MDYwNjM0WhcNMjcwMTI1MDYwNjM0WjCBgTETMBEGA1UEAwwK
+MTYxMTMyNDQ4NDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
 DCTnpo/lu7rkuK3mjK/nvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYM
 AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPEY7H7S28zofHptl+LEbNs16644aKobQ8fOtmPtOM76II6x0yw8VKDq
-mbOONJxw95Y07svuozj6kuFB5O5gOK958yv57ZL5KysJZ6i74C/IeJdnACaKPcQf
-stcNaXYGRRKCdaKRbe+28SshgQPuFFgmUasyf5PtvtawCOgEEF8NHXK9PtwENZP0
-FoCAdAFxDSPB+Gtwv7WoxxOGo937lYQbyzQgC02l4in3t4fALIQQpxpvJSZaWou3
-XTqh0IKA0wnZntM+Y90eotPv8GnP700Tr4IlUJQFcWyeRjpQRFNx/Wnm+ZPHpr7E
-+RMa1MU+Jvbb7gBMznMOXW/ppGoZVZcCAwEAAaOBgTB/MAkGA1UdEwQCMAAwCwYD
+AQoCggEBAJSCafbJ6jctCm3Wqm7Hp8jPwyxiuLRrB6w+6booqhWjqrTSyH9oWd0a
+vkbqdsKsh4xRkzyGFN1M0axge7BbqZYhEkB/StIsPn/jNcSTwZzqDsyQ1iv2eNrI
+e0/vK+11NJAZC9Bp7ATIacOuxUYRuj2dKoLKivUi55CLUbg3dg6HksyqPuhLyai7
+FR40tqVNeHRcS9YHtsWn8qMMX31K5l8sv1ukVF0KbpOrvaIlD6zWQOcFfV7dGqVy
+GnRfxrC6Oms/yBlKF5Zu5GyA5M7jJa9dqS/CgY/XCgXv/6lAFLLyC2i5Qgv5ICz0
+1aiS0Eix7rrHIij91ZoDChbQiQYH4M8CAwEAAaOBgTB/MAkGA1UdEwQCMAAwCwYD
 VR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVzLmNv
 bS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1
-NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAkB/SdHD7pgbSu/pg
-vWygXZqNE9d/nbXNBkRMm+B84piD2UjfbAA6dbC5rTjZIx/3c3/SS76S7c7+4Jio
-0zR+ytNixs+G3it7NkM4v4V87aEv81oOI8o68QPJW4pomjMl9hw6kPoZcO/C75P+
-JANLsmyM9i5hL7gIYAHMvThs+l3xORVfr69mHRtP9jpbDX2OKpuZUaDhCDE9Timf
-ZkVMn1UAvO3yUFMCfUByQLWyZVhEI0RFoJdd0UJgox3tHJh7yU8zyb3ZeTDX1E4r
-QCizZfZZKzgXD1MxCzpRqF4t6rJPnLQlflB261SIDfMH7+3+dSRd2W2BNe1F1yEO
-39R1rA==
+NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEASGhYlRSryI2yC4Cj
+Tc7A9r6qXmCo6fcSzM8mQ0whj8H9QoQc+p3HnX4ZDVFpi9DDc1LgCYmBg06AhNgE
+hrMIEuJ2PMla0c1v9iMsE174+lmAFh2dQ4x7UGHt/ui2FE6WmqaSEs/iLF0o6qU6
+AIXAHo+G+e1mlVbLhxTC6/ntO7v3qka/0Te77vKMaguE5zYWvvSbXB0rgaMnvrQo
+gsvj8i0LIJHljKMUUttjA7vJehiLigr2sMlO6ovcrGdo5wNPg6vMqkSOnBpDf/XP
+C/Vz8KuJIvTtsFjGuJ+iCLCCpxsjF8dArJQrRAp8VC1o/mmRyZns1nVbZrPFHmYv
+TMhTvw==
 -----END CERTIFICATE-----

jsjp-admin/src/main/resources/wechatpay/apiclient_key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDxGOx+0tvM6Hx6
-bZfixGzbNeuuOGiqG0PHzrZj7TjO+iCOsdMsPFSg6pmzjjSccPeWNO7L7qM4+pLh
-QeTuYDivefMr+e2S+SsrCWeou+AvyHiXZwAmij3EH7LXDWl2BkUSgnWikW3vtvEr
-IYED7hRYJlGrMn+T7b7WsAjoBBBfDR1yvT7cBDWT9BaAgHQBcQ0jwfhrcL+1qMcT
-hqPd+5WEG8s0IAtNpeIp97eHwCyEEKcabyUmWlqLt106odCCgNMJ2Z7TPmPdHqLT
-7/Bpz+9NE6+CJVCUBXFsnkY6UERTcf1p5vmTx6a+xPkTGtTFPib22+4ATM5zDl1v
-6aRqGVWXAgMBAAECggEAQZbbN8FbZIpW2uOXr2xqhNRNco8MAkL6lI/q1JKDouMv
-GkLMRTuAdmp8N/nW3DxrTqTF1hrssqKQdNF9W1A3+5z8h5kthY9drA6Z8bBy0+0A
-yYeO5e0z0nghKhoO97nK7rcpE3nm45DsWSR7Obt6M2TxUNajGHZUNYmcUqpQXdrn
-WrngVb5GaxWixH7YdP29s2RImvb1fH+GbGo1KGvomAF3WVsHrlOfKGfJOAA63qsp
-cjAtur8bC1kTDv1M6h3q/QjhR03TiHMROODzdX35vE1URRYVccm1neXvrGaaPn0A
-KC8Y4HZCtLLQtyIRSmeaXe/CD2m97n5zB1tV9cM9IQKBgQD67gwyrxOrVcxAbJLc
-oc9PgQt9QaxJRpJP+48MYkkaF6WrKBUUxnDQ82L61uHZeUTguUQ/l/bAblSDVFG7
-eeK7aoG6S/X+aajWVYojuKdnfzjPUTzwZwvU2N/OQa6TryF6A2T3+mypUhI/KIrS
-Gkt2LHG5hOpJb32ULuvQBz52cQKBgQD1+ARMStNVDaMUF0PNGxwNT0oWfcHfIWhL
-0UydhOZucdhVRuwQDXwfAu8O6VWh0KhOtbAWqe5o7hKfqP8Oy8hOHTaEy/zB404l
-HbCWvYPOFeuGBvm2miQ45As8a9AEG3V6PKnDsOMi1FTM7YYGbEYsyLgABwZ9fJMa
-0Ey9d+bghwKBgFEZMI4M8YF1eE72CD0Qes0KOulfmUwRZ+Y7uk7ZUSECtYNsr+uH
-+xw9HSdO3a2IuQ8cMYeQGKq2vc+4J7Y8vV+vG4BXXoi8I1oqSTwkSM51Wqn+aoCT
-/UnsUeD6b27BskMZ578Ri57prIYHF16yKuNll9fKsmHLi72hsIsKXFCxAoGAMg8q
-AMTxwcumtv4NJH8x9FuAvpcVj+3iphuQtjZIF44/8wseHB5CdqVINgazEN3Ag1Ri
-5BntlZluXOQuFLrQp2U2pUxGwscaLl+egu9LFfRMHNjqlYlFefafesqOaWeVPy19
-d4BWmc4Q/CwTLNd4aMDpAchsP7nMzpY6KA1xBZ0CgYEAgn18heUktnUy3flfVKRK
-WU3nH1tsQiDeGw6eKZPjwtvL1FzdpambVCyO8IFJl1ZDq9am9WwtB3Arz/IiqvSc
-lHAWJ5V8buitV4xeApk0kgFARvKxLFfx8lFnPJLvPak1S40kv5nu1Ft8xLYzIYDP
-6dIA7j5jQtUDV/vxLq7afZ8=
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCUgmn2yeo3LQpt
+1qpux6fIz8MsYri0awesPum6KKoVo6q00sh/aFndGr5G6nbCrIeMUZM8hhTdTNGs
+YHuwW6mWIRJAf0rSLD5/4zXEk8Gc6g7MkNYr9njayHtP7yvtdTSQGQvQaewEyGnD
+rsVGEbo9nSqCyor1IueQi1G4N3YOh5LMqj7oS8mouxUeNLalTXh0XEvWB7bFp/Kj
+DF99SuZfLL9bpFRdCm6Tq72iJQ+s1kDnBX1e3Rqlchp0X8awujprP8gZSheWbuRs
+gOTO4yWvXakvwoGP1woF7/+pQBSy8gtouUIL+SAs9NWoktBIse66xyIo/dWaAwoW
+0IkGB+DPAgMBAAECggEBAIAG1bbtZr7eU2lRcGhEMr8JbSZsjPLsehbhvbjAqbAy
+Ak4UkMhVe3MDRRn5sxwshEZRZO7+YCpPuUozey4UN2S3afa0RhpeDhtOEuI+xuCx
+XsS38ArCVnm176h/dY0mR4QaM3ceeVu+Mn+BwYugaMAJJ8bNOXIO/zY7BN4c4eev
+ZIu0Zz86boDsHR1D9Zmx2SMe7V02ka8GGN/PAd1N47iZdzGUWYrchkg7KFqCn4KF
+HObRmodVf1OuSJyqOomJkU4uaj0UsW/ww7DgVIk898EHmkdulR6DC/45rCKpPd3D
+jQ93SiSb0oPZRyC/Pk/z/DAauet+/SIMT5qbI4XmWhECgYEAw/1OQPIN/XWSzvtT
+sFMCit4GLZll/HeYLj856RWw2/Jqn4/ZlBp0BBmrr1HT3m1TZq1UCjP0OyNYtKGu
+a8inzjYvricplfq9avwc0q1leAwj+sxnevJ6/qs2h6aX1a1uJZVFUNQTyY1oAyR2
+eUBqrNWLAI48CcIiUF0Ug+0vb6MCgYEAwfte16Oj6ZnLNE30xsmXQ80gZ2MHZK1q
+b4NeUBsr8pkRQcG3gbmXzBnX0RmBDyaRp1vyPS3vs/oO5v4GVeoOXjddsMofNUF1
+l7MWzv/fRj8G2FLXGEf5X0GUBZkFbAnQObqaQmFmtMpvBWswEqJMnyL/yRej17XM
+EvwVw1GDLOUCgYEAkkBPCeXXDMGU6QHhRJ3dMtVVlOd4lHqGRFSIGWhHTwpKCIHm
+4j8PPhQN6slMKho491D2epqkcRECW+Ce8O2OUzJaSEIPJU0z1kcGFyyvoHKm0rt/
+qN6Ta8FF8todSaWeoUsPq65miawM5vNpuTeZoxnDHYoGQV3uDzw2V/BByrMCgYA1
+6tCpz2o3++9nUmO+/Tl2NwXStsvPSARVioYkbekBPVp2lImVHSj8KhK6pAQjWe0S
+P5RNPP9rXw3VVrYcGzpzJaB9CzExdEhjKfwk/SnqNIqKhjwTG65Ms8WY6LeBGBkw
+cpV97eTGS54gO3LZOxNhCDFgi5mW04ktnbPO3lE/oQKBgQC3B4ZlyruLELcx0BpU
+FY5t8BendO8J5h62CTvk+dIn+1VrwJw4ucgdw3aoewumhgQR1uxfjLMpx+xkw38v
+eXdYPq89S2NiBHE553GLgG+luBQJOYcLQO69L2VgRGiFuaasZF73NgxTN2jyRKW2
+5LyLH3avp2Q27rBYaL7l/HRMRw==
 -----END PRIVATE KEY-----

jsjp-admin/src/test/java/com/miaxis/test/AiTest.java

@@ -1,93 +0,0 @@
-package com.miaxis.test;
-
-import com.miaxis.JsjpApplication;
-import com.miaxis.common.config.WaiConfig;
-import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.feign.dto.Ai;
-import com.miaxis.feign.service.IAiService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-public class AiTest {
-
-    @Autowired
-    private IAiService aiService;
-    @Autowired
-    private WaiConfig waiConfig;
-
-    private static String appid = "7629";
-    private static String secret = "cce08fcab10ff96a863892bb6e396a9e";
-
-    public static String getSign(Map<String, Object> params,String client_secret) {
-        Map<String, Object> sortMap = new TreeMap<String, Object>();
-        sortMap.putAll(params);
-        // 以k1v1k2v2...方式拼接参数
-        StringBuilder builder = new StringBuilder();
-        for (Map.Entry<String, Object> s : sortMap.entrySet()) {
-            String k = s.getKey();
-            Object v = s.getValue();
-            builder.append(k).append(v);
-        }
-//        if (!sortMap.isEmpty()) {
-//            builder.deleteCharAt(builder.length() - 1);
-//        }
-        builder.append(client_secret);
-//        builder.insert(0,client_secret);
-        return builder.toString();
-    }
-
-    @Test
-    public void test() throws Exception {
-        long timeLong = System.currentTimeMillis();
-        String timestamp = String.valueOf(timeLong/1000);
-        Ai ai = new Ai();
-
-        //公共请救参数
-        ai.setAppid(waiConfig.getAppid());
-        ai.setC_account("15060063160");
-        ai.setFormat("json");
-        ai.setMerchant_id("order01");
-        ai.setNotify_url("http://218.85.55.253:38080/open-api/film/notify/aiqiyiOrderNotify");
-        ai.setTime(timestamp);
-        //sign 加密
-        Map<String,Object> param = new HashMap<String,Object>();
-        //公共参数
-        param.put("appid",ai.getAppid());
-        param.put("c_account",ai.getC_account());
-        param.put("format",ai.getFormat());
-        param.put("merchant_id",ai.getMerchant_id());
-        param.put("notify_url",ai.getNotify_url());
-        param.put("time",ai.getTime());
-
-        String sign = getSign(param,waiConfig.getSecret());
-        System.out.println(sign);
-        String md5 = MD5Utils.MD5Encode(sign);
-        ai.setSign(md5);
-
-        String str = aiService.rechargeAiMonth(ai);
-        System.out.println(str);
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

jsjp-admin/src/test/java/com/miaxis/test/FuluTest.java

@@ -1,48 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.JsjpApplication;
-import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.feign.dto.fulu.FuluDTO;
-import com.miaxis.feign.service.IFuluService;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.service.IWxOrderService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-public class FuluTest {
-    @Autowired
-    private IFuluService fuluService;
-
-    String AppSecret = "0a091b3aa4324435aab703142518a8f7";
-
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-
-    @Test
-    public void test1()  {
-//        WxOrder wxOrder =new WxOrder();
-////        JSONObject jsonObject = new JSONObject();
-////        jsonObject.put("product_id",wxOrderCreateDTO.getProduct_id());
-////        wxOrderService.createFuluOrder();
-
-    }
-
-
-
-
-
-
-
-
-}

jsjp-admin/src/test/java/com/miaxis/test/NewGzptTest.java

@@ -0,0 +1,69 @@
+package com.miaxis.test;
+
+
+import com.miaxis.JsjpApplication;
+import com.miaxis.common.utils.DateUtils;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.domain.GzptVideoVip;
+import com.miaxis.newgzpt.service.IGzptUserInfoService;
+import com.miaxis.newgzpt.service.IGzptVideoVipService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Date;
+
+@SpringBootTest(classes = JsjpApplication.class)
+@RunWith(SpringRunner.class)
+public class NewGzptTest {
+
+    @Autowired
+    private IGzptUserInfoService gzptUserInfoService;
+
+    @Autowired
+    private IGzptVideoVipService gzptVideoVipService;
+
+    @Test
+    public void test1() throws Exception {
+        //      List<GzptUserInfo> list = gzptUserInfoService.getList();
+
+        GzptUserInfo gzptUserInfo = gzptUserInfoService.getInfoById(68l);
+        System.out.println(gzptUserInfo);
+    }
+
+    @Test
+    public void test2() throws Exception {
+        GzptVideoVip videoVip = new GzptVideoVip();
+        videoVip.setUserId(68l);
+        videoVip.setUserName("测试");
+        videoVip.setLogincode("510106199511184265");
+        videoVip.setSubject1(new Date());
+        videoVip.setSubject2(new Date());
+        videoVip.setSubject3(new Date());
+        videoVip.setSubject4(new Date());
+        gzptVideoVipService.saveGzptVideoVip(videoVip);
+    }
+
+
+    @Test
+    public void test3() throws Exception {
+        GzptVideoVip videoVip = new GzptVideoVip();
+        videoVip.setUserId(68l);
+        videoVip.setUserName("测试2");
+        videoVip.setLogincode("510106199511184265");
+
+        Date d1 = DateUtils.parseDate("2021-01-01 12:00:00");
+        Date d2 = DateUtils.parseDate("2022-01-01 12:00:00");
+        Date d3 = DateUtils.parseDate("2023-01-01 12:00:00");
+        Date d4 = DateUtils.parseDate("2024-01-01 15:00:00");
+        videoVip.setSubject1(d1);
+        videoVip.setSubject2(d2);
+        videoVip.setSubject3(d3);
+        videoVip.setSubject4(d4);
+        gzptVideoVipService.updateGzptVideoVipByUserId(videoVip);
+    }
+
+
+}

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

@@ -1,91 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.JsjpApplication;
-import com.miaxis.common.enums.OrderStatusEnum;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.feign.dto.FilmDTO;
-import com.miaxis.feign.dto.FilmMcpData;
-import com.miaxis.feign.dto.FilmXdResult;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.dto.WxNotifyReturnDTO;
-import com.miaxis.wx.dto.WxOrderCreateDTO;
-import com.miaxis.wx.service.IWxOrderService;
-import com.miaxis.wx.service.IRefundRecordService;
-import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-
-import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
-
-//@ActiveProfiles("prod")
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-public class NormalTest {
-    @Autowired
-    private IWxOrderService wxOrderService;
-
-    @Autowired
-    private IRefundRecordService refundRecordService;
-
-    @Autowired
-    private AutoUpdateCertificatesVerifier verifier;
-
-    @Autowired
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-    @Test
-    public void test1() throws Exception {
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo("12021060816391765454799220937462");
-        WxNotifyReturnDTO refund = refundRecordService.refund(wxOrder, "12021060816391765454799220937463","商品购买失败");
-        System.out.println(JSONObject.toJSONString(refund));
-//        WxOrder wxOrder1 = wxOrderService.getByOutTradeNo("12021052415260767148145493655617");
-//        refundRecordService.refund(wxOrder1,"12021051815333778448136985596489");
-    }
-
-    @Test
-    public void test11() throws Exception {
-        threadPoolTaskExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                System.out.println(Thread.currentThread()+"aaa");
-
-            }
-        });
-
-        if (true){
-            System.out.println("低分段");
-            threadPoolTaskExecutor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        System.out.println(Thread.currentThread()+"bbb");
-                    } catch (Exception e) {
-                        throw new CustomException("订单:推送消息失败");
-                    }
-                }
-            });
-
-        }
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-}

jsjp-admin/src/test/java/com/miaxis/test/NormalTest3.java

@@ -1,123 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.JsjpApplication;
-import com.miaxis.carousel.service.IHomePageDataInfoService;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import com.miaxis.common.config.PddConfig;
-import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.feign.dto.Pdd;
-import com.miaxis.feign.service.IPddService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-public class NormalTest3 {
-
-    @Autowired
-    private IPddService pddService;
-    @Autowired
-    private IHomePageDataInfoService homePageDataInfoService;
-
-    @Autowired
-    private PddConfig pddConfig;
-
-//    private static String client_id = "fa0f2debb5b0444b9719919d7b8204d1";
-//    private static String client_secret = "3305b6bb37252495848e67fd991134651e308495";
-//    private static String pid = "1642187_203462988";
-
-
-    public static String getPddSign(Map<String, Object> params,String client_secret) {
-        Map<String, Object> sortMap = new TreeMap<String, Object>();
-        sortMap.putAll(params);
-        // 以k1v1k2v2...方式拼接参数
-        StringBuilder builder = new StringBuilder();
-        for (Map.Entry<String, Object> s : sortMap.entrySet()) {
-            String k = s.getKey();
-            Object v = s.getValue();
-            builder.append(k).append(v);
-        }
-        builder.append(client_secret);
-        builder.insert(0,client_secret);
-        return builder.toString();
-    }
-
-    @Test
-    public void test() throws Exception {
-        long timeLong = System.currentTimeMillis();
-        String timestamp = String.valueOf(timeLong/1000);
-        Pdd pdd = new Pdd();
-        //公共请救参数
-        pdd.setType("pdd.ddk.resource.url.gen");
-        pdd.setClient_id(pddConfig.getClientId());
-        pdd.setTimestamp(timestamp);
-        //请求参数
-        pdd.setGenerate_we_app(true);
-        pdd.setPid(pddConfig.getPid());
-        System.out.println("---"+pddConfig.getPid()+"-----");
-   //     pdd.setResource_type(39996);
-        pdd.setResource_type(50005);
-//        pdd.setResource_type(50005);
-        //sign 加密
-        Map<String,Object> param = new HashMap<String,Object>();
-        //公共参数
-        param.put("type",pdd.getType());
-        param.put("client_id",pddConfig.getClientId());
-        param.put("timestamp",pdd.getTimestamp());
-        //请求参数
-        param.put("generate_we_app",pdd.getGenerate_we_app());
-        param.put("pid",pddConfig.getPid());
-        param.put("resource_type",pdd.getResource_type());
-        String sign = getPddSign(param,pddConfig.getClientSecret());
-        String md5 = MD5Utils.MD5Encode(sign).toUpperCase();
-        pdd.setSign(md5);
-
-        String result = pddService.getPdd(pdd);
-        System.out.println(result);
-
-
-        JSONObject json = JSONObject.parseObject(result);
-        String resourceUrlResponseJson = json.get("resource_url_response").toString();
-        JSONObject json2  = JSONObject.parseObject(resourceUrlResponseJson);
-        String waAppInfo = json2.get("we_app_info").toString();
-
-        JSONObject waAppInfoJson = JSONObject.parseObject(waAppInfo);
-
-        String pagePath = waAppInfoJson.get("page_path").toString();
-        String appId = waAppInfoJson.get("app_id").toString();
-
-        System.out.println(pagePath);
-        System.out.println(pagePath);
-        System.out.println(pagePath);
-
-//        HomePageDataInfoVo hp = new HomePageDataInfoVo();
-//        hp.setPictureName("话费充值");
-//        hp.setJumpUrl("{\"appId\":\""+appId+"\",\"path\":\""+pagePath+"\"}");
-//        homePageDataInfoService.updateHomePageDataByPictureName(hp);
-//        homePageDataInfoService.synchroData();
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

jsjp-admin/src/test/java/com/miaxis/test/NormalTest5.java

@@ -1,111 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.JsjpApplication;
-import com.miaxis.carousel.service.IHomePageDataInfoService;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import com.miaxis.common.config.MeiConfig;
-import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.feign.dto.Mei;
-import com.miaxis.feign.service.IMeiService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-@Slf4j
-public class NormalTest5 {
-
-    @Autowired
-    private IMeiService meiService;
-    @Autowired
-    private IHomePageDataInfoService homePageDataInfoService;
-
-    @Autowired
-    private MeiConfig meiConfig;
-
-
-//    private String actId = "2";  // 必填  	活动id，可以在联盟活动列表中查看获取 2
-//    private String key = "610077fffb51712efaa686d9ffb623da"; //必填 appkey 514202a9238958b16cb13805d6f79273
-//    private String secret = "514202a9238958b16cb13805d6f79273";
-//    private String sid = "jsshq001"; //必填
-//
-//    private String appId = "wxde8ac0a21135c07d";
-
-    public static String getMeiSign(Map<String, Object> params,String client_secret) {
-        Map<String, Object> sortMap = new TreeMap<String, Object>();
-        sortMap.putAll(params);
-        // 以k1v1k2v2...方式拼接参数
-        StringBuilder builder = new StringBuilder();
-        for (Map.Entry<String, Object> s : sortMap.entrySet()) {
-            String k = s.getKey();
-            Object v = s.getValue();
-            builder.append(k).append(v);
-        }
-        builder.append(client_secret);
-        builder.insert(0,client_secret);
-        return builder.toString();
-    }
-
-    @Test
-    public void test() throws Exception {
-        long timeLong = System.currentTimeMillis();
-        String timestamp = String.valueOf(timeLong/1000);
-        Mei mei = new Mei();
-        mei.setActId(meiConfig.getActId());
-        mei.setKey(meiConfig.getKey());
-        mei.setSid(meiConfig.getSid());
-        mei.setLinkType("4");
-
-        Map<String,Object> param = new HashMap<String,Object>();
-        param.put("actId",meiConfig.getActId());
-        param.put("key",meiConfig.getKey());
-        param.put("sid",meiConfig.getSid());
-
-        param.put("linkType",4);
-        String sign = this.getMeiSign(param,meiConfig.getSecret());
-        System.out.println(sign);
-        String md5 = MD5Utils.MD5Encode(sign);
-        mei.setSign(md5);
-
-        System.out.println(md5);
-        String result = meiService.geMeiUrl(mei);
-        System.out.println(result);
-
-
-        JSONObject json = JSONObject.parseObject(result);
-        String status = json.get("status").toString();
-        String des = json.get("des").toString();
-        String pagePath = json.get("data").toString();
-
-        HomePageDataInfoVo hp = new HomePageDataInfoVo();
-        hp.setPictureName("美团红包");
-        hp.setJumpUrl("{\"appId\":\""+meiConfig.getAppId()+"\",\"path\":\""+pagePath+"\"}");
-        log.info("更新数据条数:"+homePageDataInfoService.updateHomePageDataByPictureName(hp));
-        hp.setPictureName("美团外卖");
-        hp.setJumpUrl("{\"appId\":\""+meiConfig.getAppId()+"\",\"path\":\""+pagePath+"\"}");
-        log.info("更新数据条数:"+homePageDataInfoService.updateHomePageDataByPictureName(hp));
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

jsjp-admin/src/test/java/com/miaxis/test/UpdateCarTest.java

@@ -1,249 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.miaxis.JsjpApplication;
-import com.miaxis.car.domain.CarBrandInfo;
-import com.miaxis.car.domain.CarParameterData;
-import com.miaxis.car.mapper.CarParameterDataMapper;
-import com.miaxis.car.service.ICarBrandInfoService;
-import com.miaxis.common.enums.FileUploadTypeEnum;
-import com.miaxis.feign.service.ICarService;
-import com.qcloud.cos.COSClient;
-import com.qcloud.cos.model.ObjectMetadata;
-import com.qcloud.cos.model.PutObjectRequest;
-import com.qcloud.cos.model.PutObjectResult;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.*;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/5/21 11:51
- */
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-public class UpdateCarTest {
-
-    @Autowired
-    private ICarService carService;
-
-    @Autowired
-    private ICarBrandInfoService carBrandInfoService;
-
-    @Autowired
-    private COSClient cosClient;
-
-    @Resource
-    private CarParameterDataMapper carParameterDataMapper;
-
-    private static String bucketName="t1-1305573081";
-    private static String path="https://t1-1305573081.file.myqcloud.com";
-    private static String preffix="t1";
-
-    /**
-     * 获取第三方汽车品牌接口
-     * @return
-     */
-    @Test
-    public void carBrand(){
-        String result = carService.car("brand","0,1,2,3","300");
-        JSONObject jsonString = JSONObject.parseObject(result);
-        List<Map> info = (List<Map>)jsonString.get("info");
-        ArrayList<CarBrandInfo> carBrandInfos = new ArrayList<>();
-        for (Map map : info) {
-            carBrandInfos.add(JSON.parseObject(JSON.toJSONString(map), CarBrandInfo.class));
-        }
-//        carBrandInfoService.saveBatch(carBrandInfos);
-        System.out.println(carBrandInfos);
-    }
-
-
-    @Test
-    public void test1() throws Exception {
-
-        List<CarBrandInfo> list = carBrandInfoService.list(new QueryWrapper<CarBrandInfo>().like("img", "car"));
-
-        for (CarBrandInfo carBrandInfo : list) {
-            URL httpUrl = new URL(carBrandInfo.getImg());
-            HttpURLConnection conn = (HttpURLConnection)httpUrl.openConnection();
-            conn.setRequestMethod("GET");
-            conn.setConnectTimeout(5 * 1000);
-            //通过输入流获取图片数据
-            InputStream inStream = conn.getInputStream();
-            //从输入流中获取得到图片的二进制数据
-            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int len = 0;
-            while( (len=inStream.read(buffer)) != -1 ){
-                outStream.write(buffer, 0, len);
-            }
-            byte[] btImg = outStream.toByteArray();
-            InputStream byteArrayInputStream = new ByteArrayInputStream(btImg);
-            int length = btImg.length;
-            ObjectMetadata objectMetadata = new ObjectMetadata();
-            // 从输入流上传必须制定content length, 否则http客户端可能会缓存所有数据，存在内存OOM的情况
-            objectMetadata.setContentLength(length);
-            // bucket的命名规则为{name}-{appid} ，此处填写的存储桶名称必须为此格式
-            String bucketName = this.bucketName;
-
-            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() + ".png";
-            // 指定要上传到 COS 上的路径
-            String key = "/"+this.preffix+"/"+FileUploadTypeEnum.CAR_BRAND.getFileType()+"/"+year+"/"+month+"/"+day+"/"+storagefileName;
-            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, key, byteArrayInputStream,objectMetadata);
-            PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
-            String fileUrl=this.path + putObjectRequest.getKey();
-            inStream.close();
-            System.out.println("--------------"+fileUrl);
-            System.out.println("--------------"+key);
-
-            //更新汽车品牌logo
-            carBrandInfo.setImg(fileUrl);
-            carBrandInfo.setImgPath(key);
-            carBrandInfoService.updateById(carBrandInfo);
-        }
-
-    }
-
-
-    /**
-     * 新增二手车参数
-     * @return
-     */
-    @Test
-    public void addUsedCarData(){
-        //车型  model
-        List<String> strings1 = Arrays.asList("轿车","SUV", "MPV", "跑车","面包车", "皮卡", "微卡");
-        //价格 selling_price
-        List<String> strings2 = Arrays.asList("1万元以内","1-2万元", "2-3万元", "3-5万元","5-8万元", "8-12万元", "12-18万元", "18-24万元", "24-40万元", "40万元以上");
-        //变速箱 transmission_case
-        List<String> strings3 = Arrays.asList("手动","自动");
-        //排放标准---------
-        List<String> strings4 = Arrays.asList("国二","国三","国四","国五","国六");
-        //排量 vehicle_displacement
-        List<String> strings5 = Arrays.asList("1.0L及以下","1.1L-1.6L","1.7L-2.0L","2.1L-2.5L","2.6L-3.0L","3.1L-4.0L","4.0L以上");
-        //座位数 number_of_seats
-        List<String> strings6 = Arrays.asList("2座","4座","5座","6座","7座");
-        //燃料类型 fuel
-        List<String> strings7 = Arrays.asList("汽油","柴油","电动","油电混动");
-        //驱动 driving_mode
-        List<String> strings8 = Arrays.asList("前驱","后驱","四驱");
-        //结构 body_structure
-        List<String> strings9 = Arrays.asList("两厢","三厢", "掀背", "旅行版","硬顶敞篷车","软顶敞篷车","硬顶跑车","客车","货车");
-        //里程 mileage
-        List<String> strings10 = Arrays.asList("1万公里内","1-3万公里", "3-5万公里", "5-8万公里","8-12万公里","12-18万公里","18万公里以上");
-
-        for (int i = 0; i < strings1.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings1.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("model");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings2.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings2.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("selling_price");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings3.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings3.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("transmission_case");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings4.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings4.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("emission_standard");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings5.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings5.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("vehicle_displacement");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings6.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings6.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("number_of_seats");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings7.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings7.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("fuel");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings8.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings8.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("driving_mode");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings9.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings9.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("body_structure");
-            carParameterDataMapper.insert(carParameterData);
-        }
-        for (int i = 0; i < strings10.size(); i++) {
-            int s = i;
-            CarParameterData carParameterData = new CarParameterData();
-            carParameterData.setParameterName(strings10.get(i));
-            carParameterData.setParameterValue(String.valueOf(s+1));
-            carParameterData.setParameterSort(s+1);
-            carParameterData.setParameterType("mileage");
-            carParameterDataMapper.insert(carParameterData);
-        }
-
-
-    }
-
-
-}

jsjp-admin/src/test/java/com/miaxis/test/WxTest.java

@@ -1,121 +0,0 @@
-package com.miaxis.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.JsjpApplication;
-import com.miaxis.feign.dto.AddTemplate;
-import com.miaxis.feign.dto.WxSend;
-import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.wx.domain.WxOrder;
-import com.miaxis.wx.service.IWxOrderService;
-import com.miaxis.wx.service.IWxXcxMessageService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@SpringBootTest(classes = JsjpApplication.class)
-@RunWith(SpringRunner.class)
-public class WxTest {
-
-    private String token ="45__6qC8wIAVRtGuk7lz5IlBk678dvuA3383qRGcHJ721sttRJSvxwz6ppCXHIfSFs6AWVdfek21KYvmokK1C3NlUnfYPXm_pKAhm61d9Q6pA1CENOAyIxbX3nJ5NP1knSZUzMLN73pRtGdNXvYWPEgAHARKZ";
-
-    private String token2 ="45_nGtdvZCMg8Kqr74QKw2po6FfKfdUaMYVGOGnnkz1ft1sSF8PzfYTk3hoxjynUx6cgos0WgpGUMU8ymmSw73s3UOkhb__vBJrFUyRLtDzAcQgk34IiRprxcrRo_unC_RftEklW6VM8bc0F7dCXALdAFABEP";
-
-    @Autowired
-    private IWxSendService wxSendService;
-
-    @Autowired
-    private IWxXcxMessageService wxXcxMessageService;
-
-    @Value("${app.appid}")
-    private String appid;
-    @Value("${app.secret}")
-    private String secret;
-
-
-    /**
-     * 获取微信小程序token
-     */
-    @Test
-    public void getWxgetTokenService(){
-        String result = wxSendService.getAccessToken("client_credential",appid,secret);
-        JSONObject json = JSONObject.parseObject(result);
-        String accessToken = json.get("access_token").toString();
-        String expiresIn = json.get("expires_in").toString();
-        System.out.println(accessToken);
-        System.out.println(expiresIn);
-    }
-
-    @Test
-    public void getWxSendService(){
-        WxSend wxSend = new WxSend();
-        wxSend.setAccess_token(token2);
-        wxSend.setTouser("oO7PJ5FlradAM7tqw3TM2zvEj4O4");
-        wxSend.setTemplate_id("NlZAFJj1p5aHFOg6BBesP7xFAJh5kIZ0kp_YwtJje0g");
-        wxSend.setPage("/pages/index/index?active=user");
-
-        JSONObject jsonObject = new JSONObject();
-        JSONObject jsonObject1 = new JSONObject();
-        JSONObject jsonObject2 = new JSONObject();
-        JSONObject jsonObject3 = new JSONObject();
-        jsonObject1.put("value","2019年10月1日");
-        jsonObject2.put("value","林霖强");
-        jsonObject3.put("value","3");
-        jsonObject.put("time3",jsonObject1);
-        jsonObject.put("name1",jsonObject2);
-        jsonObject.put("thing2",jsonObject3);
-
-        wxSend.setData(jsonObject);
-        wxSend.setMiniprogram_state("developer");
-        wxSend.setLang("zh_CN");
-
-        String result = wxSendService.sendMessage(token,wxSend);
-        System.out.println(result);
-    }
-
-
-    @Test
-    public void getWxSendService2(){
-//        WxOrder wxOrder = wxOrderService.getByOutTradeNo("");
-        WxSend wxSend = new WxSend();
-        wxSend.setAccess_token(wxXcxMessageService.getXcxMessageToken());
-        wxSend.setTouser("oO7PJ5FlradAM7tqw3TM2zvEj4O4");
-        wxSend.setTemplate_id("Q4-tQrDwtzFUSLt_PR2kuTxBJ3d62V4Yp2iwx4PAcIE");
-        wxSend.setPage("/pages/cinema/orderdes?outTradeNo="+"12021053117040103901269463601171");
-
-        JSONObject jsonObject = new JSONObject();
-        JSONObject jsonObject1 = new JSONObject();
-        JSONObject jsonObject2 = new JSONObject();
-        JSONObject jsonObject3 = new JSONObject();
-        JSONObject jsonObject4 = new JSONObject();
-        JSONObject jsonObject5 = new JSONObject();
-
-        jsonObject1.put("value","12021053117040103901269463601171");
-        jsonObject2.put("value","￥"+"250");
-        jsonObject3.put("value",new SimpleDateFormat("yyyy年MM月dd日 HH:mm").format(new Date()));
-        jsonObject4.put("value","电影票");
-        jsonObject5.put("value","点击查看取票二维码");
-
-        jsonObject.put("character_string1",jsonObject1);
-        jsonObject.put("amount3",jsonObject2);
-        jsonObject.put("date4",jsonObject3);
-        jsonObject.put("thing6",jsonObject4);
-        jsonObject.put("thing5",jsonObject5);
-
-
-        wxSend.setData(jsonObject);
-        wxSend.setMiniprogram_state("developer");
-        wxSend.setLang("zh_CN");
-
-        String result = wxSendService.sendMessage(wxXcxMessageService.getXcxMessageToken(),wxSend);
-        System.out.println(result);
-    }
-
-
-
-}

jsjp-common/src/main/java/com/miaxis/common/config/MeiConfig.java

@@ -1,17 +0,0 @@
-package com.miaxis.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "mei")
-public class MeiConfig {
-
-   private String actId;
-   private String key;
-   private String secret;
-   private String sid;
-   private String appId;
-}

jsjp-common/src/main/java/com/miaxis/common/config/PddConfig.java

@@ -1,15 +0,0 @@
-package com.miaxis.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "pdd")
-public class PddConfig {
-
-    private String clientId;
-    private String clientSecret;
-    private String pid;
-}

jsjp-common/src/main/java/com/miaxis/common/config/WaiConfig.java

@@ -1,14 +0,0 @@
-package com.miaxis.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "wai")
-public class WaiConfig {
-
-    private String appid;
-    private String secret;
-}

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

@@ -105,7 +105,7 @@ public class UserInfo extends BaseBusinessEntity{
     @Excel(name = "公众平台用户Id")
     @TableField("gzpt_user_id")
     @ApiModelProperty(value = "公众平台用户Id")
-    private Integer gzptUserId;
+    private Long gzptUserId;
 
 
 

jsjp-service/src/main/java/com/miaxis/car/domain/CarBrandInfo.java

@@ -1,44 +0,0 @@
-package com.miaxis.car.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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 汽车品牌表
- * @author wwl
- * @version 1.0
- * @date 2021/5/21 10:36
- */
-@Data
-@TableName("car_brand_info")
-@ApiModel(value = "CarBrandInfo", description = "汽车品牌表 car_brand_info")
-public class CarBrandInfo {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @TableField("name")
-    @ApiModelProperty(value = "汽车品牌")
-    private String name;
-
-    @TableField("img")
-    @ApiModelProperty(value = "品牌logo")
-    private String img;
-
-    @TableField("first_Letter")
-    @ApiModelProperty(value = "品牌首字母")
-    private String firstletter;
-
-    @TableField("img_path")
-    @ApiModelProperty(value = "品牌logo文件路径")
-    private String imgPath;
-
-
-}

jsjp-service/src/main/java/com/miaxis/car/domain/CarParameterData.java

@@ -1,48 +0,0 @@
-package com.miaxis.car.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;
-
-/**
- * 汽车参数数据对象 car_parameter_data
- * @author wwl
- * @version 1.0
- * @date 2021/5/27 17:01
- */
-@Data
-@TableName("car_parameter_data")
-@ApiModel(value = "CarParameterData", description = "汽车参数数据对象 car_parameter_data")
-public class CarParameterData extends BaseBusinessEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    @TableField("parameter_name")
-    @ApiModelProperty(value = "参数名")
-    private String parameterName;
-
-    @TableField("parameter_value")
-    @ApiModelProperty(value = "参数值")
-    private String parameterValue;
-
-    @TableField("parameter_type")
-    @ApiModelProperty(value = "参数类型（关联car_parameter_type）")
-    private String parameterType;
-
-    @TableField("parameter_sort")
-    @ApiModelProperty(value = "排序")
-    private Integer parameterSort;
-
-    @TableField("status")
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    private String status;
-
-}

jsjp-service/src/main/java/com/miaxis/car/domain/CarParameterType.java

@@ -1,39 +0,0 @@
-package com.miaxis.car.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;
-
-/**
- * 汽车参数类型对象 car_parameter_type
- * @author wwl
- * @version 1.0
- * @date 2021/5/27 17:04
- */
-@Data
-@TableName("car_parameter_type")
-@ApiModel(value = "CarParameterType", description = "汽车参数类型对象 car_parameter_type")
-public class CarParameterType extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    @TableField("parameter_name")
-    @ApiModelProperty(value = "参数名")
-    private String parameterName;
-
-    @TableField("parameter_type")
-    @ApiModelProperty(value = "参数类型")
-    private String parameterType;
-
-    @TableField("status")
-    @ApiModelProperty(value = "状态（0正常 1停用）")
-    private String status;
-}

jsjp-service/src/main/java/com/miaxis/car/domain/UsedCarFile.java

@@ -1,31 +0,0 @@
-package com.miaxis.car.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- *  二手车图片关联对象
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 14:13
- */
-@Data
-@TableName("used_car_file")
-@ApiModel(value = "UsedCarFile", description = "二手车图片关联对象 used_car_file")
-public class UsedCarFile {
-
-    @TableField("used_car_id")
-    @ApiModelProperty(value = "二手车id")
-    private Long usedCarId;
-
-    @TableField("file_id")
-    @ApiModelProperty(value = "图片id")
-    private Long fileId;
-
-    @TableField("sign")
-    @ApiModelProperty(value = "主图标识（同一个used_car_id下只有一个main）")
-    private String sign;
-}

jsjp-service/src/main/java/com/miaxis/car/domain/UsedCarInfo.java

@@ -1,137 +0,0 @@
-package com.miaxis.car.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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 二手车对象 used_car_info
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 13:38
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(autoResultMap = true)
-@ApiModel(value = "UsedCarInfo", description = "二手车对象 used_car_info")
-public class UsedCarInfo extends BaseBusinessEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id(user_info表id)")
-    private Long userId;
-
-    /** 车辆品牌id（关联car_brand_info表） */
-    @TableField("car_brand")
-    @ApiModelProperty(value = "车辆品牌id（关联car_brand_info表）")
-    private Long carBrand;
-
-    /** 车系车款 */
-    @TableField("car_series")
-    @ApiModelProperty(value = "车系车款")
-    private String carSeries;
-
-    /** 汽车排量 */
-    @TableField("vehicle_displacement")
-    @ApiModelProperty(value = "汽车排量")
-    private String vehicleDisplacement;
-
-    /** 购买日期 */
-    @TableField("purchase_date")
-    @ApiModelProperty(value = "购买日期")
-    private Date purchaseDate;
-
-    /** 出售价格 */
-    @TableField("selling_price")
-    @ApiModelProperty(value = "出售价格")
-    private BigDecimal sellingPrice;
-
-    /** 车辆介绍 */
-    @TableField("vehicle_introduction")
-    @ApiModelProperty(value = "车辆介绍")
-    private String vehicleIntroduction;
-
-    /** 生产国 */
-    @TableField("producing_country")
-    @ApiModelProperty(value = "生产国")
-    private Integer producingCountry;
-
-    /** 座位数 */
-    @TableField("number_of_seats")
-    @ApiModelProperty(value = "座位数")
-    private Integer numberOfSeats;
-
-    /** 车型 */
-    @TableField("model")
-    @ApiModelProperty(value = "车型")
-    private Integer model;
-
-    /** 燃料 */
-    @TableField("fuel")
-    @ApiModelProperty(value = "燃料")
-    private String fuel;
-
-    /** 车身结构 */
-    @TableField("body_structure")
-    @ApiModelProperty(value = "车身结构")
-    private String bodyStructure;
-
-    /** 驱动方式 */
-    @TableField("driving_mode")
-    @ApiModelProperty(value = "驱动方式")
-    private String drivingMode;
-
-    /** 变速箱 */
-    @TableField("transmission_case")
-    @ApiModelProperty(value = "变速箱")
-    private String transmissionCase;
-
-    /** 购买价格 */
-    @TableField("purchase_price")
-    @ApiModelProperty(value = "购买价格")
-    private BigDecimal purchasePrice;
-
-    /** 过户次数 */
-    @TableField("transfer_frequency")
-    @ApiModelProperty(value = "过户次数")
-    private Integer transferFrequency;
-
-    /** 排放标准 */
-    @TableField("emission_standard")
-    @ApiModelProperty(value = "排放标准")
-    private Integer emissionStandard;
-
-    /** 看车点 */
-    @TableField("car_watching_point")
-    @ApiModelProperty(value = "看车点")
-    private String carWatchingPoint;
-
-    @TableField("examine_status")
-    @ApiModelProperty(value = "审核状态  0：待审核(默认)、1：审核通过、2：审核未通过")
-    private String examineStatus;
-
-    @TableField("audit_information")
-    @ApiModelProperty(value = "审核信息（审核未通过原因）")
-    private String auditInformation;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/car/dto/ExamineUsedCarDto.java

@@ -1,31 +0,0 @@
-package com.miaxis.car.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 二手车审核入参
- * @author wwl
- * @version 1.0
- * @date 2021/5/27 15:36
- */
-@Data
-@ApiModel(value = "UsedCarInfoDto", description = "二手车审核入参")
-public class ExamineUsedCarDto {
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @TableField("examine_status")
-    @ApiModelProperty(value = "审核状态  0：待审核(默认)、1：审核通过、2：审核未通过")
-    private String examineStatus;
-
-    @TableField("audit_information")
-    @ApiModelProperty(value = "审核信息（审核未通过原因）")
-    private String auditInformation;
-
-}

jsjp-service/src/main/java/com/miaxis/car/dto/UsedCarInfoDto.java

@@ -1,110 +0,0 @@
-package com.miaxis.car.dto;
-
-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;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 二手车对象 used_car_info 入参
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 14:03
- */
-@Data
-@ApiModel(value = "UsedCarInfoDto", description = "二手车对象入参")
-public class UsedCarInfoDto {
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id(user_info表id)")
-    private Long userId;
-
-    @TableField("car_brand")
-    @ApiModelProperty(value = "车辆品牌id（关联car_brand_info表）")
-    private Long carBrand;
-
-    @TableField("car_series")
-    @ApiModelProperty(value = "车系车款")
-    private String carSeries;
-
-    @TableField("vehicle_displacement")
-    @ApiModelProperty(value = "汽车排量")
-    private String vehicleDisplacement;
-
-    @TableField("purchase_date")
-    @ApiModelProperty(value = "购买日期")
-    private Date purchaseDate;
-
-    @TableField("selling_price")
-    @ApiModelProperty(value = "出售价格")
-    private BigDecimal sellingPrice;
-
-    @TableField("vehicle_introduction")
-    @ApiModelProperty(value = "车辆介绍")
-    private String vehicleIntroduction;
-
-    @TableField("producing_country")
-    @ApiModelProperty(value = "生产国")
-    private Integer producingCountry;
-
-    @TableField("number_of_seats")
-    @ApiModelProperty(value = "座位数")
-    private Integer numberOfSeats;
-
-    @TableField("model")
-    @ApiModelProperty(value = "车型")
-    private Integer model;
-
-    @TableField("fuel")
-    @ApiModelProperty(value = "燃料")
-    private String fuel;
-
-    @TableField("body_structure")
-    @ApiModelProperty(value = "车身结构")
-    private String bodyStructure;
-
-    @TableField("driving_mode")
-    @ApiModelProperty(value = "驱动方式")
-    private String drivingMode;
-
-    @TableField("transmission_case")
-    @ApiModelProperty(value = "变速箱")
-    private String transmissionCase;
-
-    @TableField("purchase_price")
-    @ApiModelProperty(value = "购买价格")
-    private BigDecimal purchasePrice;
-
-    @TableField("transfer_frequency")
-    @ApiModelProperty(value = "过户次数")
-    private Integer transferFrequency;
-
-    @TableField("emission_standard")
-    @ApiModelProperty(value = "排放标准")
-    private Integer emissionStandard;
-
-    @TableField("car_watching_point")
-    @ApiModelProperty(value = "看车点")
-    private String carWatchingPoint;
-
-    @ApiModelProperty(value = "主图标识-图片id")
-    private Long mainSignId;
-
-    @ApiModelProperty(value = "图片ids集合")
-    private List<Long> pictureIds;
-
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-}

jsjp-service/src/main/java/com/miaxis/car/mapper/CarBrandInfoMapper.java

@@ -1,12 +0,0 @@
-package com.miaxis.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.car.domain.CarBrandInfo;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/5/21 10:46
- */
-public interface CarBrandInfoMapper extends BaseMapper<CarBrandInfo> {
-}

jsjp-service/src/main/java/com/miaxis/car/mapper/CarParameterDataMapper.java

@@ -1,13 +0,0 @@
-package com.miaxis.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.car.domain.CarParameterData;
-
-/**
- * 汽车参数数据Mapper接口
- * @author wwl
- * @version 1.0
- * @date 2021/5/27 17:03
- */
-public interface CarParameterDataMapper extends BaseMapper<CarParameterData> {
-}

jsjp-service/src/main/java/com/miaxis/car/mapper/CarParameterTypeMapper.java

@@ -1,13 +0,0 @@
-package com.miaxis.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.car.domain.CarParameterType;
-
-/**
- * 汽车参数类型Mapper接口
- * @author wwl
- * @version 1.0
- * @date 2021/5/27 17:06
- */
-public interface CarParameterTypeMapper extends BaseMapper<CarParameterType> {
-}

jsjp-service/src/main/java/com/miaxis/car/mapper/UsedCarFileMapper.java

@@ -1,13 +0,0 @@
-package com.miaxis.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.car.domain.UsedCarFile;
-
-/**
- * 二手车图片关联Mapper接口
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 14:15
- */
-public interface UsedCarFileMapper extends BaseMapper<UsedCarFile> {
-}

jsjp-service/src/main/java/com/miaxis/car/mapper/UsedCarInfoMapper.java

@@ -1,23 +0,0 @@
-package com.miaxis.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.car.domain.UsedCarInfo;
-
-import java.util.List;
-
-/**
- * 二手车Mapper接口
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 13:41
- */
-public interface UsedCarInfoMapper extends BaseMapper<UsedCarInfo> {
-
-    /**
-     * 查询二手车列表
-     *
-     * @param usedCarInfo 二手车
-     * @return 二手车集合
-     */
-    List<UsedCarInfo> selectUsedCarInfoList(UsedCarInfo usedCarInfo);
-}

jsjp-service/src/main/java/com/miaxis/car/service/ICarBrandInfoService.java

@@ -1,21 +0,0 @@
-package com.miaxis.car.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.car.domain.CarBrandInfo;
-import com.miaxis.common.core.domain.Response;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/5/21 10:41
- */
-public interface ICarBrandInfoService extends IService<CarBrandInfo> {
-
-    /**
-     * 查询汽车品牌列表
-     * applet
-     * @return
-     */
-    Response selectCarBrandInfoList();
-
-}

jsjp-service/src/main/java/com/miaxis/car/service/IUsedCarInfoService.java

@@ -1,76 +0,0 @@
-package com.miaxis.car.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.car.domain.UsedCarInfo;
-import com.miaxis.car.dto.ExamineUsedCarDto;
-import com.miaxis.car.dto.UsedCarInfoDto;
-import com.miaxis.common.core.domain.Response;
-
-import java.util.List;
-
-/**
- * 二手车service接口
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 13:42
- */
-public interface IUsedCarInfoService extends IService<UsedCarInfo> {
-
-    /**
-     * 查询二手车列表
-     *
-     * @param usedCarInfo 二手车
-     * @return 二手车集合
-     */
-    List<UsedCarInfo> selectUsedCarInfoList(UsedCarInfo usedCarInfo);
-
-    /**
-     * applet
-     * 新增二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    Response saveUsedCarInfo(UsedCarInfoDto usedCarInfoDto);
-
-    /**
-     * 修改二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    Response updateUsedCarById(UsedCarInfoDto usedCarInfoDto);
-
-    /**
-     * 查询二手车参数列表
-     * @param parameterType
-     * @return
-     */
-    Response selectDictDataCarList(String[] parameterType);
-
-    /**
-     * 获取二手车详细信息
-     * @param id
-     * @return
-     */
-    Response getUsedCarById(Long id);
-
-    /**
-     * 编辑二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    Response editUsedCarById(UsedCarInfoDto usedCarInfoDto);
-
-    /**
-     * 二手车审核
-     * @param examineUsedCarDto
-     * @return
-     */
-    Response usedCarExamine(ExamineUsedCarDto examineUsedCarDto);
-
-    /**
-     * 删除二手车(伪删除)
-     * @param ids
-     * @return
-     */
-    Response removeUsedCarByIds(Long[] ids);
-}

jsjp-service/src/main/java/com/miaxis/car/service/impl/CarBrandInfoServiceImpl.java

@@ -1,46 +0,0 @@
-package com.miaxis.car.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.car.domain.CarBrandInfo;
-import com.miaxis.car.mapper.CarBrandInfoMapper;
-import com.miaxis.car.service.ICarBrandInfoService;
-import com.miaxis.common.core.domain.Response;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author wwl
- * @version 1.0
- * @date 2021/5/21 10:42
- */
-@Service
-@AllArgsConstructor
-public class CarBrandInfoServiceImpl extends ServiceImpl<CarBrandInfoMapper, CarBrandInfo> implements ICarBrandInfoService {
-
-    private final CarBrandInfoMapper carBrandInfoMapper;
-
-
-    /**
-     * 查询汽车品牌列表 used_car_file
-     * @return
-     */
-    @Override
-    public Response selectCarBrandInfoList() {
-        List<CarBrandInfo> list = this.list();
-        Map<String, List<CarBrandInfo>> map = new HashMap<>();
-        for(int i=0;i<26;i++) {
-            System.out.print((char)('A'+i)+" ");
-            String s = String.valueOf((char) ('A' + i));
-            map.put(s,list.stream().filter(m -> s.equals(m.getFirstletter())).collect(Collectors.toList()));
-        }
-        return Response.success(map);
-    }
-
-
-
-}

jsjp-service/src/main/java/com/miaxis/car/service/impl/UsedCarInfoServiceImpl.java

@@ -1,345 +0,0 @@
-package com.miaxis.car.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.car.domain.CarParameterData;
-import com.miaxis.car.domain.UsedCarFile;
-import com.miaxis.car.domain.UsedCarInfo;
-import com.miaxis.car.dto.ExamineUsedCarDto;
-import com.miaxis.car.dto.UsedCarInfoDto;
-import com.miaxis.car.mapper.CarParameterDataMapper;
-import com.miaxis.car.mapper.UsedCarFileMapper;
-import com.miaxis.car.mapper.UsedCarInfoMapper;
-import com.miaxis.car.service.IUsedCarInfoService;
-import com.miaxis.car.vo.UsedCarInfoVo;
-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.customer.domain.CustomerInfo;
-import com.miaxis.file.domain.FileInfo;
-import com.miaxis.file.service.IFileInfoService;
-import com.miaxis.system.mapper.SysDictDataMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static java.util.stream.Collectors.toList;
-
-/**
- * 二手车Service业务层处理
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 13:43
- */
-@Service
-@AllArgsConstructor
-public class UsedCarInfoServiceImpl extends ServiceImpl<UsedCarInfoMapper, UsedCarInfo> implements IUsedCarInfoService {
-
-    private final UsedCarInfoMapper usedCarInfoMapper;
-
-    private final UsedCarFileMapper usedCarFileMapper;
-
-    private final IFileInfoService fileInfoService;
-
-    private final CarParameterDataMapper carParameterDataMapper;
-
-    /**
-     * pc
-     * 查询二手车列表
-     *
-     * @param usedCarInfo 二手车
-     * @return 二手车
-     */
-    @Override
-    public List<UsedCarInfo> selectUsedCarInfoList(UsedCarInfo usedCarInfo){
-        return usedCarInfoMapper.selectUsedCarInfoList(usedCarInfo);
-    }
-
-    /**
-     * applet
-     * 新增二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response saveUsedCarInfo(UsedCarInfoDto usedCarInfoDto) {
-        try{
-            UsedCarInfo usedCarInfo = new UsedCarInfo();
-            BeanUtils.copyProperties(usedCarInfoDto,usedCarInfo);
-            //保存二手车信息
-            this.save(usedCarInfo);
-            //保存二手车图片关联表
-            List<Long> pictureIds = usedCarInfoDto.getPictureIds();
-            if (!pictureIds.isEmpty()){
-                for (Long pictureId : pictureIds) {
-                    UsedCarFile usedCarFile = new UsedCarFile();
-                    usedCarFile.setUsedCarId(usedCarInfo.getId());
-                    usedCarFile.setFileId(pictureId);
-                    //主图标识
-                    if (pictureId.equals(usedCarInfoDto.getMainSignId())){
-                        usedCarFile.setSign("main");
-                    }
-                    usedCarFileMapper.insert(usedCarFile);
-                }
-            }
-
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    /**
-     * pc
-     * 修改二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response updateUsedCarById(UsedCarInfoDto usedCarInfoDto) {
-            try{
-                UsedCarInfo usedCarInfo = new UsedCarInfo();
-                BeanUtils.copyProperties(usedCarInfoDto,usedCarInfo);
-                //修改二手车
-                usedCarInfoMapper.updateById(usedCarInfo);
-
-            //修改二手车图片关联表
-            List<UsedCarFile> usedCarFiles = usedCarFileMapper.selectByMap(new HashMap<String, Object>() {{
-                put("used_car_id", usedCarInfoDto.getId());
-            }});
-
-            //删除图片ids
-            List<Long> fileIds = usedCarFiles.parallelStream()
-                    .map(u -> u.getFileId()).collect(toList())
-                    .stream()
-                    .filter(item -> !usedCarInfoDto.getPictureIds().contains(item))
-                    .collect(toList());
-            if (!fileIds.isEmpty()){
-                for (Long fileId : fileIds) {
-                    usedCarFileMapper.deleteByMap(new HashMap<String, Object>(){{
-                        put("used_car_id",usedCarInfoDto.getId());
-                        put("file_id",fileId);
-                    }});
-                }
-            }
-
-            //更新主图
-            List<Long> mainFileId = usedCarFiles.stream()
-                    .filter(u -> "main".equals(u.getSign()))
-                    .map(m -> m.getFileId())
-                    .collect(toList());
-
-            if (fileIds.contains(mainFileId.get(0))){
-                UsedCarFile usedCarFile = new UsedCarFile();
-                usedCarFile.setSign("main");
-                usedCarFileMapper.update(usedCarFile,new UpdateWrapper<UsedCarFile>()
-                        .eq("used_car_id",usedCarInfoDto.getId())
-                        .eq("file_id",mainFileId.get(0)));
-            }
-
-            if (!usedCarInfoDto.getMainSignId().equals(mainFileId.get(0))){
-                UsedCarFile mainUsedCarFile = new UsedCarFile();
-                mainUsedCarFile.setSign("main");
-                usedCarFileMapper.update(mainUsedCarFile,new UpdateWrapper<UsedCarFile>()
-                        .eq("used_car_id",usedCarInfoDto.getId())
-                        .eq("file_id",usedCarInfoDto.getMainSignId()));
-
-                if (!fileIds.contains(mainFileId.get(0))){
-                    UsedCarFile usedCarFile = new UsedCarFile();
-                    usedCarFile.setSign("1");
-                    usedCarFileMapper.update(usedCarFile,new UpdateWrapper<UsedCarFile>()
-                            .eq("used_car_id",usedCarInfoDto.getId())
-                            .eq("file_id",mainFileId.get(0)));
-                }
-            }
-
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-
-    /**
-     * 查询二手车参数列表
-     * @param parameterType
-     * @return
-     */
-    @Override
-    public Response selectDictDataCarList(String[] parameterType) {
-        HashMap<String, List<CarParameterData>> map = new HashMap<>();
-        for (String parameter : parameterType) {
-            map.put(parameter,carParameterDataMapper.selectByMap(new HashMap<String, Object>(){{
-                put("parameter_type",parameter);
-            }}));
-        }
-        return Response.success(map);
-    }
-
-
-    /**
-     * 获取二手车详细信息
-     * @param id
-     * @return
-     */
-    @Override
-    public Response getUsedCarById(Long id) {
-
-        //返回值
-        UsedCarInfoVo usedCarInfoVo = new UsedCarInfoVo();
-
-        UsedCarInfo usedCarInfo = usedCarInfoMapper.selectById(id);
-        BeanUtils.copyProperties(usedCarInfo,usedCarInfoVo);
-
-        List<UsedCarFile> usedCarFiles = usedCarFileMapper.selectByMap(new HashMap<String, Object>() {{
-            put("used_car_id", id);
-        }});
-        List<Long> fileIds = usedCarFiles.stream().map(m -> m.getFileId()).collect(toList());
-
-        ArrayList<Map<String, String>> listMaps = new ArrayList<>();
-        List<FileInfo> fileInfos = fileInfoService.list(new QueryWrapper<FileInfo>().in("file_id", fileIds));
-        for (FileInfo fileInfo : fileInfos) {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("id",fileInfo.getFileId().toString());
-            map.put("fileUrl",fileInfo.getFileUrl());
-            listMaps.add(map);
-        }
-        usedCarInfoVo.setMainSignId(usedCarFiles.stream().filter(u -> "main".equals(u.getSign())).collect(toList()).get(0).getFileId());
-        usedCarInfoVo.setPictureUrlList(listMaps);
-        return Response.success(usedCarInfoVo);
-    }
-
-
-    /**
-     * applet
-     * 编辑二手车
-     * @param usedCarInfoDto
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response editUsedCarById(UsedCarInfoDto usedCarInfoDto) {
-        try{
-            UsedCarInfo usedCarInfo = new UsedCarInfo();
-            BeanUtils.copyProperties(usedCarInfoDto,usedCarInfo);
-            //修改二手车
-            usedCarInfoMapper.updateById(usedCarInfo);
-
-            //修改二手车图片关联表
-            List<UsedCarFile> usedCarFiles = usedCarFileMapper.selectByMap(new HashMap<String, Object>() {{
-                put("used_car_id", usedCarInfoDto.getId());
-            }});
-
-            //原主图id
-            List<Long> mainFileId = usedCarFiles.stream()
-                    .filter(u -> "main".equals(u.getSign()))
-                    .map(m -> m.getFileId())
-                    .collect(toList());
-
-            //删除图片ids
-            List<Long> delFileIds = usedCarFiles.parallelStream()
-                    .map(u -> u.getFileId()).collect(toList())
-                    .stream()
-                    .filter(item -> !usedCarInfoDto.getPictureIds().contains(item))
-                    .collect(toList());
-
-            //新增图片ids
-            List<Long> addfileIds = usedCarInfoDto.getPictureIds()
-                    .parallelStream()
-                    .filter(item ->
-                            !usedCarFiles.parallelStream()
-                            .map(u -> u.getFileId()).collect(toList()).contains(item))
-                    .collect(toList());
-
-            if (!delFileIds.isEmpty()){
-                for (Long fileId : delFileIds) {
-                    usedCarFileMapper.deleteByMap(new HashMap<String, Object>(){{
-                        put("used_car_id",usedCarInfoDto.getId());
-                        put("file_id",fileId);
-                    }});
-                }
-            }
-            if (!addfileIds.isEmpty()){
-                //保存新增图片id
-                for (Long addfileId : addfileIds) {
-                    UsedCarFile addUsedCarFile = new UsedCarFile();
-                    addUsedCarFile.setFileId(addfileId);
-
-                    addUsedCarFile.setUsedCarId(usedCarInfoDto.getId());
-                    if (addfileId.equals(usedCarInfoDto.getMainSignId())){
-                        addUsedCarFile.setSign("main");
-                    }
-                    usedCarFileMapper.insert(addUsedCarFile);
-                }
-            }
-
-            //判断主图是否被修改
-            if (!usedCarInfoDto.getMainSignId().equals(mainFileId.get(0))){
-
-                if (!delFileIds.contains(mainFileId.get(0))){
-                    //更新原主图
-                    UsedCarFile usedCarFile = new UsedCarFile();
-                    usedCarFile.setSign("1");
-                    usedCarFileMapper.update(usedCarFile,new UpdateWrapper<UsedCarFile>()
-                            .eq("used_car_id",usedCarInfoDto.getId())
-                            .eq("file_id",mainFileId.get(0)));
-                }
-
-                //判断是新增主图还是修改主图
-                if (!addfileIds.contains(usedCarInfoDto.getMainSignId())){
-                    UsedCarFile mainUsedCarFile = new UsedCarFile();
-                    mainUsedCarFile.setSign("main");
-                    usedCarFileMapper.update(mainUsedCarFile,new UpdateWrapper<UsedCarFile>()
-                            .eq("used_car_id",usedCarInfoDto.getId())
-                            .eq("file_id",usedCarInfoDto.getMainSignId()));
-                }
-            }
-
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-
-    /**
-     *  二手车审核
-     * @param examineUsedCarDto
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response usedCarExamine(ExamineUsedCarDto examineUsedCarDto) {
-        UsedCarInfo usedCarInfo = new UsedCarInfo();
-        BeanUtils.copyProperties(examineUsedCarDto,usedCarInfo);
-        usedCarInfoMapper.updateById(usedCarInfo);
-        return Response.success();
-    }
-
-
-    /**
-     * 删除二手车(伪删除)
-     * @param ids
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response removeUsedCarByIds(Long[] ids) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<UsedCarInfo>().set("status",1).eq("id",id));
-        }
-        return Response.success();
-    }
-
-
-}

jsjp-service/src/main/java/com/miaxis/car/vo/UsedCarInfoVo.java

@@ -1,117 +0,0 @@
-package com.miaxis.car.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 二手车对象 used_car_info 返回参
- * @author wwl
- * @version 1.0
- * @date 2021/5/26 15:03
- */
-@Data
-@ApiModel(value = "UsedCarInfoVo", description = "二手车对象返回参")
-public class UsedCarInfoVo {
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
-
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id(user_info表id)")
-    private Long userId;
-
-    @TableField("car_brand")
-    @ApiModelProperty(value = "车辆品牌id（关联car_brand_info表）")
-    private Long carBrand;
-
-    @TableField("car_series")
-    @ApiModelProperty(value = "车系车款")
-    private String carSeries;
-
-    @TableField("vehicle_displacement")
-    @ApiModelProperty(value = "汽车排量")
-    private String vehicleDisplacement;
-
-    @TableField("purchase_date")
-    @ApiModelProperty(value = "购买日期")
-    private Date purchaseDate;
-
-    @TableField("selling_price")
-    @ApiModelProperty(value = "出售价格")
-    private BigDecimal sellingPrice;
-
-    @TableField("vehicle_introduction")
-    @ApiModelProperty(value = "车辆介绍")
-    private String vehicleIntroduction;
-
-    @TableField("producing_country")
-    @ApiModelProperty(value = "生产国")
-    private Integer producingCountry;
-
-    @TableField("number_of_seats")
-    @ApiModelProperty(value = "座位数")
-    private Integer numberOfSeats;
-
-    @TableField("model")
-    @ApiModelProperty(value = "车型")
-    private Integer model;
-
-    @TableField("fuel")
-    @ApiModelProperty(value = "燃料")
-    private String fuel;
-
-    @TableField("body_structure")
-    @ApiModelProperty(value = "车身结构")
-    private String bodyStructure;
-
-    @TableField("driving_mode")
-    @ApiModelProperty(value = "驱动方式")
-    private String drivingMode;
-
-    @TableField("transmission_case")
-    @ApiModelProperty(value = "变速箱")
-    private String transmissionCase;
-
-    @TableField("purchase_price")
-    @ApiModelProperty(value = "购买价格")
-    private BigDecimal purchasePrice;
-
-    @TableField("transfer_frequency")
-    @ApiModelProperty(value = "过户次数")
-    private Integer transferFrequency;
-
-    @TableField("emission_standard")
-    @ApiModelProperty(value = "排放标准")
-    private Integer emissionStandard;
-
-    @TableField("car_watching_point")
-    @ApiModelProperty(value = "看车点")
-    private String carWatchingPoint;
-
-    @ApiModelProperty(value = "主图标识-图片id")
-    private Long mainSignId;
-
-    @ApiModelProperty(value = "图片url集合")
-    private List<Map<String, String>> pictureUrlList;
-
-    @TableField("examine_status")
-    @ApiModelProperty(value = "审核状态  0：待审核(默认)、1：审核通过、2：审核未通过")
-    private String examineStatus;
-
-    @TableField("audit_information")
-    @ApiModelProperty(value = "审核信息（审核未通过原因）")
-    private String auditInformation;
-
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-}

jsjp-service/src/main/java/com/miaxis/collection/domain/CollectionInfo.java

@@ -1,41 +0,0 @@
-package com.miaxis.collection.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;
-
-/**
- * 收藏对象
- * @Author wwl
- * @Date 2021/3/15
- * @Version 1.0
- */
-@Data
-@TableName("collection_info")
-@ApiModel(value = "CollectionInfo", description = "收藏对象 collection_info")
-public class CollectionInfo extends BaseBusinessEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 用户id----(对应user_info表id) */
-    @TableField("user_id")
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
-
-    @TableField("collection_id")
-    @ApiModelProperty(value = "收藏id---（对应类别表id）")
-    private Long collectionId;
-
-    @TableField("collection_type")
-    @ApiModelProperty(value = "收藏类别")
-    private String collectionType;
-
-}

jsjp-service/src/main/java/com/miaxis/collection/mapper/CollectionInfoMapper.java

@@ -1,14 +0,0 @@
-package com.miaxis.collection.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.collection.domain.CollectionInfo;
-
-/**
- * 收藏Mapper接口
- * @Author wwl
- * @Date 2021/3/15
- * @Version 1.0
- */
-public interface CollectionInfoMapper extends BaseMapper<CollectionInfo> {
-
-}

jsjp-service/src/main/java/com/miaxis/collection/service/ICollectionInfoService.java

@@ -1,49 +0,0 @@
-package com.miaxis.collection.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.collection.domain.CollectionInfo;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
-
-/**
- * 收藏Service接口
- * @Author wwl
- * @Date 2021/3/15
- * @Version 1.0
- */
-public interface ICollectionInfoService extends IService<CollectionInfo> {
-
-    /**
-     * 查询用户收藏列表
-     * @param userInfo
-     * @param collectionType
-     * @return
-     */
-    Response collectionList(UserInfo userInfo, String collectionType);
-
-    /**
-     * applet
-     * 收藏商家
-     * @param userInfo 当前用户
-     * @param id 商家id
-     * @return
-     */
-    Response collectionBusiness(UserInfo userInfo, Long id);
-
-    /**
-     * 取消收藏
-     * @param userId
-     * @param ids
-     * @return
-     */
-    Response removeCollectionByIds(Long userId,Long[] ids);
-
-    /**
-     * 通用收藏接口
-     * @param userInfo
-     * @param id
-     * @param collectionType
-     * @return
-     */
-    Response collectionOperation(UserInfo userInfo, Long id, String collectionType);
-}

jsjp-service/src/main/java/com/miaxis/collection/service/impl/CollectionInfoServiceImpl.java

@@ -1,150 +0,0 @@
-package com.miaxis.collection.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.collection.domain.CollectionInfo;
-import com.miaxis.collection.mapper.CollectionInfoMapper;
-import com.miaxis.collection.service.ICollectionInfoService;
-import com.miaxis.collection.strategy.BaseStrategy;
-import com.miaxis.collection.vo.AppletCollectionVo;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.UserInfo;
-import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.strategy.StrategyManager;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @Author wwl
- * @Date 2021/3/15
- * @Version 1.0
- */
-@Service
-@RequiredArgsConstructor
-public class CollectionInfoServiceImpl extends ServiceImpl<CollectionInfoMapper, CollectionInfo> implements ICollectionInfoService {
-
-    private final CollectionInfoMapper collectionInfoMapper;
-
-
-
-    /**
-     * 查询用户收藏列表
-     *
-     * @param userInfo
-     * @param collectionType
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    public Response collectionList(UserInfo userInfo,String collectionType) {
-        //返回list
-        ArrayList<AppletCollectionVo> collectionVos = new ArrayList<>();
-
-        //根据收藏列表list
-        List<CollectionInfo> collectionInfos;
-
-        if ("1".equals(collectionType)){
-            collectionInfos = collectionInfoMapper
-                    .selectList(new QueryWrapper<CollectionInfo>()
-                            .eq("user_id", userInfo.getId()));
-        }else{
-            collectionInfos = collectionInfoMapper
-                    .selectList(new QueryWrapper<CollectionInfo>()
-                            .eq("user_id", userInfo.getId())
-                            .eq("collection_type",collectionType));
-        }
-
-        for (CollectionInfo collectionInfo : collectionInfos) {
-            //获取对应策略
-            BaseStrategy baseStrategy = (BaseStrategy) StrategyManager.getInstance().getStrategy(collectionInfo.getCollectionType());
-            //策略不存在
-            if (baseStrategy == null) continue;
-            AppletCollectionVo collectionVo = baseStrategy.getCollectionVo(collectionInfo.getId(),collectionInfo.getCollectionId());
-            collectionVos.add(collectionVo);
-        }
-        return Response.success(collectionVos);
-    }
-
-    /**
-     * applet
-     * 收藏商家
-     * @param userInfo 当前用户
-     * @param id 商家id
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response collectionBusiness(UserInfo userInfo, Long id) {
-        try{
-            List<CollectionInfo> infoList = collectionInfoMapper.selectByMap(new HashMap<String, Object>() {{
-                put("user_id", userInfo.getId());
-                put("customer_id", id);
-            }});
-            if (infoList.isEmpty()){
-                //保存收藏表
-                CollectionInfo collectionInfo = new CollectionInfo();
-                collectionInfo.setUserId(userInfo.getId());
-                collectionInfo.setCollectionId(id);
-                collectionInfoMapper.insert(collectionInfo);
-            }
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-    /**
-     * 取消收藏
-     * @param userId 当前用户id
-     * @param ids 商家id
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response removeCollectionByIds(Long userId, Long[] ids) {
-        try{
-            for (Long id : ids) {
-                collectionInfoMapper.deleteByMap(new HashMap<String, Object>(){{
-                    put("user_id",userId);
-                    put("customer_id",id);
-                }});
-            }
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-
-    }
-
-
-    /**
-     * 通用收藏接口
-     * @param userInfo
-     * @param id
-     * @param collectionType
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Response collectionOperation(UserInfo userInfo, Long id, String collectionType) {
-        try{
-            //保存收藏表
-            CollectionInfo collectionInfo = new CollectionInfo();
-            collectionInfo.setUserId(userInfo.getId());
-            collectionInfo.setCollectionId(id);
-            collectionInfo.setCollectionType(collectionType);
-            collectionInfoMapper.insert(collectionInfo);
-            return Response.success();
-        }catch (Exception e){
-            throw new CustomException("系统异常");
-        }
-    }
-
-
-}

jsjp-service/src/main/java/com/miaxis/collection/strategy/BaseStrategy.java

@@ -1,14 +0,0 @@
-package com.miaxis.collection.strategy;
-
-import com.miaxis.collection.vo.AppletCollectionVo;
-import com.miaxis.common.strategy.Strategy;
-
-/**
- * 策略接口
- * @author wwl
- * @date 2021/7/26 15:30
- */
-public interface BaseStrategy extends Strategy{
-
-    AppletCollectionVo getCollectionVo(Long id,Long collectionId);
-}

jsjp-service/src/main/java/com/miaxis/collection/strategy/CarStrategy.java

@@ -1,71 +0,0 @@
-package com.miaxis.collection.strategy;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.miaxis.car.domain.CarBrandInfo;
-import com.miaxis.car.domain.UsedCarFile;
-import com.miaxis.car.domain.UsedCarInfo;
-import com.miaxis.car.mapper.UsedCarFileMapper;
-import com.miaxis.car.service.ICarBrandInfoService;
-import com.miaxis.car.service.IUsedCarInfoService;
-import com.miaxis.collection.vo.AppletCollectionVo;
-import com.miaxis.common.strategy.StrategyManager;
-import com.miaxis.file.domain.FileInfo;
-import com.miaxis.file.service.IFileInfoService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * car策略具体实现
- * @author wwl
- * @date 2021/7/26 15:38
- */
-@Component
-@RequiredArgsConstructor
-public class CarStrategy implements BaseStrategy {
-
-    private final IUsedCarInfoService usedCarInfoService;
-
-    private final UsedCarFileMapper usedCarFileMapper;
-
-    private final IFileInfoService fileInfoService;
-
-    private final ICarBrandInfoService carBrandInfoService;
-
-    /**
-     * @PostConstruct：容器初始化时执行该方法
-     */
-    @PostConstruct
-    public void register() {
-        StrategyManager.getInstance().register(this, true);
-    }
-
-    @Override
-    public String getName() {
-        return "car";
-    }
-
-    @Override
-    public AppletCollectionVo getCollectionVo(Long id,Long collectionId) {
-        UsedCarInfo carInfo = usedCarInfoService.getById(collectionId);
-        UsedCarFile usedCarFile = usedCarFileMapper.selectOne(new QueryWrapper<UsedCarFile>()
-                .eq("used_car_id", collectionId)
-                .eq("sign", "main"));
-        FileInfo fileInfo = new FileInfo();
-        if (usedCarFile != null){
-            fileInfo = fileInfoService.getById(usedCarFile.getFileId());
-        }
-        CarBrandInfo brandInfo = carBrandInfoService.getById(carInfo.getCarBrand());
-        AppletCollectionVo appletCollectionVo = new AppletCollectionVo();
-        appletCollectionVo.setId(id);
-        appletCollectionVo.setCollectionId(collectionId);
-        appletCollectionVo.setTitle(brandInfo.getName() + "--"+carInfo.getCarSeries());
-        appletCollectionVo.setIntroduction(carInfo.getVehicleIntroduction());
-        appletCollectionVo.setPrice(carInfo.getSellingPrice());
-        appletCollectionVo.setFileUrl(fileInfo.getFileUrl());
-        appletCollectionVo.setCollectionType("car");
-
-        return appletCollectionVo;
-    }
-}

jsjp-service/src/main/java/com/miaxis/collection/strategy/VideoStrategy.java

@@ -1,54 +0,0 @@
-package com.miaxis.collection.strategy;
-
-import com.miaxis.collection.vo.AppletCollectionVo;
-import com.miaxis.common.strategy.StrategyManager;
-import com.miaxis.file.domain.FileInfo;
-import com.miaxis.file.service.IFileInfoService;
-import com.miaxis.teachingVideo.domain.TeachingVideoInfo;
-import com.miaxis.teachingVideo.service.ITeachingVideoInfoService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * video策略具体实现
- * @author wwl
- * @date 2021/7/26 15:38
- */
-@Component
-@RequiredArgsConstructor
-public class VideoStrategy implements BaseStrategy {
-
-    private final ITeachingVideoInfoService teachingVideoInfoService;//学车视频
-
-    private final IFileInfoService fileInfoService;
-
-    /**
-     * @PostConstruct：容器初始化时执行该方法
-     */
-    @PostConstruct
-    public void register() {
-        StrategyManager.getInstance().register(this, true);
-    }
-
-    @Override
-    public String getName() {
-        return "video";
-    }
-
-
-    @Override
-    public AppletCollectionVo getCollectionVo(Long id,Long collectionId) {
-        TeachingVideoInfo videoInfo = teachingVideoInfoService.getById(collectionId);
-        FileInfo fileInfo = fileInfoService.getById(videoInfo.getCoverFileId());
-        AppletCollectionVo appletCollectionVo = new AppletCollectionVo();
-        appletCollectionVo.setId(id);
-        appletCollectionVo.setCollectionId(collectionId);
-        appletCollectionVo.setTitle(videoInfo.getTitle());
-        appletCollectionVo.setIntroduction(videoInfo.getVideoDescribe());
-        appletCollectionVo.setFileUrl(fileInfo.getFileUrl());
-        appletCollectionVo.setCollectionType("video");
-        return appletCollectionVo;
-    }
-}

jsjp-service/src/main/java/com/miaxis/collection/vo/AppletCollectionVo.java

@@ -1,46 +0,0 @@
-package com.miaxis.collection.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * applet 收藏对象返回参
- * @author wwl
- * @version 1.0
- * @date 2021/7/26 14:01
- */
-@Data
-@ApiModel(value = "AppletCollectionVo", description = "收藏对象返回参")
-public class AppletCollectionVo implements Serializable {
-
-    @TableId(value = "id")
-    private Long id;
-
-    @TableField("collection_id")
-    @ApiModelProperty(value = "收藏id---（对应类别表id）")
-    private Long collectionId;
-
-    @ApiModelProperty(value = "标题内容")
-    private String title;
-
-    @ApiModelProperty(value = "描述")
-    private String introduction;
-
-    @ApiModelProperty(value = "封面访问地址")
-    private String fileUrl;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    @TableField("collection_type")
-    @ApiModelProperty(value = "收藏类别")
-    private String collectionType;
-
-}

jsjp-service/src/main/java/com/miaxis/collection/vo/CollectionCustomerVo.java

@@ -1,70 +0,0 @@
-package com.miaxis.collection.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 收藏客户信息对象返回参
- *
- * @author miaxis
- * @date 2021-03-15
- */
-@Data
-@ApiModel(value = "CollectionCustomerVo", description = "收藏客户信息对象返回参")
-public class CollectionCustomerVo {
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @ApiModelProperty(value = "商家id")
-    private Long customerId;
-
-    @TableField("corporate_name")
-    @ApiModelProperty(value = "公司名称")
-    private String corporateName;
-
-    @ApiModelProperty(value = "公司LOGO图片访问地址")
-    private String corporateLogoFileUrl;
-
-    @TableField("applet_address")
-    @ApiModelProperty(value = "小程序地址")
-    private String appletAddress;
-
-    @ApiModelProperty(value = "小程序图标访问地址")
-    private String appletLogoFileUrl;
-
-    @ApiModelProperty(value = "小程序二维码访问地址")
-    private String appletQrCodeFileUrl;
-
-    @TableField("applet_introduce")
-    @ApiModelProperty(value = "小程序介绍")
-    private String appletIntroduce;
-
-    @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("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-    @ApiModelProperty(value = "收藏时间"  ,hidden = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-}

jsjp-service/src/main/java/com/miaxis/customer/domain/CustomerInfo.java

@@ -1,190 +0,0 @@
-package com.miaxis.customer.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;
-
-/**
- * 客户信息对象 customer_info
- *
- * @author miaxis
- * @date 2021-03-10
- */
-@Data
-@TableName("customer_info")
-@ApiModel(value = "CustomerInfo", description = "客户信息对象")
-public class CustomerInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 公司名称 */
-    @Excel(name = "公司名称")
-    @TableField("corporate_name")
-    @ApiModelProperty(value = "公司名称")
-    private String corporateName;
-
-    /** 业务类型  0：内部小程序、1：外部小程序 */
-    @Excel(name = "业务类型  0：内部小程序、1：外部小程序")
-    @TableField("business_type")
-    @ApiModelProperty(value = "业务类型  0：内部小程序、1：外部小程序")
-    private Integer businessType;
-
-    /** 公司LOGO图片--（对应file_info的id） */
-    @Excel(name = "公司LOGO图片--（对应file_info的id）", readConverterExp = "对=应file_info的id")
-    @TableField("corporate_logo")
-    @ApiModelProperty(value = "公司LOGO图片--（对应file_info的id）")
-    private Long corporateLogo;
-
-    /** 客户来源  0：电话营销、1：主动来电、2：客户介绍、3：朋友介绍、4：销售推广、5：网络搜索、6：广告杂志、7：展会促销、8：其他 */
-    @Excel(name = "客户来源  0：电话营销、1：主动来电、2：客户介绍、3：朋友介绍、4：销售推广、5：网络搜索、6：广告杂志、7：展会促销、8：其他")
-    @TableField("customer_source")
-    @ApiModelProperty(value = "客户来源  0：电话营销、1：主动来电、2：客户介绍、3：朋友介绍、4：销售推广、5：网络搜索、6：广告杂志、7：展会促销、8：其他")
-    private Integer customerSource;
-
-    /** 所在城市编码（对应城市表） */
-    @Excel(name = "所在城市编码（对应城市表）", readConverterExp = "对=应城市表")
-    @TableField("city_code")
-    @ApiModelProperty(value = "所在城市编码（对应城市表）")
-    private String cityCode;
-
-    @Excel(name = "区域编码")
-    @TableField("area_code")
-    @ApiModelProperty(value = "区域编码")
-    private String areaCode;
-
-    /** 归属人员--关联用户表 */
-    @Excel(name = "归属人员--关联用户表")
-    @TableField("attributed_personnel")
-    @ApiModelProperty(value = "归属人员--关联用户表")
-    private Long attributedPersonnel;
-
-    /** 详细地址 */
-    @Excel(name = "详细地址")
-    @TableField("detailed_address")
-    @ApiModelProperty(value = "详细地址")
-    private String detailedAddress;
-
-    /** 行业类型---关联product_type_info 品类表 */
-    @Excel(name = "行业类型---关联product_type_info 品类表")
-    @TableField("industry_type")
-    @ApiModelProperty(value = "行业类型---关联product_type_info 品类表")
-    private Long industryType;
-
-    /** 公司电话 */
-    @Excel(name = "公司电话")
-    @TableField("corporate_phone")
-    @ApiModelProperty(value = "公司电话")
-    private String corporatePhone;
-
-    /** 公司联系人 */
-    @Excel(name = "公司联系人")
-    @TableField("corporate_contacts")
-    @ApiModelProperty(value = "公司联系人")
-    private String corporateContacts;
-
-    /** 手机号码 */
-    @Excel(name = "手机号码")
-    @TableField("phone")
-    @ApiModelProperty(value = "手机号码")
-    private String phone;
-
-    /** 客户星级  1：一星、2：二星、3：三星、4：四星、5：五星 */
-    @Excel(name = "客户星级  1：一星、2：二星、3：三星、4：四星、5：五星")
-    @TableField("customer_star")
-    @ApiModelProperty(value = "客户星级  1：一星、2：二星、3：三星、4：四星、5：五星")
-    private Integer customerStar;
-
-    /** 企业税号 */
-    @Excel(name = "企业税号")
-    @TableField("enterprise_tax_number")
-    @ApiModelProperty(value = "企业税号")
-    private String enterpriseTaxNumber;
-
-    /** 发票抬头 */
-    @Excel(name = "发票抬头")
-    @TableField("invoice_title")
-    @ApiModelProperty(value = "发票抬头")
-    private String invoiceTitle;
-
-    /** 开户银行 */
-    @Excel(name = "开户银行")
-    @TableField("bank_of_deposit")
-    @ApiModelProperty(value = "开户银行")
-    private String bankOfDeposit;
-
-    /** 银行帐户 */
-    @Excel(name = "银行帐户")
-    @TableField("bank_account")
-    @ApiModelProperty(value = "银行帐户")
-    private String bankAccount;
-
-    /** 财务电话号码 */
-    @Excel(name = "财务电话号码")
-    @TableField("finance_phone")
-    @ApiModelProperty(value = "财务电话号码")
-    private String financePhone;
-
-    /** 传真号码 */
-    @Excel(name = "传真号码")
-    @TableField("fax_number")
-    @ApiModelProperty(value = "传真号码")
-    private String faxNumber;
-
-    /** 小程序地址 */
-    @Excel(name = "小程序地址")
-    @TableField("applet_address")
-    @ApiModelProperty(value = "小程序地址")
-    private String appletAddress;
-
-    /** 小程序图标---（对应file_info的id） */
-    @Excel(name = "小程序图标---（对应file_info的id）", readConverterExp = "对=应file_info的id")
-    @TableField("applet_logo")
-    @ApiModelProperty(value = "小程序图标---（对应file_info的id）")
-    private Long appletLogo;
-
-    /** 小程序二维码---（对应file_info的id） */
-    @Excel(name = "小程序二维码---（对应file_info的id）", readConverterExp = "对=应file_info的id")
-    @TableField("applet_qr_code")
-    @ApiModelProperty(value = "小程序二维码---（对应file_info的id）")
-    private Long appletQrCode;
-
-    /** 小程序介绍 */
-    @Excel(name = "小程序介绍")
-    @TableField("applet_introduce")
-    @ApiModelProperty(value = "小程序介绍")
-    private String appletIntroduce;
-
-    /** 上架状态  0：已上架、1：未上架 */
-    @Excel(name = "上架状态  0：已上架、1：未上架")
-    @TableField("shelf_status")
-    @ApiModelProperty(value = "上架状态  0：已上架、1：未上架")
-    private Integer shelfStatus;
-
-    @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;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @Excel(name = "状态  0：有效(默认)、1：失效 （伪删除）", readConverterExp = "伪=删除")
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/customer/dto/AppletCustomerInfoDto.java

@@ -1,28 +0,0 @@
-package com.miaxis.customer.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * applet客户信息对象入参
- *
- * @author miaxis
- * @date 2021-03-15
- */
-@Data
-@ApiModel(value = "AppletCustomerInfoDto", description = "applet客户信息对象入参")
-public class AppletCustomerInfoDto implements Serializable {
-
-    @ApiModelProperty(value = "品类id(0:精选)")
-    private Long id;
-
-    @ApiModelProperty(value = "父id")
-    private Long pid;
-
-    @ApiModelProperty(value = "商家名称")
-    private String customerName;
-
-}

jsjp-service/src/main/java/com/miaxis/customer/mapper/CustomerInfoMapper.java

@@ -1,57 +0,0 @@
-package com.miaxis.customer.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.collection.vo.CollectionCustomerVo;
-import com.miaxis.customer.domain.CustomerInfo;
-import com.miaxis.customer.dto.AppletCustomerInfoDto;
-import com.miaxis.customer.vo.BrowseRecordCustomerInfoVo;
-import com.miaxis.customer.vo.CustomerInfoVo;
-import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 客户信息Mapper接口
- *
- * @author miaxis
- * @date 2021-03-10
- */
-public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
-
-    /**
-     * 查询客户信息列表
-     *
-     * @param customerInfo 客户信息
-     * @return 客户信息集合
-     */
-    List<CustomerInfoVo> selectCustomerInfoList(CustomerInfo customerInfo);
-
-    /**
-     * 获取客户信息详细信息
-     * @param id
-     * @return
-     */
-    CustomerInfoVo getCustomerById(@Param("id") Long id);
-
-    /**
-     * 查询商家列表
-     * @param userId
-     * @return
-     */
-    List<ExhibitionCustomerInfoVo> getCustomerListByProductId(@Param("userId")Long userId, @Param("customerInfoDto") AppletCustomerInfoDto customerInfoDto);
-
-
-    /**
-     * 查询用户收藏列表
-     * @param id
-     * @return
-     */
-    List<CollectionCustomerVo> getCollectionList(@Param("id")Long id);
-
-    /**
-     * 查询商家详情
-     * @param id 商家id
-     * @return
-     */
-    BrowseRecordCustomerInfoVo getCustomerDetailsById(@Param("id")Long id);
-}

jsjp-service/src/main/java/com/miaxis/customer/service/ICustomerInfoService.java

@@ -1,60 +0,0 @@
-package com.miaxis.customer.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.customer.domain.CustomerInfo;
-import com.miaxis.customer.dto.AppletCustomerInfoDto;
-import com.miaxis.customer.vo.CustomerInfoVo;
-import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
-
-import java.util.List;
-
-/**
- * 客户信息Service接口
- *
- * @author miaxis
- * @date 2021-03-10
- */
-public interface ICustomerInfoService extends IService<CustomerInfo>{
-    /**
-     * 查询客户信息列表
-     *
-     * @param customerInfo 客户信息
-     * @return 客户信息集合
-     */
-    List<CustomerInfoVo> selectCustomerInfoList(CustomerInfo customerInfo);
-
-    /**
-     * 更新 0：上架 / 1：下架
-     * @param ids
-     * @param shelfStatus
-     * @return
-     */
-    Response updateShelfStatus(Long[] ids, Integer shelfStatus);
-
-
-    /**
-     * 删除客户信息(伪删除)
-     * @param ids
-     * @return
-     */
-    Response removeCustomerByIds(Long[] ids);
-
-    /**
-     * 获取客户信息详细信息
-     * @param id
-     * @return
-     */
-    Response<CustomerInfoVo> getCustomerById(Long id);
-
-    /**
-     * applet
-     * 查询商家列表
-     * @param appletCustomerInfoDto
-     * @param userId
-     * @return
-     */
-    List<ExhibitionCustomerInfoVo> getCustomerListByProductId(AppletCustomerInfoDto appletCustomerInfoDto, Long userId);
-
-
-}

jsjp-service/src/main/java/com/miaxis/customer/service/impl/CustomerInfoServiceImpl.java

@@ -1,108 +0,0 @@
-package com.miaxis.customer.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.customer.domain.CustomerInfo;
-import com.miaxis.customer.dto.AppletCustomerInfoDto;
-import com.miaxis.customer.mapper.CustomerInfoMapper;
-import com.miaxis.customer.service.ICustomerInfoService;
-import com.miaxis.customer.vo.CustomerInfoVo;
-import com.miaxis.customer.vo.ExhibitionCustomerInfoVo;
-import com.miaxis.product.domain.ProductTypeInfo;
-import com.miaxis.product.mapper.ProductTypeInfoMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 客户信息Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-10
- */
-@Service
-@RequiredArgsConstructor
-public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, CustomerInfo> implements ICustomerInfoService {
-
-    private final CustomerInfoMapper customerInfoMapper;
-
-    private final ProductTypeInfoMapper productTypeInfoMapper;
-
-
-    /**
-     * 查询客户信息列表
-     *
-     * @param customerInfo 客户信息
-     * @return 客户信息
-     */
-    @Override
-    public List<CustomerInfoVo> selectCustomerInfoList(CustomerInfo customerInfo){
-        return customerInfoMapper.selectCustomerInfoList(customerInfo);
-    }
-
-    /**
-     * 更新 0：上架 / 1：下架
-     * @param ids
-     * @param shelfStatus
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response updateShelfStatus(Long[] ids, Integer shelfStatus) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<CustomerInfo>().set("shelf_status",shelfStatus).eq("id",id));
-        }
-        return Response.success();
-    }
-
-    /**
-     * 删除客户信息(伪删除)
-     * @param ids
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response removeCustomerByIds(Long[] ids) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<CustomerInfo>().set("status",1).eq("id",id));
-        }
-        return Response.success();
-    }
-
-    /**
-     * 获取客户信息详细信息
-     * @param id
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    public Response<CustomerInfoVo> getCustomerById(Long id) {
-        return Response.success(customerInfoMapper.getCustomerById(id));
-    }
-
-    /**
-     * applet
-     * 查询商家列表
-     * @param appletCustomerInfoDto
-     * @param userId
-     * @return
-     */
-    @Override
-    public List<ExhibitionCustomerInfoVo> getCustomerListByProductId(AppletCustomerInfoDto appletCustomerInfoDto, Long userId) {
-
-        return customerInfoMapper.getCustomerListByProductId(userId,appletCustomerInfoDto);
-    }
-
-
-
-}

jsjp-service/src/main/java/com/miaxis/customer/vo/BrowseRecordCustomerInfoVo.java

@@ -1,68 +0,0 @@
-package com.miaxis.customer.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 浏览记录客户信息对象返回参
- *
- * @author miaxis
- * @date 2021-03-15
- */
-@Data
-@ApiModel(value = "BrowseRecordCustomerInfoVo", description = "浏览记录客户信息对象返回参")
-public class BrowseRecordCustomerInfoVo implements Serializable {
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @TableField("corporate_name")
-    @ApiModelProperty(value = "公司名称")
-    private String corporateName;
-
-    @ApiModelProperty(value = "公司LOGO图片访问地址")
-    private String corporateLogoFileUrl;
-
-    @TableField("applet_address")
-    @ApiModelProperty(value = "小程序地址")
-    private String appletAddress;
-
-    @ApiModelProperty(value = "小程序图标访问地址")
-    private String appletLogoFileUrl;
-
-    @ApiModelProperty(value = "小程序二维码访问地址")
-    private String appletQrCodeFileUrl;
-
-    @TableField("applet_introduce")
-    @ApiModelProperty(value = "小程序介绍")
-    private String appletIntroduce;
-
-    @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("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
-    @ApiModelProperty(value = "浏览时间" ,hidden = true)
-    private Date browseTime;
-
-}

jsjp-service/src/main/java/com/miaxis/customer/vo/CustomerInfoVo.java

@@ -1,149 +0,0 @@
-package com.miaxis.customer.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 客户信息对象返回参
- *
- * @author miaxis
- * @date 2021-03-15
- */
-@Data
-@ApiModel(value = "CustomerInfoVo", description = "客户信息对象返回参")
-public class CustomerInfoVo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @TableField("corporate_name")
-    @ApiModelProperty(value = "公司名称")
-    private String corporateName;
-
-    @TableField("business_type")
-    @ApiModelProperty(value = "业务类型  0：内部小程序、1：外部小程序")
-    private Integer businessType;
-
-    @TableField("corporate_logo")
-    @ApiModelProperty(value = "公司LOGO图片--（对应file_info的id）")
-    private Long corporateLogo;
-
-    @ApiModelProperty(value = "公司LOGO图片访问地址")
-    private String corporateLogoFileUrl;
-
-    @TableField("customer_source")
-    @ApiModelProperty(value = "客户来源  0：电话营销、1：主动来电、2：客户介绍、3：朋友介绍、4：销售推广、5：网络搜索、6：广告杂志、7：展会促销、8：其他")
-    private Integer customerSource;
-
-    @TableField("city_code")
-    @ApiModelProperty(value = "所在城市编码（对应城市表）")
-    private String cityCode;
-
-    @TableField("area_code")
-    @ApiModelProperty(value = "区域编码（对应城市表）")
-    private String areaCode;
-
-    @TableField("attributed_personnel")
-    @ApiModelProperty(value = "归属人员--关联用户表")
-    private Long attributedPersonnel;
-
-    @TableField("detailed_address")
-    @ApiModelProperty(value = "详细地址")
-    private String detailedAddress;
-
-    @TableField("industry_type")
-    @ApiModelProperty(value = "行业类型---关联product_type_info 品类表")
-    private Long industryType;
-
-    @TableField("corporate_phone")
-    @ApiModelProperty(value = "公司电话")
-    private String corporatePhone;
-
-    @TableField("corporate_contacts")
-    @ApiModelProperty(value = "公司联系人")
-    private String corporateContacts;
-
-    @TableField("phone")
-    @ApiModelProperty(value = "手机号码")
-    private String phone;
-
-    @TableField("customer_star")
-    @ApiModelProperty(value = "客户星级  1：一星、2：二星、3：三星、4：四星、5：五星")
-    private Integer customerStar;
-
-    @TableField("enterprise_tax_number")
-    @ApiModelProperty(value = "企业税号")
-    private String enterpriseTaxNumber;
-
-    @TableField("invoice_title")
-    @ApiModelProperty(value = "发票抬头")
-    private String invoiceTitle;
-
-    @TableField("bank_of_deposit")
-    @ApiModelProperty(value = "开户银行")
-    private String bankOfDeposit;
-
-    @TableField("bank_account")
-    @ApiModelProperty(value = "银行帐户")
-    private String bankAccount;
-
-    @TableField("finance_phone")
-    @ApiModelProperty(value = "财务电话号码")
-    private String financePhone;
-
-    @TableField("fax_number")
-    @ApiModelProperty(value = "传真号码")
-    private String faxNumber;
-
-    @TableField("applet_address")
-    @ApiModelProperty(value = "小程序地址")
-    private String appletAddress;
-
-    @TableField("applet_logo")
-    @ApiModelProperty(value = "小程序图标---（对应file_info的id）")
-    private Long appletLogo;
-
-    @ApiModelProperty(value = "小程序图标访问地址")
-    private String appletLogoFileUrl;
-
-    @TableField("applet_qr_code")
-    @ApiModelProperty(value = "小程序二维码---（对应file_info的id）")
-    private Long appletQrCode;
-
-    @ApiModelProperty(value = "小程序二维码访问地址")
-    private String appletQrCodeFileUrl;
-
-    @TableField("applet_introduce")
-    @ApiModelProperty(value = "小程序介绍")
-    private String appletIntroduce;
-
-    @TableField("shelf_status")
-    @ApiModelProperty(value = "上架状态  0：已上架、1：未上架")
-    private Integer shelfStatus;
-
-    @ApiModelProperty(value = "收藏数量")
-    private Integer collectionCount;
-
-    @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("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/customer/vo/ExhibitionCustomerInfoVo.java

@@ -1,67 +0,0 @@
-package com.miaxis.customer.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 展示客户信息对象返回参
- *
- * @author miaxis
- * @date 2021-03-15
- */
-@Data
-@ApiModel(value = "ExhibitionCustomerInfoVo", description = "展示客户信息对象返回参")
-public class ExhibitionCustomerInfoVo extends BaseBusinessEntity{
-
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @TableField("corporate_name")
-    @ApiModelProperty(value = "公司名称")
-    private String corporateName;
-
-    @ApiModelProperty(value = "公司LOGO图片访问地址")
-    private String corporateLogoFileUrl;
-
-    @TableField("applet_address")
-    @ApiModelProperty(value = "小程序地址")
-    private String appletAddress;
-
-    @ApiModelProperty(value = "小程序图标访问地址")
-    private String appletLogoFileUrl;
-
-    @ApiModelProperty(value = "小程序二维码访问地址")
-    private String appletQrCodeFileUrl;
-
-    @TableField("applet_introduce")
-    @ApiModelProperty(value = "小程序介绍")
-    private String appletIntroduce;
-
-    @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("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-    @ApiModelProperty(value = "收藏数量")
-    private Integer collectionCount;
-
-    @ApiModelProperty(value = "是否收藏 0:未收藏 1:已收藏")
-    private String collectionStatus;
-
-
-}

jsjp-service/src/main/java/com/miaxis/feign/service/IMeiService.java

@@ -1,38 +0,0 @@
-package com.miaxis.feign.service;
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.Mei;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
-
-/**
- *
- * 电影接口测试
- */
-@FeignClient(name="meiService",
-        url = "https://runion.meituan.com",configuration = FeignConfig.class)
-@Component
-public interface IMeiService {
-
-//    @GetMapping(value = "/generateLink")
-//    String geMeiUrl(@RequestParam("actId") String actId,
-//                    @RequestParam("key") String key,
-//                    @RequestParam("sid") String sid,
-//                    @RequestParam("linkType") String linkType,
-//                    @RequestParam("sign") String sign);
-
-
-
-//    @GetMapping(value = "/generateLink")
-//    String geMeiUrl(@SpringQueryMap Mei mei);
-
-
-    @GetMapping(value = "/generateLink")
-    String geMeiUrl(@SpringQueryMap Object params);
-
-}

jsjp-service/src/main/java/com/miaxis/feign/service/IPddService.java

@@ -1,30 +0,0 @@
-package com.miaxis.feign.service;
-
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.Pdd;
-import com.miaxis.feign.dto.PddResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- *
- * 电影接口测试
- */
-@FeignClient(name="pddService",
-        url = "http://gw-api.pinduoduo.com",configuration = FeignConfig.class)
-@Component
-    public interface IPddService {
-//    @PostMapping(value = "/api/router")
-//    String getPdd(Pdd pdd);
-
-
-    @PostMapping(value = "/api/router")
-    String getPdd(Pdd pdd);
-
-
-
-
-}

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

@@ -1,25 +1,20 @@
 package com.miaxis.fulu.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.customer.domain.CustomerInfo;
 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 com.miaxis.system.service.ISysDictDataService;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 

jsjp-service/src/main/java/com/miaxis/generator/CodeGenerator.java

@@ -60,11 +60,11 @@ public class CodeGenerator {
 //        dsc.setPassword("cj1234");
 
 
-        dsc.setUrl("jdbc:oracle:thin:@112.124.201.153:1521:orcl");
+        dsc.setUrl("jdbc:oracle:thin:@47.99.70.145:1521:orcl");
         // dsc.setSchemaName("public");
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-        dsc.setUsername("tms_xm");
-        dsc.setPassword("tms_xm2017");
+        dsc.setUsername("newgzpt");
+        dsc.setPassword("newgzpt2016");
         //master
 //        dsc.setUrl("jdbc:mysql://172.16.18.112:3306/xiaodao?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true");
 //        dsc.setDriverName("com.mysql.cj.jdbc.Driver");

jsjp-service/src/main/java/com/miaxis/job/MenuJob.java

@@ -1,218 +0,0 @@
-package com.miaxis.job;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.miaxis.carousel.service.IHomePageDataInfoService;
-import com.miaxis.carousel.vo.HomePageDataInfoVo;
-import com.miaxis.common.config.MeiConfig;
-import com.miaxis.common.config.PddConfig;
-import com.miaxis.common.sms.MD5Utils;
-import com.miaxis.common.utils.DateUtils;
-import com.miaxis.feign.dto.Mei;
-import com.miaxis.feign.dto.Pdd;
-import com.miaxis.feign.service.IMeiService;
-import com.miaxis.feign.service.IPddService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.util.unit.DataUnit;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-@Slf4j
-@Component
-public class MenuJob {
-
-    @Autowired
-    private IPddService pddService;
-    @Autowired
-    private IMeiService meiService;
-    @Autowired
-    private IHomePageDataInfoService homePageDataInfoService;
-    @Autowired
-    private PddConfig pddConfig;
-    @Autowired
-    private MeiConfig meiConfig;
-
-//    @Scheduled(cron = "0/30 * * * * ?")
-    @Scheduled(cron = "0 0 10 1/7 * ?")
-    public void autoGetUrl() throws Exception {
-        getPddPhoneUrl();
-        getPddTrainTicketsUrl();
-     //   getMeiUrl();
-        homePageDataInfoService.synchroData();
-        log.info("--------更新美团，拼多多URL完成！~---------------");
-    }
-
-
-    public static String getSign(Map<String, Object> params, String client_secret) {
-        Map<String, Object> sortMap = new TreeMap<String, Object>();
-        sortMap.putAll(params);
-        // 以k1v1k2v2...方式拼接参数
-        StringBuilder builder = new StringBuilder();
-        for (Map.Entry<String, Object> s : sortMap.entrySet()) {
-            String k = s.getKey();
-            Object v = s.getValue();
-            builder.append(k).append(v);
-        }
-        builder.append(client_secret);
-        builder.insert(0,client_secret);
-        System.out.println(builder.toString());
-        return builder.toString();
-    }
-
-    public void getPddPhoneUrl() throws Exception {
-
-//        String client_id = "fa0f2debb5b0444b9719919d7b8204d1";
-//        String client_secret = "3305b6bb37252495848e67fd991134651e308495";
-//        String pid = "1642187_203462988";
-
-        long timeLong = System.currentTimeMillis();
-        String timestamp = String.valueOf(timeLong/1000);
-        Pdd pdd = new Pdd();
-        //公共请救参数
-        pdd.setType("pdd.ddk.resource.url.gen");
-        pdd.setClient_id(pddConfig.getClientId());
-        pdd.setTimestamp(timestamp);
-        //请求参数
-        pdd.setGenerate_we_app(true);
-        pdd.setPid(pddConfig.getPid());
-        //     pdd.setResource_type(39996);
-        pdd.setResource_type(39997);
-        //sign 加密
-        Map<String,Object> param = new HashMap<String,Object>();
-        //公共参数
-        param.put("type",pdd.getType());
-        param.put("client_id",pdd.getClient_id());
-        param.put("timestamp",pdd.getTimestamp());
-        //请求参数
-        param.put("generate_we_app",pdd.getGenerate_we_app());
-        param.put("pid",pdd.getPid());
-        param.put("resource_type",pdd.getResource_type());
-        String sign = getSign(param,pddConfig.getClientSecret());
-        String md5 = MD5Utils.MD5Encode(sign).toUpperCase();
-        pdd.setSign(md5);
-
-        String result = pddService.getPdd(pdd);
-
-        JSONObject json = JSONObject.parseObject(result);
-        String resourceUrlResponseJson = json.get("resource_url_response").toString();
-        JSONObject json2  = JSONObject.parseObject(resourceUrlResponseJson);
-        String waAppInfo = json2.get("we_app_info").toString();
-
-        JSONObject waAppInfoJson = JSONObject.parseObject(waAppInfo);
-
-        String pagePath = waAppInfoJson.get("page_path").toString();
-        String appId = waAppInfoJson.get("app_id").toString();
-
-        HomePageDataInfoVo hp = new HomePageDataInfoVo();
-        hp.setPictureName("话费充值");
-        hp.setJumpUrl("{\"appId\":\""+appId+"\",\"path\":\""+pagePath+"\"}");
-        homePageDataInfoService.updateHomePageDataByPictureName(hp);
-    }
-
-
-    public void getPddTrainTicketsUrl() throws Exception {
-
-        long timeLong = System.currentTimeMillis();
-        String timestamp = String.valueOf(timeLong/1000);
-        Pdd pdd = new Pdd();
-        //公共请救参数
-        pdd.setType("pdd.ddk.resource.url.gen");
-        pdd.setClient_id(pddConfig.getClientId());
-        pdd.setTimestamp(timestamp);
-        //请求参数
-        pdd.setGenerate_we_app(true);
-        pdd.setPid(pddConfig.getPid());
-        //     pdd.setResource_type(39996);
-        pdd.setResource_type(50005);
-        //sign 加密
-        Map<String,Object> param = new HashMap<String,Object>();
-        //公共参数
-        param.put("type",pdd.getType());
-        param.put("client_id",pdd.getClient_id());
-        param.put("timestamp",pdd.getTimestamp());
-        //请求参数
-        param.put("generate_we_app",pdd.getGenerate_we_app());
-        param.put("pid",pdd.getPid());
-        param.put("resource_type",pdd.getResource_type());
-        String sign = getSign(param,pddConfig.getClientSecret());
-        String md5 = MD5Utils.MD5Encode(sign).toUpperCase();
-        pdd.setSign(md5);
-
-        String result = pddService.getPdd(pdd);
-
-        JSONObject json = JSONObject.parseObject(result);
-        String resourceUrlResponseJson = json.get("resource_url_response").toString();
-        JSONObject json2  = JSONObject.parseObject(resourceUrlResponseJson);
-        String waAppInfo = json2.get("we_app_info").toString();
-
-        JSONObject waAppInfoJson = JSONObject.parseObject(waAppInfo);
-
-        String pagePath = waAppInfoJson.get("page_path").toString();
-        String appId = waAppInfoJson.get("app_id").toString();
-
-        HomePageDataInfoVo hp = new HomePageDataInfoVo();
-        hp.setPictureName("火车票");
-        hp.setJumpUrl("{\"appId\":\""+appId+"\",\"path\":\""+pagePath+"\"}");
-        homePageDataInfoService.updateHomePageDataByPictureName(hp);
-    }
-
-
-    public void getMeiUrl() throws Exception {
-
-//        String actId = "2";  // 必填  	活动id，可以在联盟活动列表中查看获取 2
-//        String key = "610077fffb51712efaa686d9ffb623da"; //必填 appkey 514202a9238958b16cb13805d6f79273
-//        String secret = "514202a9238958b16cb13805d6f79273";
-//        String sid = "jsshq001"; //必填
-//
-//        String appId = "wxde8ac0a21135c07d";
-
-        long timeLong = System.currentTimeMillis();
-        String timestamp = String.valueOf(timeLong/1000);
-        Mei mei = new Mei();
-        mei.setActId(meiConfig.getActId());
-        mei.setKey(meiConfig.getKey());
-        mei.setSid(meiConfig.getSid());
-        mei.setLinkType("4");
-
-        Map<String,Object> param = new HashMap<String,Object>();
-        param.put("actId",meiConfig.getActId());
-        param.put("key",meiConfig.getKey());
-        param.put("sid",meiConfig.getSid());
-
-        param.put("linkType",4);
-        String sign = this.getSign(param,meiConfig.getSecret());
-        System.out.println(sign);
-        String md5 = MD5Utils.MD5Encode(sign);
-        mei.setSign(md5);
-
-        System.out.println(md5);
-        String result = meiService.geMeiUrl(mei);
-        System.out.println(result);
-
-
-        JSONObject json = JSONObject.parseObject(result);
-        String status = json.get("status").toString();
-        String des = json.get("des").toString();
-        String pagePath = json.get("data").toString();
-
-
-        HomePageDataInfoVo hp = new HomePageDataInfoVo();
-        hp.setPictureName("美团红包");
-        hp.setJumpUrl("{\"appId\":\""+meiConfig.getAppId()+"\",\"path\":\""+pagePath+"\"}");
-        log.info("更新数据条数:"+homePageDataInfoService.updateHomePageDataByPictureName(hp));
-        hp.setPictureName("美团外卖");
-        hp.setJumpUrl("{\"appId\":\""+meiConfig.getAppId()+"\",\"path\":\""+pagePath+"\"}");
-        log.info("更新数据条数:"+homePageDataInfoService.updateHomePageDataByPictureName(hp));
-    }
-
-
-
-
-}

jsjp-service/src/main/java/com/miaxis/job/test1.java

@@ -1,8 +0,0 @@
-package com.miaxis.job;
-
-
-
-public class test1 {
-}
-
-

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptUserInfo.java

@@ -1,17 +1,16 @@
 package com.miaxis.newgzpt.domain;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 学员基本信息表
@@ -29,7 +28,7 @@ public class GzptUserInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "姓名")
     @TableField("USER_NAME")

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptVideoVip.java

@@ -0,0 +1,68 @@
+package com.miaxis.newgzpt.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 视频VIP表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-01-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("GZPT_VIDEO_VIP")
+@ApiModel(value="VideoVip对象", description="视频VIP表")
+public class GzptVideoVip implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @ApiModelProperty(value = "用户ID")
+    @TableField("USER_ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户名")
+    @TableField("USER_NAME")
+    private String userName;
+
+    @ApiModelProperty(value = "登录帐号")
+    @TableField("LOGINCODE")
+    private String logincode;
+
+    @ApiModelProperty(value = "科目1  到期时间")
+    @TableField("SUBJECT1")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject1;
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @TableField("SUBJECT2")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject2;
+
+    @ApiModelProperty(value = "科目3  到期时间")
+    @TableField("SUBJECT3")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject3;
+
+    @ApiModelProperty(value = "科目4  到期时间")
+    @TableField("SUBJECT4")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject4;
+
+
+}

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

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

jsjp-service/src/main/java/com/miaxis/newgzpt/mapper/GzptUserInfoMapper.java

@@ -20,5 +20,5 @@ public interface GzptUserInfoMapper extends BaseMapper<GzptUserInfo> {
 
     GzptUserInfo getUserByWxlogin(GzptUserInfoDTO gzptUserInfoDTO);
 
-    GzptUserInfo getInfoById(Integer id);
+    GzptUserInfo getInfoById(Long id);
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/mapper/GzptVideoVipMapper.java

@@ -0,0 +1,24 @@
+package com.miaxis.newgzpt.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.newgzpt.domain.GzptVideoVip;
+import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
+
+/**
+ * <p>
+ * 视频VIP表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-01-27
+ */
+public interface GzptVideoVipMapper extends BaseMapper<GzptVideoVip> {
+
+    void saveGzptVideoVip(GzptVideoVip gzptVideoVip);
+
+    void updateGzptVideoVipByUserId(GzptVideoVip gzptVideoVip);
+
+    GzptVideoVip getGzptVideoVipByUserId(GzptVideoVipDTO gzptVideoVipDTO);
+
+}

jsjp-service/src/main/java/com/miaxis/newgzpt/service/IGzptUserInfoService.java

@@ -21,5 +21,5 @@ public interface IGzptUserInfoService extends IService<GzptUserInfo> {
 
     GzptUserInfo getUserWxlogin(GzptUserInfoDTO userInfoDTO);
 
-    GzptUserInfo getInfoById(Integer id);
+    GzptUserInfo getInfoById(Long id);
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/service/IGzptVideoVipService.java

@@ -0,0 +1,26 @@
+package com.miaxis.newgzpt.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.newgzpt.domain.GzptVideoVip;
+import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
+
+/**
+ * <p>
+ * 视频VIP表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-01-27
+ */
+public interface IGzptVideoVipService extends IService<GzptVideoVip> {
+
+
+    void saveGzptVideoVip(GzptVideoVip gzptVideoVip);
+
+    void updateGzptVideoVipByUserId(GzptVideoVip gzptVideoVip);
+
+    GzptVideoVip getGzptVideoVipByUserId(GzptVideoVipDTO gzptVideoVipDTO);
+
+
+}

jsjp-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptTrainRecordServiceImpl.java

@@ -36,7 +36,6 @@ public class GzptTrainRecordServiceImpl extends ServiceImpl<GzptTrainRecordMappe
 
     @Override
     public void saveGzptTrainRecord(GzptTrainRecord gzptTrainRecord) {
-
         gzptTrainRecordMapper.saveGzptTrainRecord(gzptTrainRecord);
     }
 

jsjp-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptUserInfoServiceImpl.java

@@ -1,15 +1,13 @@
 package com.miaxis.newgzpt.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.enums.DataSourceTypeEnum;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
 import com.miaxis.newgzpt.mapper.GzptUserInfoMapper;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.system.dto.system.UserInfoDTO;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -42,7 +40,7 @@ public class GzptUserInfoServiceImpl extends ServiceImpl<GzptUserInfoMapper, Gzp
     }
 
     @Override
-    public GzptUserInfo getInfoById(Integer id) {
+    public GzptUserInfo getInfoById(Long id) {
         return  mapper.getInfoById(id);
     }
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptVideoVipServiceImpl.java

@@ -0,0 +1,47 @@
+package com.miaxis.newgzpt.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataSource;
+import com.miaxis.common.enums.DataSourceTypeEnum;
+import com.miaxis.newgzpt.domain.GzptVideoVip;
+import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
+import com.miaxis.newgzpt.mapper.GzptVideoVipMapper;
+import com.miaxis.newgzpt.service.IGzptVideoVipService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * <p>
+ * 视频VIP表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-01-27
+ */
+@Service
+@DataSource(value = DataSourceTypeEnum.NEWGZPT)
+public class GzptVideoVipServiceImpl extends ServiceImpl<GzptVideoVipMapper, GzptVideoVip> implements IGzptVideoVipService {
+
+
+    @Resource
+    private GzptVideoVipMapper mapper;
+
+    @Override
+    public void saveGzptVideoVip(GzptVideoVip gzptVideoVip) {
+        mapper.saveGzptVideoVip(gzptVideoVip);
+    }
+
+
+    @Override
+    public void updateGzptVideoVipByUserId(GzptVideoVip gzptVideoVip) {
+        mapper.updateGzptVideoVipByUserId(gzptVideoVip);
+    }
+
+    @Override
+    public GzptVideoVip getGzptVideoVipByUserId(GzptVideoVipDTO gzptVideoVipDTO) {
+        return mapper.getGzptVideoVipByUserId(gzptVideoVipDTO);
+    }
+
+}

jsjp-service/src/main/java/com/miaxis/product/domain/ProductTypeInfo.java

@@ -1,62 +0,0 @@
-package com.miaxis.product.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;
-/**
- * 品类对象 product_type_info
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Data
-@TableName("product_type_info")
-@ApiModel(value = "ProductTypeInfo", description = "品类对象 product_type_info")
-public class ProductTypeInfo extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    @TableId(value = "id")
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    /** 分类名称 */
-    @Excel(name = "分类名称")
-    @TableField("product_name")
-    @ApiModelProperty(value = "分类名称")
-    private String productName;
-
-    /** 父节点（预留） */
-    @Excel(name = "父节点（预留）", readConverterExp = "预=留")
-    @TableField("pid")
-    @ApiModelProperty(value = "父节点（预留）")
-    private Long pid;
-
-    /** 分类描述，该分类名称的描述 */
-    @Excel(name = "分类描述，该分类名称的描述")
-    @TableField("product_describe")
-    @ApiModelProperty(value = "分类描述，该分类名称的描述")
-    private String productDescribe;
-
-    /** 品类图标--对应file_info的id */
-    @Excel(name = "品类图标--对应file_info的id")
-    @TableField("product_icon")
-    @ApiModelProperty(value = "品类图标--对应file_info的id")
-    private Integer productIcon;
-
-    @ApiModelProperty(value = "权重（数值从大到小）")
-    private Integer weight;
-
-    /** 状态  0：有效(默认)、1：失效 （伪删除） */
-    @Excel(name = "状态  0：有效(默认)、1：失效 （伪删除）", readConverterExp = "伪=删除")
-    @TableField("status")
-    @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
-    private String status;
-
-
-}

jsjp-service/src/main/java/com/miaxis/product/mapper/ProductTypeInfoMapper.java

@@ -1,39 +0,0 @@
-package com.miaxis.product.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.miaxis.product.domain.ProductTypeInfo;
-import com.miaxis.product.vo.AppletProductTypeInfoVo;
-import com.miaxis.product.vo.ProductTypeInfoVo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 品类Mapper接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface ProductTypeInfoMapper extends BaseMapper<ProductTypeInfo> {
-    /**
-     * 查询品类列表
-     *
-     * @param productTypeInfo 品类
-     * @return 品类集合
-     */
-    List<ProductTypeInfoVo> selectProductTypeInfoList(ProductTypeInfo productTypeInfo);
-
-    /**
-     * 获取品类详情信息
-     * @param id
-     * @return
-     */
-    ProductTypeInfoVo getProductDetailsById(@Param("id") Long id);
-
-    /**
-     * applet
-     * 查询品类列表
-     * @return 品类集合
-     */
-    List<AppletProductTypeInfoVo> selectAppletProductTypeInfoList();
-
-}

jsjp-service/src/main/java/com/miaxis/product/service/IProductTypeInfoService.java

@@ -1,53 +0,0 @@
-package com.miaxis.product.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.product.domain.ProductTypeInfo;
-import com.miaxis.product.vo.AppletProductTypeInfoVo;
-import com.miaxis.product.vo.ProductTypeInfoVo;
-
-import java.util.List;
-
-/**
- * 品类Service接口
- *
- * @author miaxis
- * @date 2021-03-11
- */
-public interface IProductTypeInfoService extends IService<ProductTypeInfo>{
-    /**
-     * 查询品类列表
-     *
-     * @param productTypeInfo 品类
-     * @return 品类集合
-     */
-    List<ProductTypeInfoVo> selectProductTypeInfoList(ProductTypeInfo productTypeInfo);
-
-    /**
-     * 删除品类
-     * @param ids
-     * @return
-     */
-    Response<Integer> removeProductByIds(Long[] ids);
-
-    /**
-     * 获取品类详情信息
-     * @param id
-     * @return
-     */
-    Response<ProductTypeInfoVo> getProductDetailsById(Long id);
-
-    /**
-     * 新增品类
-     * @param productTypeInfo
-     * @return
-     */
-    Response saveProductTypeInfo(ProductTypeInfo productTypeInfo);
-
-    /**
-     * applet
-     * 分类列表
-     * @return
-     */
-    List<AppletProductTypeInfoVo> selectAppletProductTypeInfoList();
-}

jsjp-service/src/main/java/com/miaxis/product/service/impl/ProductTypeInfoServiceImpl.java

@@ -1,131 +0,0 @@
-package com.miaxis.product.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.exception.CustomException;
-import com.miaxis.customer.service.ICustomerInfoService;
-import com.miaxis.product.domain.ProductTypeInfo;
-import com.miaxis.product.mapper.ProductTypeInfoMapper;
-import com.miaxis.product.service.IProductTypeInfoService;
-import com.miaxis.product.vo.AppletProductTypeInfoVo;
-import com.miaxis.product.vo.ProductTypeInfoVo;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 品类Service业务层处理
- *
- * @author miaxis
- * @date 2021-03-11
- */
-@Service
-@RequiredArgsConstructor
-public class ProductTypeInfoServiceImpl extends ServiceImpl<ProductTypeInfoMapper, ProductTypeInfo> implements IProductTypeInfoService {
-
-    private final ProductTypeInfoMapper productTypeInfoMapper;
-
-    private final ICustomerInfoService customerInfoService;
-
-    /**
-     * 查询品类列表
-     *
-     * @param productTypeInfo 品类
-     * @return 品类
-     */
-    @Override
-    public List<ProductTypeInfoVo> selectProductTypeInfoList(ProductTypeInfo productTypeInfo){
-        return productTypeInfoMapper.selectProductTypeInfoList(productTypeInfo);
-    }
-
-    /**
-     * 删除品类
-     * @param ids
-     * @return
-     */
-    @Override
-    @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
-    public Response<Integer> removeProductByIds(Long[] ids) {
-        for (Long id : ids) {
-            this.update(new UpdateWrapper<ProductTypeInfo>().set("status","1").eq("id",id));
-        }
-        return Response.success();
-    }
-
-    /**
-     * 获取品类详情信息
-     * @param id
-     * @return
-     */
-    @Override
-    public Response<ProductTypeInfoVo> getProductDetailsById(Long id) {
-
-        return Response.success(productTypeInfoMapper.getProductDetailsById(id));
-    }
-
-    /**
-     * 新增品类
-     * @param productTypeInfo
-     * @return
-     */
-    @Override
-    public Response saveProductTypeInfo(ProductTypeInfo productTypeInfo) {
-
-        List<ProductTypeInfo> productTypeInfos = productTypeInfoMapper.selectByMap(new HashMap<String, Object>() {{
-            put("product_name", productTypeInfo.getProductName());
-        }});
-        if (!productTypeInfos.isEmpty()) throw new CustomException("分类名称重复");
-
-        productTypeInfoMapper.insert(productTypeInfo);
-        return Response.success();
-
-    }
-
-    /**
-     * applet
-     * 分类列表
-     * @return
-     */
-    @Override
-    public List<AppletProductTypeInfoVo> selectAppletProductTypeInfoList() {
-        List<AppletProductTypeInfoVo> productTypeInfoVos = productTypeInfoMapper.selectAppletProductTypeInfoList();
-        return builTree(productTypeInfoVos);
-    }
-
-
-    //建立树形结构
-    public List<AppletProductTypeInfoVo> builTree(List<AppletProductTypeInfoVo> productList){
-        List<AppletProductTypeInfoVo> infoVos =new  ArrayList<>();
-        //获取根节点
-        List<AppletProductTypeInfoVo> rootMenuLists =new  ArrayList<>();
-        for(AppletProductTypeInfoVo productType : productList) {
-            if(productType.getPid().toString().equals("0")) {
-                rootMenuLists.add(productType);
-            }
-        }
-        for(AppletProductTypeInfoVo productTypeInfoVo : rootMenuLists) {
-            productTypeInfoVo=getTree(productTypeInfoVo,productList);
-            infoVos.add(productTypeInfoVo);
-        }
-        return infoVos;
-    }
-    //递归，建立子树形结构
-    private AppletProductTypeInfoVo getTree(AppletProductTypeInfoVo productTypeInfo,List<AppletProductTypeInfoVo> menuList){
-        List<AppletProductTypeInfoVo> infoVos = new ArrayList<>();
-        for (AppletProductTypeInfoVo productTypeInfoVo : menuList) {
-            if (productTypeInfoVo.getPid().toString().equals(productTypeInfo.getId().toString())){
-                infoVos.add(getTree(productTypeInfoVo,menuList));
-            }
-        }
-        productTypeInfo.setChildren(infoVos);
-        return productTypeInfo;
-    }
-
-}