diff --git a/zsw-bxg/pom.xml b/zsw-bxg/pom.xml
index f7930a76..b1b98840 100644
--- a/zsw-bxg/pom.xml
+++ b/zsw-bxg/pom.xml
@@ -169,6 +169,11 @@
httpclient
4.5.12
+
+ org.jsoup
+ jsoup
+ 1.14.2
+
diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java
index f30e19ea..0a88129e 100644
--- a/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java
+++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java
@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -57,7 +58,7 @@ public class CouponController {
private final YxStoreCouponUserService storeCouponUserService;
/**
- * 可领取优惠券列表
+ * 领券中心优惠券列表
*/
@AuthCheck
@GetMapping("/coupons")
@@ -67,7 +68,7 @@ public class CouponController {
@ApiImplicitParam(name = "productId", value = "产品ID", paramType = "query", dataType = "int",dataTypeClass = Integer.class),
@ApiImplicitParam(name = "type", value = "优惠券类型 0通用券 1商品券 2内部券", paramType = "query", dataType = "int",dataTypeClass = Integer.class)
})
- @ApiOperation(value = "可领取优惠券列表",notes = "可领取优惠券列表")
+ @ApiOperation(value = "领券中心优惠券列表",notes = "领券中心优惠券列表")
public ApiResult> getList(@RequestParam(value = "page",defaultValue = "1") int page,
@RequestParam(value = "limit",defaultValue = "10") int limit,
@RequestParam(value = "productId",required = false) Long productId,
@@ -76,6 +77,9 @@ public class CouponController {
return ApiResult.ok(couponIssueService.getCouponList(page, limit,uid,productId,type));
}
+
+
+
/**
* 领取优惠券
*/
@@ -107,6 +111,53 @@ public class CouponController {
return ApiResult.ok(list);
}
+
+ /**
+ * 用户已失效优惠券
+ */
+ @AppLog(value = "查看用户已失效优惠券", type = 1)
+ @AuthCheck
+ @GetMapping("/coupons/userFailure/{type}")
+ @ApiOperation(value = "用户已失效优惠券",notes = "用户已失效优惠券")
+ public ApiResult> getUserFailureList(){
+ Long uid = LocalUser.getUser().getUid();
+ List list = storeCouponUserService.getUserCoupon(uid);
+ List list1 = new ArrayList<>();
+ for (YxStoreCouponUserQueryVo couponUser : list) {
+ if (couponUser.getIsFail() == 1){//已失效
+ list1.add(couponUser);
+ }
+ }
+ return ApiResult.ok(list1);
+ }
+
+ /**
+ * 用户可领取优惠券列表
+ */
+ @AuthCheck
+ @GetMapping("/coupons/canReceive")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "页码,默认为1", paramType = "query", dataType = "int",dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "limit", value = "页大小,默认为10", paramType = "query", dataType = "int",dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "productId", value = "产品ID", paramType = "query", dataType = "int",dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "type", value = "优惠券类型 0通用券 1商品券 2内部券", paramType = "query", dataType = "int",dataTypeClass = Integer.class)
+ })
+ @ApiOperation(value = "用户可领取优惠券列表",notes = "用户可领取优惠券列表")
+ public ApiResult> canReceive(@RequestParam(value = "page",defaultValue = "1") int page,
+ @RequestParam(value = "limit",defaultValue = "10") int limit,
+ @RequestParam(value = "productId",required = false) Long productId,
+ @RequestParam(value = "type",required = false) Integer type){
+ Long uid = LocalUser.getUser().getUid();
+ List list=couponIssueService.getCouponList(page, limit,uid,productId,type);
+ List list1 = new ArrayList<>();
+ for (YxStoreCouponIssueQueryVo couponIssue : list) {
+ if(!couponIssue.getIsUse()){
+ list1.add(couponIssue);
+ }
+ }
+ return ApiResult.ok(list1);
+ }
+
/**
* 用户已领取优惠券pc
*/
diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUploadController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUploadController.java
new file mode 100644
index 00000000..901d140c
--- /dev/null
+++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUploadController.java
@@ -0,0 +1,45 @@
+package co.yixiang.app.modules.user.rest;
+
+import cn.iocoder.yudao.framework.common.pojo.ApiResult;
+import co.yixiang.modules.shop.service.YxSystemConfigService;
+import co.yixiang.tools.domain.QiniuContent;
+import co.yixiang.tools.service.QiNiuService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequestMapping("/api/upload")
+public class AppUploadController {
+
+ @Autowired
+ private YxSystemConfigService systemConfigService;
+
+ @Autowired
+ private QiNiuService qiNiuService;
+
+ @ApiOperation("上传文件")
+ @PostMapping
+ public ApiResult create(@RequestParam(defaultValue = "") String name,
+ @RequestParam(defaultValue = "") String type,
+ @RequestParam("file") MultipartFile[] files) {
+
+ StringBuilder url = new StringBuilder();
+ for (MultipartFile file : files) {
+ QiniuContent qiniuContent = qiNiuService.upload(file, qiNiuService.find());
+ if ("".equals(url.toString())) {
+ url = url.append(qiniuContent.getUrl());
+ System.out.println("".equals(url.toString()));
+ }else{
+ url = url.append(",").append(qiniuContent.getUrl());
+ }
+ }
+
+ return ApiResult.ok(url);
+ }
+
+}
diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java
index 271efb28..c9062bee 100644
--- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java
+++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java
@@ -184,7 +184,9 @@ public class LetterAppUserController {
@RequestParam(value = "limit",defaultValue = "10") int limit,
@RequestParam(value = "type") String type){
Long uid = LocalUser.getUser().getUid();
- return ApiResult.ok(evaluationRelationService.userCollectEvaluation(page,limit,uid,type));
+ List list=evaluationRelationService.userCollectEvaluation(page,limit,uid,type);
+// return ApiResult.ok(evaluationRelationService.userCollectEvaluation(page,limit,uid,type));
+ return ApiResult.ok(list);
}
/**
* 用户资金统计
diff --git a/zsw-bxg/src/main/java/co/yixiang/constant/SystemConfigConstants.java b/zsw-bxg/src/main/java/co/yixiang/constant/SystemConfigConstants.java
index 1c79ed90..ee7b34f1 100644
--- a/zsw-bxg/src/main/java/co/yixiang/constant/SystemConfigConstants.java
+++ b/zsw-bxg/src/main/java/co/yixiang/constant/SystemConfigConstants.java
@@ -1,7 +1,11 @@
package co.yixiang.constant;
public class SystemConfigConstants {
+ //机器人链接地址
public final static String ROBOT_URL="robotUrl";
+ //机器人消息跳转网址
+ public final static String CARD_ACTION_URL="cardActionUrl";
+
//地址配置
public final static String API="api";
public final static String API_URL="api_url";
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java
index 5c925f04..cf054caa 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java
@@ -72,14 +72,14 @@ public class YxStoreCoupon extends BaseDomain {
// @ApiModelProperty(value = "优惠券有效期限（单位：天;几号到几号）")
// private Object useTime;
- /** 优惠券开始使用期限（单位：天） */
+ /** 优惠券开始使用时间 */
@NotNull(message = "请输入开始期限")
- @ApiModelProperty(value = "优惠券使用期限（单位：天）")
+ @ApiModelProperty(value = "优惠券开始使用时间")
private String useStartTime;
- /** 优惠券结束使用期限（单位：天） */
+ /** 优惠券结束使用时间 */
@NotNull(message = "请输入有效结束期限")
- @ApiModelProperty(value = "优惠券失效期限（单位：天）")
+ @ApiModelProperty(value = "优惠券结束使用时间")
private String useEndTime;
/** 排序 */
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java
index 804e5577..f5e97e2c 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java
@@ -63,10 +63,13 @@ public class YxStoreCouponUser extends BaseDomain {
private BigDecimal useMinPrice;
- /** 优惠券结束时间 */
- @ApiModelProperty(value = "优惠券结束时间")
- private Date endTime;
+ /** 优惠券有效期结束时间 */
+ @ApiModelProperty(value = "优惠券有效期结束时间")
+ private Date useEndTime;
+ /** 优惠券有效期开始时间 */
+ @ApiModelProperty(value = "优惠券有效期开始时间")
+ private Date useStartTime;
// /** 使用时间 */
// @ApiModelProperty(value = "使用时间")
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
index 007f6165..a7421ea2 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
@@ -194,7 +194,7 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl nowTime || couponUser.getEndTime().getTime() < nowTime){
+ }else if(couponUser.getCreateTime().getTime() > nowTime || couponUser.getUseEndTime().getTime() < nowTime){
queryVo.set_type(CouponEnum.USE_0.getValue());
queryVo.set_msg("已过期");
}else{
@@ -222,16 +222,15 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl wrapper= new LambdaQueryWrapper<>();
- wrapper.lt(YxStoreCouponUser::getEndTime,nowTime)
+ wrapper.lt(YxStoreCouponUser::getUseEndTime,nowTime)
.eq(YxStoreCouponUser::getStatus,CouponEnum.STATUS_0.getValue());
YxStoreCouponUser couponUser = new YxStoreCouponUser();
couponUser.setStatus(CouponEnum.STATUS_2.getValue());
@@ -344,7 +343,7 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl nowTime || couponUser.getEndTime().getTime() < nowTime){
+ }else if(couponUser.getCreateTime().getTime() > nowTime || couponUser.getUseEndTime().getTime() < nowTime){
queryVo.set_type(CouponEnum.USE_0.getValue());
queryVo.set_msg("已过期");
}else{
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java
index 366bf8f3..258d6bb5 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java
@@ -44,12 +44,20 @@ public class YxStoreCouponUserQueryVo implements Serializable {
@ApiModelProperty(value = "优惠券创建时间")
private Date createTime;
- @ApiModelProperty(value = "优惠券结束时间")
+ @ApiModelProperty(value = "优惠券有效期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
- private Date endTime;
+ private Date useStartTime;
- @ApiModelProperty(value = "使用时间")
- private Date useTime;
+// @ApiModelProperty(value = "优惠券结束时间")
+// @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+// private Date endTime;
+
+ @ApiModelProperty(value = "优惠券有效期结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+ private Date useEndTime;
+
+// @ApiModelProperty(value = "使用时间")
+// private Date useTime;
@ApiModelProperty(value = "获取方式")
private String type;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java
index bf6946fc..275d93cf 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java
@@ -55,8 +55,8 @@ import java.util.*;
* @date 2022-10-21
*/
@Service
-//@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxEvaluationServiceImpl extends BaseServiceImpl implements YxEvaluationService {
@Autowired
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/mapper/YxEvaluationRelationMapper.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/mapper/YxEvaluationRelationMapper.java
index cd223ddf..1a29ae2a 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/mapper/YxEvaluationRelationMapper.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/mapper/YxEvaluationRelationMapper.java
@@ -23,7 +23,8 @@ import java.util.List;
public interface YxEvaluationRelationMapper extends CoreMapper {
- @Select("select B.id,B.home_image as homeImage" +
+ @Select("select B.id evaluation_id,B.home_image as homeImage,A.id id," +
+ "B.is_show as isShow"+
" from yx_store_evaluation_relation A left join yx_evaluation B " +
"on A.evaluation_id = B.id where A.uid=#{uid} and A.is_del = 0 and B.is_del = 0 order by A.create_time desc")
List selectRelationList(Page page, @Param("uid") Long uid);
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/vo/YxStoreEvaluationRelationQueryVo.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/vo/YxStoreEvaluationRelationQueryVo.java
index 2b06a8b0..cff9da49 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/vo/YxStoreEvaluationRelationQueryVo.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/vo/YxStoreEvaluationRelationQueryVo.java
@@ -1,9 +1,12 @@
package co.yixiang.modules.evaluation.vo;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.util.Date;
-
+@Data
+@ApiModel(value = "YxStoreEvaluationRelationQueryVo对象", description = "评测收藏表查询参数")
public class YxStoreEvaluationRelationQueryVo {
private static final long serialVersionUID = 1L;
@@ -13,8 +16,8 @@ public class YxStoreEvaluationRelationQueryVo {
@ApiModelProperty(value = "用户ID")
private Long uid;
- @ApiModelProperty(value = "商品ID")
- private Long productId;
+ @ApiModelProperty(value = "评测ID")
+ private Long evaluationId;
@ApiModelProperty(value = "类型(收藏(collect")
private String type;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/CardAction.java b/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/CardAction.java
index 17d1e3a1..f037b025 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/CardAction.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/CardAction.java
@@ -2,11 +2,23 @@ package co.yixiang.modules.inform.domin;
import lombok.Data;
+
+/****整体卡片的点击跳转事件，text_notice模版卡片中该字段为必填项
+ * 卡片跳转类型，1 代表跳转url，2 代表打开小程序。text_notice模版卡片中该字段取值范围为[1,2]
+ */
@Data
public class CardAction {
+
+ /**代表跳转url，2 代表打开小程序*/
private Integer type;
+
+ /**跳转事件的url，card_action.type是1时必填*/
private String url;
+
+ /**跳转事件的小程序的appid，card_action.type是2时必填*/
private String appid;
+
+ /**跳转事件的小程序的pagepath，card_action.type是2时选填*/
private String pagepath;
}
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/Jump.java b/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/Jump.java
index 38b58856..98c658e0 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/Jump.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/Jump.java
@@ -16,10 +16,16 @@ import lombok.Data;
}*/
@Data
public class Jump {
+ /***，0或不填代表不是链接，1 代表跳转url，2 代表跳转小程序
+ */
private Integer type;
+
private String appid;
+
private String url;
+
private String title;
+
private String pagepath;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/TemplateCard.java b/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/TemplateCard.java
index 67d39112..7c96f218 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/TemplateCard.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/inform/domin/TemplateCard.java
@@ -9,8 +9,6 @@ import java.util.ArrayList;
@Service
public class TemplateCard {
-// /**消息类型*/
-// private String msgtype ;
/** 模板卡片的模板类型*/
private String card_type;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/inform/service/impl/SendMsgServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/inform/service/impl/SendMsgServiceImpl.java
index 89214def..8d8697d8 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/inform/service/impl/SendMsgServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/inform/service/impl/SendMsgServiceImpl.java
@@ -18,14 +18,18 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.jsoup.nodes.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
@Service
public class SendMsgServiceImpl implements SendMsgService {
@@ -75,27 +79,41 @@ public class SendMsgServiceImpl implements SendMsgService {
public TemplateCard creatTemplatecard(long orderId,int type){
YxStoreOrderDto yxStoreOrderDto=yxStoreOrderService.getOrderDetailByOrderId(orderId);
String mainTitle;
+ ArrayList arrayList=new ArrayList<>();
+ arrayList.add(new HorizontalContent().setKeyname("会员名称").setValue(yxStoreOrderDto.getRealName()));
+ arrayList.add(new HorizontalContent().setKeyname("会员手机号").setValue(yxStoreOrderDto.getUserPhone()));
if (type==0){//支付时候
mainTitle="有新的在线订单来啦";
+ arrayList.add(new HorizontalContent().setKeyname("下单地址").setValue(yxStoreOrderDto.getUserAddress()));
+ arrayList.add(new HorizontalContent().setKeyname("下单时间").setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(yxStoreOrderDto.getCreateTime())));
}else {
mainTitle="有新的退款申请";
+ //获取Document模型
+ Document docDesc = Jsoup.parse(yxStoreOrderDto.getStatusName());
+ //获取span节点
+ ArrayList list=docDesc.getElementsByTag("span");
+ //获取文本内容，并且截取只需要标题后面的
+ arrayList.add(new HorizontalContent().setKeyname("退款原因").setValue(list.get(0).text().substring(5)));
+ arrayList.add(new HorizontalContent().setKeyname("备注说明").setValue(list.get(1).text().substring(5).length()==0?list.get(1).text().substring(5):"本次退款无备注"));
+ arrayList.add(new HorizontalContent().setKeyname("申请时间").setValue(list.get(2).text().substring(5)));
}
+ templateCard.setHorizontal_content_list(arrayList);
templateCard.setCard_type("text_notice");
templateCard.setSource(new Souce().setDesc("眼界甄选").setIcon_url("https://wework.qpic.cn/wwpic/252813_jOfDHtcISzuodLa_1629280209/0").setDesc_color(0));
templateCard.setMain_title(new MainTitle().setTitle(mainTitle).setDesc("订单号："+orderId));
templateCard.setEmphasis_content(new EmphasisContent().setTitle(yxStoreOrderDto.getPayPrice().toString()).setDesc("订单总金额"));
// templateCard.setQuote_area(new QuoteArea().setType(0).setUrl("").setAppid("APPID").setTitle("订单详情").setQuote_text("眼镜*1 0.01"));
templateCard.setSub_title_text("订单类型："+yxStoreOrderDto.getPinkName());//订单类型
- ArrayList arrayList=new ArrayList<>();
- arrayList.add(new HorizontalContent().setKeyname("下单地址").setValue(yxStoreOrderDto.getUserAddress()));
- arrayList.add(new HorizontalContent().setKeyname("下单时间").setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(yxStoreOrderDto.getCreateTime())));
- arrayList.add(new HorizontalContent().setKeyname("会员名称").setValue(yxStoreOrderDto.getRealName()));
- arrayList.add(new HorizontalContent().setKeyname("会员手机号").setValue(yxStoreOrderDto.getUserPhone()));
- templateCard.setHorizontal_content_list(arrayList);
ArrayList arrayList1=new ArrayList<>();
- arrayList1.add(new Jump().setType(1).setUrl("https://work.weixin.qq.com/?from=openApi").setTitle("前去处理订单"));
+ //机器人消息跳转地址
+ String cardActionUrl = systemConfigService.getData(SystemConfigConstants.CARD_ACTION_URL);
+ if(StrUtil.isBlank(cardActionUrl)){
+// throw new YshopException("未配置企业微信群机器人跳转地址");
+ cardActionUrl="未配置跳转网址";
+ }
+ arrayList1.add(new Jump().setType(1).setUrl(cardActionUrl).setTitle("前去处理订单"));
templateCard.setJump_list(arrayList1);
- templateCard.setCard_action(new CardAction().setType(1).setUrl("https://work.weixin.qq.com/?from=openApi"));
+ templateCard.setCard_action(new CardAction().setType(1).setUrl(cardActionUrl));
return templateCard;
}
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java
index 1bd1cf00..1a693d7b 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java
@@ -133,6 +133,11 @@ public class YxStoreOrder extends BaseDomain {
/** 退款时间 */
private Date refundReasonTime;
+ /** 退款联系人 */
+ private String refundName;
+
+ /** 退款联系电话 */
+ private String refundPhone;
/** 前台退款原因 */
private String refundReasonWap;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
index 90dfb439..6056471b 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
@@ -112,6 +112,12 @@ public class YxStoreOrderDto implements Serializable {
// 退款用户说明
private String refundReasonWapExplain;
+ /** 退款联系人 */
+ private String refundName;
+
+ /** 退款联系电话 */
+ private String refundPhone;
+
// 退款时间
private Date refundReasonTime;
diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index e471b13e..89ae38fb 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -75,6 +75,7 @@ import co.yixiang.modules.user.service.YxUserBillService;
import co.yixiang.modules.user.service.YxUserLevelService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.dto.YxUserDto;
+import co.yixiang.modules.user.service.mapper.BxgUserMapper;
import co.yixiang.modules.user.vo.YxUserQueryVo;
import co.yixiang.tools.domain.AlipayConfig;
import co.yixiang.tools.domain.vo.TradeVo;
@@ -122,6 +123,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl