cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

微信模块整理

Browse Source
This commit is contained in:
xuwenbo
2020-09-08 14:50:10 +08:00
parent d32349b235
commit d4f57c94d8
84 changed files with 1019 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -11,7 +11,6 @@ package co.yixiang.modules.services;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
@ -25,8 +24,8 @@ import co.yixiang.modules.user.domain.YxUser;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.dto.WechatUserDto;
import co.yixiang.modules.user.vo.OnlineUser;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.config.WxMpConfiguration;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.EncryptUtils;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;

2
yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
View File

@ -31,7 +31,7 @@ import co.yixiang.modules.order.service.dto.ProductAttrDto;
import co.yixiang.modules.order.service.dto.ProductDto;
import co.yixiang.modules.order.vo.OrderCartInfoVo;
import co.yixiang.modules.order.vo.YxStoreOrderQueryVo;
import co.yixiang.mp.service.WeixinPayService;
import co.yixiang.modules.mp.service.WeixinPayService;
import com.alibaba.fastjson.JSONObject;
import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;

4
yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java
View File

@ -9,8 +9,8 @@
package co.yixiang.modules.shop.rest;
import co.yixiang.api.ApiResult;
import co.yixiang.modules.wechat.service.YxArticleService;
import co.yixiang.modules.wechat.vo.YxArticleQueryVo;
import co.yixiang.modules.mp.service.YxArticleService;
import co.yixiang.modules.mp.vo.YxArticleQueryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
View File

@ -24,7 +24,7 @@ import co.yixiang.modules.shop.vo.YxSystemGroupDataVo;
import co.yixiang.modules.user.domain.YxUser;
import co.yixiang.modules.user.param.RechargeParam;
import co.yixiang.modules.user.service.YxUserRechargeService;
import co.yixiang.mp.service.WeixinPayService;
import co.yixiang.modules.mp.service.WeixinPayService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;

6
yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java
View File

@ -22,9 +22,9 @@ import co.yixiang.modules.order.vo.YxStoreOrderQueryVo;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.user.domain.YxUserRecharge;
import co.yixiang.modules.user.service.YxUserRechargeService;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.mp.config.WxPayConfiguration;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.config.WxMpConfiguration;
import co.yixiang.modules.mp.config.WxPayConfiguration;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.BigNum;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;

17
yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java
View File

@ -10,27 +10,16 @@ package co.yixiang.modules.wechat.rest.controller;
import cn.binarywang.wx.miniapp.bean.WxMaLiveResult;
import co.yixiang.api.ApiResult;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.modules.wechat.service.YxWechatLiveService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.wechat.vo.WechatLiveVo;
import co.yixiang.modules.mp.service.YxWechatLiveService;
import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.mp.vo.WechatLiveVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @author hupeng

2
yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java
View File

@ -21,7 +21,7 @@ import co.yixiang.modules.user.domain.YxUser;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.wechat.rest.param.BindPhoneParam;
import co.yixiang.modules.wechat.rest.param.WxPhoneParam;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;
import io.swagger.annotations.Api;

4
yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
View File

@ -361,7 +361,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
//取最小价格
Double minPrice = ListMapToListBean(attrs)
.stream()
.map(ProductFormatDto::getPrice)
.map(ProductFormatDto::getPinkPrice)
.min(Comparator.naturalOrder())
.orElse(0d);
@ -379,7 +379,7 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
//计算库存
Integer stock = ListMapToListBean(attrs)
.stream()
.map(ProductFormatDto::getStock)
.map(ProductFormatDto::getPinkStock)
.reduce(Integer::sum)
.orElse(0);

4
yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
View File

@ -313,7 +313,7 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
//取最小价格
Double minPrice = ListMapToListBean(attrs)
.stream()
.map(ProductFormatDto::getPrice)
.map(ProductFormatDto::getSeckillPrice)
.min(Comparator.naturalOrder())
.orElse(0d);
@ -331,7 +331,7 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
//计算库存
Integer stock = ListMapToListBean(attrs)
.stream()
.map(ProductFormatDto::getStock)
.map(ProductFormatDto::getSeckillStock)
.reduce(Integer::sum)
.orElse(0);

7
yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
View File

@ -139,8 +139,13 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
yxStoreProductAttrService.decProductAttrStock(num,productId,unique, type);
}
int res = 0;
if("combination".equals(type)){
res = storeProductMapper.decCombinationStockIncSales(num,productId,activityId);
}else if("seckill".equals(type)){
res = storeProductMapper.decSeckillStockIncSales(num,productId,activityId);
}else {
res = storeProductMapper.decStockIncSales(num,productId);
}
if(res == 0) {
throw new YshopException("商品库存不足");

6
yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java
View File

@ -4,9 +4,9 @@ import cn.hutool.core.util.ReUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.wechat.service.dto.YxArticleDto;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.mp.utils.URLUtils;
import co.yixiang.modules.mp.service.dto.YxArticleDto;
import co.yixiang.modules.mp.config.WxMpConfiguration;
import co.yixiang.modules.mp.utils.URLUtils;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.error.WxErrorException;

6
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java
View File

@ -16,9 +16,9 @@ import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.shop.domain.YxSystemConfig;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.mp.config.WxPayConfiguration;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.config.WxMpConfiguration;
import co.yixiang.modules.mp.config.WxPayConfiguration;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.RedisUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

8
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java
View File

@ -7,10 +7,10 @@ package co.yixiang.modules.wechat.rest;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.services.WechatArticleService;
import co.yixiang.modules.wechat.domain.YxArticle;
import co.yixiang.modules.wechat.service.YxArticleService;
import co.yixiang.modules.wechat.service.dto.YxArticleDto;
import co.yixiang.modules.wechat.service.dto.YxArticleQueryCriteria;
import co.yixiang.modules.mp.domain.YxArticle;
import co.yixiang.modules.mp.service.YxArticleService;
import co.yixiang.modules.mp.service.dto.YxArticleDto;
import co.yixiang.modules.mp.service.dto.YxArticleQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;

6
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java
View File

@ -9,9 +9,9 @@ package co.yixiang.modules.wechat.rest;
import co.yixiang.constant.ShopConstants;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.wechat.domain.YxWechatMenu;
import co.yixiang.modules.wechat.service.YxWechatMenuService;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.modules.mp.domain.YxWechatMenu;
import co.yixiang.modules.mp.service.YxWechatMenuService;
import co.yixiang.modules.mp.config.WxMpConfiguration;
import co.yixiang.utils.OrderUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

4
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatReplyController.java
View File

@ -7,8 +7,8 @@ package co.yixiang.modules.wechat.rest;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.wechat.domain.YxWechatReply;
import co.yixiang.modules.wechat.service.YxWechatReplyService;
import co.yixiang.modules.mp.domain.YxWechatReply;
import co.yixiang.modules.mp.service.YxWechatReplyService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;

8
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/WechatTemplateController.java
View File

@ -7,10 +7,10 @@ package co.yixiang.modules.wechat.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.wechat.service.YxWechatTemplateService;
import co.yixiang.modules.wechat.service.dto.YxWechatTemplateDto;
import co.yixiang.modules.wechat.service.dto.YxWechatTemplateQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
import co.yixiang.modules.mp.service.YxWechatTemplateService;
import co.yixiang.modules.mp.service.dto.YxWechatTemplateDto;
import co.yixiang.modules.mp.service.dto.YxWechatTemplateQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;

8
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java
View File

@ -10,10 +10,10 @@ package co.yixiang.modules.wechat.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.modules.wechat.service.YxWechatLiveService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatLive;
import co.yixiang.modules.mp.service.YxWechatLiveService;
import co.yixiang.modules.mp.service.dto.YxWechatLiveDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;

8
yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java
View File

@ -10,10 +10,10 @@ package co.yixiang.modules.wechat.rest;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.wechat.domain.YxWechatLiveGoods;
import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatLiveGoods;
import co.yixiang.modules.mp.service.YxWechatLiveGoodsService;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;

2
yshop-weixin/src/main/java/co/yixiang/mp/builder/AbstractBuilder.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/builder/AbstractBuilder.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.builder;
package co.yixiang.modules.mp.builder;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;

2
yshop-weixin/src/main/java/co/yixiang/mp/builder/ImageBuilder.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/builder/ImageBuilder.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.builder;
package co.yixiang.modules.mp.builder;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;

2
yshop-weixin/src/main/java/co/yixiang/mp/builder/TextBuilder.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/builder/TextBuilder.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.builder;
package co.yixiang.modules.mp.builder;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;

2
yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMaConfiguration.java
View File

@ -1,4 +1,4 @@
package co.yixiang.tools.config;
package co.yixiang.modules.mp.config;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

22
yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxMpConfiguration.java
View File

@ -3,18 +3,18 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.config;
package co.yixiang.modules.mp.config;
import co.yixiang.mp.handler.KfSessionHandler;
import co.yixiang.mp.handler.LocationHandler;
import co.yixiang.mp.handler.LogHandler;
import co.yixiang.mp.handler.MenuHandler;
import co.yixiang.mp.handler.MsgHandler;
import co.yixiang.mp.handler.NullHandler;
import co.yixiang.mp.handler.ScanHandler;
import co.yixiang.mp.handler.StoreCheckNotifyHandler;
import co.yixiang.mp.handler.SubscribeHandler;
import co.yixiang.mp.handler.UnsubscribeHandler;
import co.yixiang.modules.mp.handler.KfSessionHandler;
import co.yixiang.modules.mp.handler.LocationHandler;
import co.yixiang.modules.mp.handler.LogHandler;
import co.yixiang.modules.mp.handler.MenuHandler;
import co.yixiang.modules.mp.handler.MsgHandler;
import co.yixiang.modules.mp.handler.NullHandler;
import co.yixiang.modules.mp.handler.ScanHandler;
import co.yixiang.modules.mp.handler.StoreCheckNotifyHandler;
import co.yixiang.modules.mp.handler.SubscribeHandler;
import co.yixiang.modules.mp.handler.UnsubscribeHandler;
import co.yixiang.utils.RedisUtil;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;

2
yshop-weixin/src/main/java/co/yixiang/mp/config/WxPayConfiguration.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.config;
package co.yixiang.modules.mp.config;
import co.yixiang.enums.PayMethodEnum;
import co.yixiang.utils.RedisUtil;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxArticle.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/domain/YxArticle.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.domain;
package co.yixiang.modules.mp.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/domain/YxWechatLive.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.domain;
package co.yixiang.modules.mp.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLiveGoods.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/domain/YxWechatLiveGoods.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.domain;
package co.yixiang.modules.mp.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatMenu.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/domain/YxWechatMenu.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.domain;
package co.yixiang.modules.mp.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatReply.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/domain/YxWechatReply.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.domain;
package co.yixiang.modules.mp.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatTemplate.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/domain/YxWechatTemplate.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.domain;
package co.yixiang.modules.mp.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;

2
yshop-weixin/src/main/java/co/yixiang/mp/enums/WechatTempateEnum.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/enums/WechatTempateEnum.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.mp.enums;
package co.yixiang.modules.mp.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
yshop-weixin/src/main/java/co/yixiang/mp/error/ErrorController.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/error/ErrorController.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.error;
package co.yixiang.modules.mp.error;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;

2
yshop-weixin/src/main/java/co/yixiang/mp/error/ErrorPageConfiguration.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/error/ErrorPageConfiguration.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.error;
package co.yixiang.modules.mp.error;
import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.ErrorPageRegistrar;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/AbstractHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/AbstractHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.mp.api.WxMpMessageHandler;
import org.slf4j.Logger;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/KfSessionHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/KfSessionHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

4
yshop-weixin/src/main/java/co/yixiang/mp/handler/LocationHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/LocationHandler.java
View File

@ -3,9 +3,9 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import co.yixiang.mp.builder.TextBuilder;
import co.yixiang.modules.mp.builder.TextBuilder;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/LogHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/LogHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/MenuHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/MenuHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

4
yshop-weixin/src/main/java/co/yixiang/mp/handler/MsgHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/MsgHandler.java
View File

@ -3,9 +3,9 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import co.yixiang.mp.builder.TextBuilder;
import co.yixiang.modules.mp.builder.TextBuilder;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/NullHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/NullHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/RedisHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/RedisHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import org.springframework.beans.factory.annotation.Autowired;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/ScanHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/ScanHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/StoreCheckNotifyHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/StoreCheckNotifyHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

6
yshop-weixin/src/main/java/co/yixiang/mp/handler/SubscribeHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/SubscribeHandler.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.modules.wechat.domain.YxWechatReply;
import co.yixiang.modules.wechat.service.YxWechatReplyService;
import co.yixiang.modules.mp.domain.YxWechatReply;
import co.yixiang.modules.mp.service.YxWechatReplyService;
import com.alibaba.fastjson.JSONObject;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager;

2
yshop-weixin/src/main/java/co/yixiang/mp/handler/UnsubscribeHandler.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/handler/UnsubscribeHandler.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.handler;
package co.yixiang.modules.mp.handler;
import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpService;

8
yshop-weixin/src/main/java/co/yixiang/mp/listener/TemplateListener.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/listener/TemplateListener.java
View File

@ -6,16 +6,16 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.mp.listener;
package co.yixiang.modules.mp.listener;
import co.yixiang.enums.PayTypeEnum;
import co.yixiang.event.TemplateBean;
import co.yixiang.event.TemplateEvent;
import co.yixiang.event.TemplateListenEnum;
import co.yixiang.mp.service.WeiXinSubscribeService;
import co.yixiang.mp.service.WeixinPayService;
import co.yixiang.mp.service.WeixinTemplateService;
import co.yixiang.modules.mp.service.WeiXinSubscribeService;
import co.yixiang.modules.mp.service.WeixinPayService;
import co.yixiang.modules.mp.service.WeixinTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEvent;

10
yshop-weixin/src/main/java/co/yixiang/mp/service/WeiXinSubscribeService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/WeiXinSubscribeService.java
View File

@ -1,17 +1,16 @@
package co.yixiang.mp.service;
package co.yixiang.modules.mp.service;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
import co.yixiang.modules.user.domain.YxUser;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.dto.WechatUserDto;
import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.wechat.service.YxWechatTemplateService;
import co.yixiang.mp.enums.WechatTempateEnum;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.enums.WechatTempateEnum;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -20,7 +19,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
/**
* 小程序订阅消息通知

4
yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/WeixinPayService.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.mp.service;
package co.yixiang.modules.mp.service;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -24,7 +24,7 @@ import co.yixiang.modules.user.domain.YxUserRecharge;
import co.yixiang.modules.user.service.YxUserRechargeService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.dto.WechatUserDto;
import co.yixiang.mp.config.WxPayConfiguration;
import co.yixiang.modules.mp.config.WxPayConfiguration;
import co.yixiang.utils.IpUtil;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;

9
yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinTemplateService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/WeixinTemplateService.java
View File

@ -6,18 +6,17 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.mp.service;
package co.yixiang.modules.mp.service;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.modules.mp.config.WxMpConfiguration;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
import co.yixiang.modules.user.domain.YxUser;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.dto.WechatUserDto;
import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.wechat.service.YxWechatTemplateService;
import co.yixiang.mp.config.WxMpConfiguration;
import co.yixiang.mp.enums.WechatTempateEnum;
import co.yixiang.modules.mp.enums.WechatTempateEnum;
import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.ShopKeyUtils;
import me.chanjar.weixin.common.error.WxErrorException;

10
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxArticleService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxArticleService.java
View File

@ -6,13 +6,13 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service;
package co.yixiang.modules.mp.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.modules.wechat.domain.YxArticle;
import co.yixiang.modules.wechat.service.dto.YxArticleDto;
import co.yixiang.modules.wechat.service.dto.YxArticleQueryCriteria;
import co.yixiang.modules.wechat.vo.YxArticleQueryVo;
import co.yixiang.modules.mp.service.dto.YxArticleDto;
import co.yixiang.modules.mp.service.dto.YxArticleQueryCriteria;
import co.yixiang.modules.mp.domain.YxArticle;
import co.yixiang.modules.mp.vo.YxArticleQueryVo;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

8
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatLiveGoodsService.java
View File

@ -6,12 +6,12 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service;
package co.yixiang.modules.mp.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.modules.wechat.domain.YxWechatLiveGoods;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatLiveGoods;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

11
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatLiveService.java
View File

@ -6,20 +6,19 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service;
package co.yixiang.modules.mp.service;
import cn.binarywang.wx.miniapp.bean.WxMaLiveResult;
import co.yixiang.common.service.BaseService;
import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.wechat.vo.WechatLiveVo;
import co.yixiang.modules.mp.service.dto.YxWechatLiveDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.mp.vo.WechatLiveVo;
import co.yixiang.modules.mp.domain.YxWechatLive;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @author hupeng

8
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatMenuService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatMenuService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service;
package co.yixiang.modules.mp.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.modules.wechat.domain.YxWechatMenu;
import co.yixiang.modules.wechat.service.dto.YxWechatMenuDto;
import co.yixiang.modules.wechat.service.dto.YxWechatMenuQueryCriteria;
import co.yixiang.modules.mp.service.dto.YxWechatMenuDto;
import co.yixiang.modules.mp.service.dto.YxWechatMenuQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatMenu;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

8
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatReplyService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatReplyService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service;
package co.yixiang.modules.mp.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.modules.wechat.domain.YxWechatReply;
import co.yixiang.modules.wechat.service.dto.YxWechatReplyDto;
import co.yixiang.modules.wechat.service.dto.YxWechatReplyQueryCriteria;
import co.yixiang.modules.mp.service.dto.YxWechatReplyDto;
import co.yixiang.modules.mp.service.dto.YxWechatReplyQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatReply;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

8
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatTemplateService.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatTemplateService.java
View File

@ -3,12 +3,12 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service;
package co.yixiang.modules.mp.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.wechat.service.dto.YxWechatTemplateDto;
import co.yixiang.modules.wechat.service.dto.YxWechatTemplateQueryCriteria;
import co.yixiang.modules.mp.service.dto.YxWechatTemplateQueryCriteria;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
import co.yixiang.modules.mp.service.dto.YxWechatTemplateDto;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxArticleDto.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxArticleDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxArticleQueryCriteria.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxArticleQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatLiveDto.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatLiveGoodsDto.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsQueryCriteria.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatLiveGoodsQueryCriteria.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveQueryCriteria.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatLiveQueryCriteria.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatMenuDto.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatMenuDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatMenuQueryCriteria.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatMenuQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatReplyDto.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatReplyDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatReplyQueryCriteria.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatReplyQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatTemplateDto.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatTemplateDto.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatTemplateQueryCriteria.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/YxWechatTemplateQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.dto;
package co.yixiang.modules.mp.service.dto;
import lombok.Data;

14
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxArticleServiceImpl.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxArticleServiceImpl.java
View File

@ -6,17 +6,17 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.impl;
package co.yixiang.modules.mp.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.modules.wechat.domain.YxArticle;
import co.yixiang.modules.wechat.service.YxArticleService;
import co.yixiang.modules.wechat.service.dto.YxArticleDto;
import co.yixiang.modules.wechat.service.dto.YxArticleQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.ArticleMapper;
import co.yixiang.modules.wechat.vo.YxArticleQueryVo;
import co.yixiang.modules.mp.service.mapper.ArticleMapper;
import co.yixiang.modules.mp.domain.YxArticle;
import co.yixiang.modules.mp.service.YxArticleService;
import co.yixiang.modules.mp.service.dto.YxArticleDto;
import co.yixiang.modules.mp.service.dto.YxArticleQueryCriteria;
import co.yixiang.modules.mp.vo.YxArticleQueryVo;
import co.yixiang.utils.FileUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

14
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.impl;
package co.yixiang.modules.mp.service.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaLiveInfo;
@ -19,12 +19,12 @@ import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.enums.LiveGoodsEnum;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.wechat.domain.YxWechatLiveGoods;
import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.YxWechatLiveGoodsMapper;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.service.mapper.YxWechatLiveGoodsMapper;
import co.yixiang.modules.mp.domain.YxWechatLiveGoods;
import co.yixiang.modules.mp.service.YxWechatLiveGoodsService;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsQueryCriteria;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.FileUtil;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;

22
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.impl;
package co.yixiang.modules.mp.service.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaLiveInfo;
@ -17,16 +17,16 @@ import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.modules.wechat.domain.YxWechatLiveGoods;
import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService;
import co.yixiang.modules.wechat.service.YxWechatLiveService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.YxWechatLiveMapper;
import co.yixiang.modules.wechat.vo.WechatLiveVo;
import co.yixiang.tools.config.WxMaConfiguration;
import co.yixiang.modules.mp.domain.YxWechatLiveGoods;
import co.yixiang.modules.mp.service.YxWechatLiveGoodsService;
import co.yixiang.modules.mp.service.YxWechatLiveService;
import co.yixiang.modules.mp.service.dto.YxWechatLiveDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.mp.service.mapper.YxWechatLiveMapper;
import co.yixiang.modules.mp.vo.WechatLiveVo;
import co.yixiang.modules.mp.domain.YxWechatLive;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.OrderUtil;
import co.yixiang.utils.StringUtils;

12
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatMenuServiceImpl.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatMenuServiceImpl.java
View File

@ -3,16 +3,16 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.impl;
package co.yixiang.modules.mp.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.modules.wechat.domain.YxWechatMenu;
import co.yixiang.modules.wechat.service.YxWechatMenuService;
import co.yixiang.modules.wechat.service.dto.YxWechatMenuDto;
import co.yixiang.modules.wechat.service.dto.YxWechatMenuQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.WechatMenuMapper;
import co.yixiang.modules.mp.service.mapper.WechatMenuMapper;
import co.yixiang.modules.mp.domain.YxWechatMenu;
import co.yixiang.modules.mp.service.YxWechatMenuService;
import co.yixiang.modules.mp.service.dto.YxWechatMenuDto;
import co.yixiang.modules.mp.service.dto.YxWechatMenuQueryCriteria;
import co.yixiang.utils.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;

12
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatReplyServiceImpl.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatReplyServiceImpl.java
View File

@ -3,17 +3,17 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.impl;
package co.yixiang.modules.mp.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.exception.EntityExistException;
import co.yixiang.modules.wechat.domain.YxWechatReply;
import co.yixiang.modules.wechat.service.YxWechatReplyService;
import co.yixiang.modules.wechat.service.dto.YxWechatReplyDto;
import co.yixiang.modules.wechat.service.dto.YxWechatReplyQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.WechatReplyMapper;
import co.yixiang.modules.mp.service.mapper.WechatReplyMapper;
import co.yixiang.modules.mp.domain.YxWechatReply;
import co.yixiang.modules.mp.service.YxWechatReplyService;
import co.yixiang.modules.mp.service.dto.YxWechatReplyDto;
import co.yixiang.modules.mp.service.dto.YxWechatReplyQueryCriteria;
import co.yixiang.utils.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;

12
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatTemplateServiceImpl.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatTemplateServiceImpl.java
View File

@ -3,16 +3,16 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.impl;
package co.yixiang.modules.mp.service.impl;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.wechat.service.YxWechatTemplateService;
import co.yixiang.modules.wechat.service.dto.YxWechatTemplateDto;
import co.yixiang.modules.wechat.service.dto.YxWechatTemplateQueryCriteria;
import co.yixiang.modules.wechat.service.mapper.WechatTemplateMapper;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
import co.yixiang.modules.mp.service.YxWechatTemplateService;
import co.yixiang.modules.mp.service.dto.YxWechatTemplateQueryCriteria;
import co.yixiang.modules.mp.service.dto.YxWechatTemplateDto;
import co.yixiang.modules.mp.service.mapper.WechatTemplateMapper;
import co.yixiang.utils.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/ArticleMapper.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/mapper/ArticleMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.mapper;
package co.yixiang.modules.mp.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.modules.wechat.domain.YxArticle;
import co.yixiang.modules.mp.domain.YxArticle;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/WechatMenuMapper.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/mapper/WechatMenuMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.mapper;
package co.yixiang.modules.mp.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.modules.wechat.domain.YxWechatMenu;
import co.yixiang.modules.mp.domain.YxWechatMenu;
import org.springframework.stereotype.Repository;
/**

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/WechatReplyMapper.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/mapper/WechatReplyMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.mapper;
package co.yixiang.modules.mp.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.modules.wechat.domain.YxWechatReply;
import co.yixiang.modules.mp.domain.YxWechatReply;
import org.springframework.stereotype.Repository;
/**

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/WechatTemplateMapper.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/mapper/WechatTemplateMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.modules.wechat.service.mapper;
package co.yixiang.modules.mp.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.modules.wechat.domain.YxWechatTemplate;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
import org.springframework.stereotype.Repository;
/**

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveGoodsMapper.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/mapper/YxWechatLiveGoodsMapper.java
View File

@ -6,10 +6,10 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.mapper;
package co.yixiang.modules.mp.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.modules.wechat.domain.YxWechatLiveGoods;
import co.yixiang.modules.mp.domain.YxWechatLiveGoods;
import org.springframework.stereotype.Repository;
/**

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/service/mapper/YxWechatLiveMapper.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/service/mapper/YxWechatLiveMapper.java
View File

@ -6,10 +6,10 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.service.mapper;
package co.yixiang.modules.mp.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.modules.mp.domain.YxWechatLive;
import org.springframework.stereotype.Repository;
/**

2
yshop-weixin/src/main/java/co/yixiang/mp/utils/JsonUtils.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/utils/JsonUtils.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.utils;
package co.yixiang.modules.mp.utils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

2
yshop-weixin/src/main/java/co/yixiang/mp/utils/URLUtils.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/utils/URLUtils.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.mp.utils;
package co.yixiang.modules.mp.utils;
import java.util.HashMap;
import java.util.Map;

2
yshop-weixin/src/main/java/co/yixiang/mp/utils/YshopUtils.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/utils/YshopUtils.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.mp.utils;
package co.yixiang.modules.mp.utils;
import co.yixiang.modules.user.service.dto.WechatUserDto;

4
yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/WechatLiveVo.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/vo/WechatLiveVo.java
View File

@ -1,6 +1,6 @@
package co.yixiang.modules.wechat.vo;
package co.yixiang.modules.mp.vo;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.mp.service.dto.YxWechatLiveDto;
import lombok.Data;
import java.util.List;

2
yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/YxArticleQueryVo.java → yshop-weixin/src/main/java/co/yixiang/modules/mp/vo/YxArticleQueryVo.java
View File

@ -1,4 +1,4 @@
package co.yixiang.modules.wechat.vo;
package co.yixiang.modules.mp.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;