Skip to content

H
haoban-manage3.0
Commit 0c001ca7 by 徐高华
Options

Merge branch 'feature/订单中台' into 'master' 

Feature/订单中台

See merge request !1090
parents 6ca3def8 792b8f12
Showing with 4237 additions and 79 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/qdto/NoticeMessageQDTO.java
...@@ -17,6 +17,16 @@ public class NoticeMessageQDTO implements Serializable { ...@@ -17,6 +17,16 @@ public class NoticeMessageQDTO implements Serializable {
private int messageType; private int messageType;
private String templateCode; private String templateCode;
private Map<String, String> contentMap; private Map<String, String> contentMap;
// 是否校验gic企业
private boolean checkFlag =false ;
public boolean isCheckFlag() {
return checkFlag;
}
public void setCheckFlag(boolean checkFlag) {
this.checkFlag = checkFlag;
}
public NoticeMessageQDTO() { public NoticeMessageQDTO() {
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageCategoryTypeEnum.java
...@@ -10,6 +10,8 @@ public enum NoticeMessageCategoryTypeEnum { ...@@ -10,6 +10,8 @@ public enum NoticeMessageCategoryTypeEnum {
CUSTOMER(0, "客户相关"), CUSTOMER(0, "客户相关"),
TASK(1, "任务相关"), TASK(1, "任务相关"),
ACTIVITY(2, "活动相关"), ACTIVITY(2, "活动相关"),
ORDER(4, "订单相关"),
REFUND(5, "售后相关"),
OTHER(3, "其它"),; OTHER(3, "其它"),;
private int type; private int type;
private String name; private String name;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java
...@@ -57,6 +57,15 @@ public enum NoticeMessageTypeEnum { ...@@ -57,6 +57,15 @@ public enum NoticeMessageTypeEnum {
CUSTOMER_GET_COUPON(4004, "客户领券通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_get_coupon", "/pages/route/index?pageType=", "hbapp_customer_detail"), CUSTOMER_GET_COUPON(4004, "客户领券通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_get_coupon", "/pages/route/index?pageType=", "hbapp_customer_detail"),
CUSTOMER_APPLY_ORDER_REFUND(4005, "客户申请退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_apply_order_refund", "/pages/route/index?pageType=", "hbapp_customer_order_detail"), CUSTOMER_APPLY_ORDER_REFUND(4005, "客户申请退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_apply_order_refund", "/pages/route/index?pageType=", "hbapp_customer_order_detail"),
CUSTOMER_SUCCESS_ORDER_REFUND(4006, "客户成功退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_success_order_refund", "/pages/route/index?pageType=", "hbapp_user_bill_detail"), CUSTOMER_SUCCESS_ORDER_REFUND(4006, "客户成功退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_success_order_refund", "/pages/route/index?pageType=", "hbapp_user_bill_detail"),
// 订单- 待发货订单提醒
ORDER_TAKE(5000, "待自提订单提醒", NoticeMessageCategoryTypeEnum.ORDER.getType(), "order_take", "/pages/route/index?pageType=", "hbapp_order_verfication"),
ORDER_PAY(5001, "待发货订单提醒", NoticeMessageCategoryTypeEnum.ORDER.getType(), "order_pay", "/pages/route/index?pageType=", "hbapp_order_center"),
REFUND_AUDIT(5010, "售后待审核提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_audit", "/pages/route/index?pageType=", "hbapp_order_center"),
REFUND_MEMBER_CANCEL(5011, "买家取消售后提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_member_cancel", "/pages/route/index?pageType=", "hbapp_order_center"),
REFUND_DELIVER(5013, "买家寄出退换货提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_deliver", "/pages/route/index?pageType=", "hbapp_order_center"),
; ;
/** /**
* 消息类型 * 消息类型
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java
...@@ -17,5 +17,7 @@ public interface HaobanCommonMQApiService { ...@@ -17,5 +17,7 @@ public interface HaobanCommonMQApiService {
public void putCommonDelayMessage(CommonMQDTO dto , int delay); public void putCommonDelayMessage(CommonMQDTO dto , int delay);
public void commonHandler(String message); public void commonHandler(String message);
public void welcomeMQ(String params) ;
} }
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java
package com.gic.haoban.manage.api.service; package com.gic.haoban.manage.api.service;
import java.util.List;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.QywxCallBackDTO; import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
/** /**
* Created by tgs on 2020/2/20. * Created by tgs on 2020/2/20.
...@@ -24,40 +27,6 @@ public interface MessageApiService { ...@@ -24,40 +27,6 @@ public interface MessageApiService {
void dealWxMessage(String param); void dealWxMessage(String param);
/** /**
* 发送消费消息
*
* @param clerkId
* @param memberId
* @param memberName
* @param arrivalTime
* @param storeId
* @return
*/
Boolean sendFaceMessage(String clerkId, String memberId, String memberName, String arrivalTime, String storeId);
/**
* 发送完善标签信息
*
* @param clerkId
* @param clerkId
* @param memberName
* @param customerTime
* @param orderId
* @param storeId
*/
Boolean sendPerfectRemarkMessage(String clerkId, String memberId, String memberName, String customerTime, String orderId, String storeId);
/**
* 通用发送企业微信消息
*
* @param param 参数
* @author xuwenqian
* @date 2021-07-16 10:09:00
*/
void sendWxMessage(String param);
/**
* 获取新的微信用户id * 获取新的微信用户id
* *
* @param wxEnterpriseId 微信企业id * @param wxEnterpriseId 微信企业id
...@@ -67,7 +36,7 @@ public interface MessageApiService { ...@@ -67,7 +36,7 @@ public interface MessageApiService {
* @date 2022-03-10 13:48:10 * @date 2022-03-10 13:48:10
*/ */
String getNewWxUserIdByStaffId(String wxEnterpriseId, String staffId); String getNewWxUserIdByStaffId(String wxEnterpriseId, String staffId);
/** /**
* *
* @Title: sendPreMessage * @Title: sendPreMessage
...@@ -79,6 +48,18 @@ public interface MessageApiService { ...@@ -79,6 +48,18 @@ public interface MessageApiService {
* @return * @return
* @throws * @throws
*/ */
ServiceResponse<Void> sendPreMessage(String enterpriseId ,String storeId , String message) ; ServiceResponse<Void> sendPreMessage(String enterpriseId, String storeId, String message);
/**
*
* @Title: sendOrderMessage
* @Description: 订单发送好办通知
* @param relationId 关联ID
* @param valueList 有变量的情况按顺序传参
* @return clerkId 归属导购 refundStoreId 退款收货门店
* @throws
*/
ServiceResponse<Void> sendOrderMessage(String enterpriseId, NoticeMessageTypeEnum noticeType, String relationId,
String refundStoreId , String clerkId, String memberId, List<String> valueList);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WelcomeSendService.java 0 → 100644
package com.gic.haoban.manage.service.service;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
public interface WelcomeSendService {
/**
* @Description: 发送欢迎语
*/
public void sendWelcome(String params);
/**
* @Title: sendWelcome
* @Description: 发送欢迎语
* @throws
*/
public void sendWelcome(String corpid, String externalUserId, String welcomeCode, String wxUserId, String state);
public String getHmClerk(HmQrcodeDTO hmDTO, String wxEnterpriseId, String staffId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java
...@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.service.impl; ...@@ -3,7 +3,6 @@ package com.gic.haoban.manage.service.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.UniqueIdUtils; import com.gic.commons.util.UniqueIdUtils;
import com.gic.enterprise.api.service.LinkService;
import com.gic.haoban.common.utils.StringUtil; import com.gic.haoban.common.utils.StringUtil;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO; import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO; import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
...@@ -40,7 +39,6 @@ import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeSuitDepartmentBO; ...@@ -40,7 +39,6 @@ import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeSuitDepartmentBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeSuitStaffBO; import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeSuitStaffBO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO; import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import com.gic.haoban.manage.service.service.KeyDataService;
import com.gic.haoban.manage.service.service.WelcomeService; import com.gic.haoban.manage.service.service.WelcomeService;
import com.gic.haoban.manage.service.service.WelcomeSuitRangService; import com.gic.haoban.manage.service.service.WelcomeSuitRangService;
import com.gic.haoban.manage.service.service.hm.HmLinkService; import com.gic.haoban.manage.service.service.hm.HmLinkService;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/NoticeMessageServiceImpl.java
...@@ -43,9 +43,11 @@ public class NoticeMessageServiceImpl implements NoticeMessageService { ...@@ -43,9 +43,11 @@ public class NoticeMessageServiceImpl implements NoticeMessageService {
} }
@Override @Override
public Page<NoticeMessageBO> pageNoticeMessage(String enterpriseId, String storeId, String clerkId, int categoryType, BasePageInfo pageInfo) { public Page<NoticeMessageBO> pageNoticeMessage(String enterpriseId, String storeId, String clerkId,
int categoryType, BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo); PageHelper.startPage(pageInfo);
List<TabNoticeMessage> list = noticeMessageMapper.listNoticeMessage(enterpriseId, storeId, clerkId, categoryType); List<TabNoticeMessage> list = noticeMessageMapper.listNoticeMessage(enterpriseId, storeId, clerkId,
categoryType);
Page<NoticeMessageBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, NoticeMessageBO.class); Page<NoticeMessageBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, NoticeMessageBO.class);
return retPage; return retPage;
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanCommonMQApiServiceImpl.java
...@@ -14,6 +14,7 @@ import com.gic.commons.util.GICMQClientUtil; ...@@ -14,6 +14,7 @@ import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.manage.api.dto.CommonMQDTO; import com.gic.haoban.manage.api.dto.CommonMQDTO;
import com.gic.haoban.manage.api.service.HaobanCommonMQApiService; import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService; import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
import com.gic.haoban.manage.service.service.WelcomeSendService;
import com.gic.mq.sdk.GicMQClient; import com.gic.mq.sdk.GicMQClient;
import com.gic.quartz.api.dto.QuartzTaskDTO; import com.gic.quartz.api.dto.QuartzTaskDTO;
import com.gic.quartz.api.service.QuartzService; import com.gic.quartz.api.service.QuartzService;
...@@ -24,16 +25,18 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService { ...@@ -24,16 +25,18 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
private final Logger log = LogManager.getLogger(HaobanCommonMQApiService.class); private final Logger log = LogManager.getLogger(HaobanCommonMQApiService.class);
private static GicMQClient mqClient = GICMQClientUtil.getClientInstance(); private static GicMQClient mqClient = GICMQClientUtil.getClientInstance();
@Autowired
private QuartzService quartzService;
@Autowired @Autowired
private QuartzService quartzService ; private StaffDepartmentRelatedService staffDepartmentRelatedService;
@Autowired @Autowired
private StaffDepartmentRelatedService staffDepartmentRelatedService ; private WelcomeSendService welcomeSendService;
@Override @Override
public void putCommonMessage(CommonMQDTO dto) { public void putCommonMessage(CommonMQDTO dto) {
String message = JSONObject.toJSONString(dto); String message = JSONObject.toJSONString(dto);
log.info("加入好办通用队列params={}",message); log.info("加入好办通用队列params={}", message);
try { try {
mqClient.sendCommonMessage("haobanCommonRouter", message, mqClient.sendCommonMessage("haobanCommonRouter", message,
"com.gic.haoban.manage.api.service.HaobanCommonMQApiService", "commonHandler"); "com.gic.haoban.manage.api.service.HaobanCommonMQApiService", "commonHandler");
...@@ -42,11 +45,11 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService { ...@@ -42,11 +45,11 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
e.printStackTrace(); e.printStackTrace();
} }
} }
@Override @Override
public void putCommonDelayMessage(CommonMQDTO dto , int delay) { public void putCommonDelayMessage(CommonMQDTO dto, int delay) {
String message = JSONObject.toJSONString(dto); String message = JSONObject.toJSONString(dto);
log.info("加入好办延时通用队列params={}",message); log.info("加入好办延时通用队列params={}", message);
try { try {
mqClient.sendMessage("haobanDelayMQ", message, delay); mqClient.sendMessage("haobanDelayMQ", message, delay);
} catch (Exception e) { } catch (Exception e) {
...@@ -57,30 +60,30 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService { ...@@ -57,30 +60,30 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
@Override @Override
public void commonHandler(String message) { public void commonHandler(String message) {
log.info("接收好办通用队列params={}",message); log.info("接收好办通用队列params={}", message);
CommonMQDTO dto = JSON.parseObject(message, CommonMQDTO.class); CommonMQDTO dto = JSON.parseObject(message, CommonMQDTO.class);
// 好办停用,删除定时 // 好办停用,删除定时
Map<String,String> map = (Map<String, String>) dto.getParams() ; Map<String, String> map = (Map<String, String>) dto.getParams();
switch (dto.getType()) { switch (dto.getType()) {
case 1: case 1:
String enterpriseId = map.get("enterpriseId") ; String enterpriseId = map.get("enterpriseId");
this.deleteQuartz(enterpriseId); this.deleteQuartz(enterpriseId);
break; break;
case 2: case 2:
String staffId = map.get("staffId") ; String staffId = map.get("staffId");
if(StringUtils.isNotBlank(staffId)) { if (StringUtils.isNotBlank(staffId)) {
this.staffDepartmentRelatedService.repairStaffDepart(staffId); this.staffDepartmentRelatedService.repairStaffDepart(staffId);
} }
default: default:
break; break;
} }
} }
private void deleteQuartz(String enterpriseId) { private void deleteQuartz(String enterpriseId) {
if(StringUtils.isBlank(enterpriseId)) { if (StringUtils.isBlank(enterpriseId)) {
return ; return;
} }
log.info("删除好办定时eid={}",enterpriseId); log.info("删除好办定时eid={}", enterpriseId);
// 日报 // 日报
QuartzTaskDTO task = new QuartzTaskDTO(); QuartzTaskDTO task = new QuartzTaskDTO();
task.setTaskService("com.gic.haoban.app.daily.api.service.DailyReportTaskApiService"); task.setTaskService("com.gic.haoban.app.daily.api.service.DailyReportTaskApiService");
...@@ -88,4 +91,9 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService { ...@@ -88,4 +91,9 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
task.setReferId(enterpriseId); task.setReferId(enterpriseId);
this.quartzService.delQuartzTask(task); this.quartzService.delQuartzTask(task);
} }
@Override
public void welcomeMQ(String params) {
this.welcomeSendService.sendWelcome(params);
}
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -19,7 +19,6 @@ import org.apache.logging.log4j.LogManager; ...@@ -19,7 +19,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.redisson.api.RAtomicLong; import org.redisson.api.RAtomicLong;
import org.redisson.api.RRateLimiter; import org.redisson.api.RRateLimiter;
import org.redisson.api.RSet;
import org.redisson.api.RateIntervalUnit; import org.redisson.api.RateIntervalUnit;
import org.redisson.api.RateType; import org.redisson.api.RateType;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -424,7 +423,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -424,7 +423,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if("wp59NLDQAAtTbif_SxAixUQVqMld4vug".equals(corpid)) { if("wp59NLDQAAtTbif_SxAixUQVqMld4vug".equals(corpid)) {
maxCount = 2 ; maxCount = 2 ;
} }
log.info("dealQywxExternalUserMq2={},{}",times,maxCount); log.info("dealQywxExternalUserMq2={},{},{}",wxEnterpriseId,times,maxCount);
if(times>maxCount) { if(times>maxCount) {
if(!needToMq2(wxEnterpriseId)) { if(!needToMq2(wxEnterpriseId)) {
log.info("加好友计数发送告警,id={}",wxEnterpriseId); log.info("加好友计数发送告警,id={}",wxEnterpriseId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java
...@@ -430,7 +430,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi ...@@ -430,7 +430,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
Map<String, StoreSimpleDTO> storeIdMap = storeDtos.stream().collect(Collectors.toMap(dto -> dto.getStoreId(), dto -> dto)); Map<String, StoreSimpleDTO> storeIdMap = storeDtos.stream().collect(Collectors.toMap(dto -> dto.getStoreId(), dto -> dto));
//获取所有门店分组 //获取所有门店分组
List<PowerStoreGroupDTO> storeGroupList = storeGroupService.getStoreGroupList(enterpriseId, null); List<PowerStoreGroupDTO> storeGroupList = storeGroupService.getStoreGroupList(enterpriseId, "");
Map<String, Set<String>> storeGroupChainMap = storeGroupList.stream().collect(Collectors.toMap(dto -> dto.getStoreGroupId(), Map<String, Set<String>> storeGroupChainMap = storeGroupList.stream().collect(Collectors.toMap(dto -> dto.getStoreGroupId(),
dto -> Arrays.stream(dto.getStoreGroupChain().split("_")).filter(str -> StringUtils.isNotBlank(str)).collect(Collectors.toSet()))); dto -> Arrays.stream(dto.getStoreGroupChain().split("_")).filter(str -> StringUtils.isNotBlank(str)).collect(Collectors.toSet())));
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java
...@@ -15,17 +15,21 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -15,17 +15,21 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil; import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.UniqueIdUtils; import com.gic.commons.util.UniqueIdUtils;
import com.gic.dubbo.entity.ProviderLocalTag;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.constants.Manage3Constants; import com.gic.haoban.manage.api.constants.Manage3Constants;
import com.gic.haoban.manage.api.dto.AlertMessageDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO; import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeAccountInterceptLogDTO; import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeAccountInterceptLogDTO;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDTO; import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDTO;
import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO; import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO;
import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO; import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO;
import com.gic.haoban.manage.api.enums.AlertTypeEnum;
import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService; import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
import com.gic.haoban.manage.service.config.Config; import com.gic.haoban.manage.service.config.Config;
import com.gic.haoban.manage.service.entity.TabHaobanStaff; import com.gic.haoban.manage.service.entity.TabHaobanStaff;
...@@ -227,12 +231,12 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService { ...@@ -227,12 +231,12 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
// 统计 haobanQywxFeeDetailDTO 30天内最新过期的时间和人数 // 统计 haobanQywxFeeDetailDTO 30天内最新过期的时间和人数
HaobanQywxFeeDetailDTO haobanQywxFeeDetailDTO = haobanQywxFeeAccountStaffService.feeIntercept(wxEnterpriseId); HaobanQywxFeeDetailDTO haobanQywxFeeDetailDTO = haobanQywxFeeAccountStaffService.feeIntercept(wxEnterpriseId);
// 未激活数(状态1) // 剩余可用数量(状态1)
int permissionUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId); int permissionUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId);
// 待转移数(状态4) // 待转移数(状态4)
int transferUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(4, wxEnterpriseId); int transferUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(4, wxEnterpriseId);
int totalCount = this.haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId); int totalCount = this.haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId);
if (haobanQywxFeeDetailDTO != null && permissionUserNum > 0) { if (haobanQywxFeeDetailDTO != null) {
TabHaobanQywxFee tabHaobanQywxFee = new TabHaobanQywxFee(); TabHaobanQywxFee tabHaobanQywxFee = new TabHaobanQywxFee();
tabHaobanQywxFee.setQwFeeId(UniqueIdUtils.uniqueLong()); tabHaobanQywxFee.setQwFeeId(UniqueIdUtils.uniqueLong());
tabHaobanQywxFee.setCorpName(corpName); tabHaobanQywxFee.setCorpName(corpName);
...@@ -246,15 +250,11 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService { ...@@ -246,15 +250,11 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
tabHaobanQywxFee.setInterceptFlag(0); tabHaobanQywxFee.setInterceptFlag(0);
haobanQywxFeeService.insert(tabHaobanQywxFee); haobanQywxFeeService.insert(tabHaobanQywxFee);
// 判断今天是否是本月最后一天 // 判断今天是否是本月最后一天
if (DateUtil.isSameDay(DateUtil.endOfMonth(new Date()), new Date())) { if (DateUtil.isSameDay(DateUtil.endOfMonth(new Date()), new Date()) || "ca66a01b79474c40b3e7c7f93daf1a3b".equals(wxEnterpriseId)) {
// int monthWillInterceptNum = int monthWillInterceptNum = haobanQywxFeeDetailDTO.getInterceptUserNum() ;
// haobanQywxFeeAccountStaffService.monthWillInterceptNum(wxEnterpriseId); String content = "30天将有" + monthWillInterceptNum + "个接口许可证即将过期，您总共还剩余" + permissionUserNum
// String content = "30天将有" + monthWillInterceptNum + + "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
// "个接口许可证即将过期，您总共还剩余" + permissionUserNum + messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName(), content);
// "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
// 告警
// messageAlert(wxEnterpriseId, corpName, corpid,
// AlertTypeEnum.FEE_ALARM.getName(), content);
} }
} }
...@@ -359,4 +359,25 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService { ...@@ -359,4 +359,25 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
return EntityUtil.changeEntityNew(HaobanQywxFeeDTO.class, return EntityUtil.changeEntityNew(HaobanQywxFeeDTO.class,
haobanQywxFeeService.queryByWxEnterpriseId(wxEnterpriseId)); haobanQywxFeeService.queryByWxEnterpriseId(wxEnterpriseId));
} }
private void messageAlert(String wxEnterpriseId, String corpName, String corpid, String titleSub, String content) {
ProviderLocalTag providerLocalTag = ProviderLocalTag.tag.get();
String traceId = providerLocalTag.traceId;
AlertMessageDTO messageDTO = new AlertMessageDTO();
messageDTO.setAlertTitle(titleSub);
messageDTO.setAlertType(AlertTypeEnum.FEE_ALARM.getType());
messageDTO.setWxEnterpriseId(wxEnterpriseId);
Map<String, Object> map = new HashMap<>();
map.put("企业名称", corpName);
map.put("企业id", corpid);
map.put("内容", content);
messageDTO.setContentMap(map);
messageDTO.setTraceId(traceId);
GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
try {
clientInstance.sendMessage("haobanAlertMq", JSONObject.toJSONString(messageDTO), 6 * 3600);
} catch (Exception e) {
logger.info("异常：{}", e.getMessage(), e);
}
}
} }
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanRoleMenuMapper.xml
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
</foreach> </foreach>
</insert> </insert>
<delete id="deleteByRoleId"> <delete id="deleteByRoleId">
delete from tab_haoban_role_menu where role_id = #{roleId} delete from tab_haoban_role_menu where role_id = #{roleId}
</delete> </delete>
......
haoban-manage3-service/src/test/java/DealSyncTest.java
...@@ -7,7 +7,6 @@ import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService; ...@@ -7,7 +7,6 @@ import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService; import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService; import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.service.service.StaffService; import com.gic.haoban.manage.service.service.StaffService;
import com.gic.haoban.manage.service.service.TestService;
import com.gic.wechat.api.dto.qywx.DepartmentDTO; import com.gic.wechat.api.dto.qywx.DepartmentDTO;
import com.gic.wechat.api.service.qywx.QywxDepartmentApiService; import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService; import com.gic.wechat.api.service.qywx.QywxUserApiService;
...@@ -44,9 +43,6 @@ public class DealSyncTest { ...@@ -44,9 +43,6 @@ public class DealSyncTest {
private QywxDepartmentApiService qywxDepartmentApiService; private QywxDepartmentApiService qywxDepartmentApiService;
@Autowired @Autowired
private TestService testService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService; private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired @Autowired
......
haoban-manage3-wx/pom.xml
...@@ -215,6 +215,22 @@ ...@@ -215,6 +215,22 @@
<artifactId>haoban-app-aggregation-api</artifactId> <artifactId>haoban-app-aggregation-api</artifactId>
<version>${haoban-app-aggregation-api}</version> <version>${haoban-app-aggregation-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-business-order-api</artifactId>
<version>${gic-business-order-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-store-goods-api</artifactId>
<version>${gic-store-goods-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-evaluate-manage-api</artifactId>
<version>${gic-evaluate-manage-api}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/LogisticsController.java 0 → 100644
package com.gic.haoban.manage.web.controller.order;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.business.order.dto.logistics.OrderLogisticsDTO;
import com.gic.business.order.qdto.logistics.QueryLogisticsQDTO;
import com.gic.business.order.service.logistics.LogisticsApiService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.dict.api.dto.LogisticsCompanyDTO;
import com.gic.dict.api.service.ManagerDictService;
import com.gic.haoban.manage.web.qo.order.QueryLogisticsQO;
/**
* 物流
*/
@Controller
public class LogisticsController {
@Autowired
private LogisticsApiService logisticsApiService;
@Autowired
private ManagerDictService managerDictService;
/**
* 物流公司列表
*
* @return RestResponse
*/
@ResponseBody
@RequestMapping("list-logistics")
public RestResponse<Object> listLogistics() {
List<LogisticsCompanyDTO> response = managerDictService.getLogisticsCompany();
return RestResponse.successResult(response);
}
/**
* 查询物流
*
* @param queryLogisticsQO 查询物流
* @return RestResponse
*/
@ResponseBody
@RequestMapping("get-logistics")
public RestResponse<Object> getLogistics(@RequestBody QueryLogisticsQO queryLogisticsQO) {
QueryLogisticsQDTO qdto = EntityUtil.changeEntityByJSON(QueryLogisticsQDTO.class, queryLogisticsQO);
ServiceResponse<OrderLogisticsDTO> response = logisticsApiService.queryLogistics(qdto);
if (response.isSuccess()) {
return RestResponse.successResult(response.getResult());
}
return RestResponse.failure(response.getCode(), response.getMessage());
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
...@@ -70,6 +70,11 @@ public enum HaoBanErrCode { ...@@ -70,6 +70,11 @@ public enum HaoBanErrCode {
ERR_22(22, "验证码一分钟只能请求一次"), ERR_22(22, "验证码一分钟只能请求一次"),
ERR_10008(10008,"请不要过于频繁点击"), ERR_10008(10008,"请不要过于频繁点击"),
ERR_100010(10003,"该订单已经核销"),
ERR_100013(10006,"订单不允许超期核销"),
ERR_100014(100014,"订单已被核销"),
/** /**
* 员工档案模块 * 员工档案模块
...@@ -240,6 +245,8 @@ public enum HaoBanErrCode { ...@@ -240,6 +245,8 @@ public enum HaoBanErrCode {
ERR_DEFINE(-888, "自定义错误"), ERR_DEFINE(-888, "自定义错误"),
ERR_9600(9600, "请刷新页面"),
ERR_OTHER(-999, "未知错误code"); ERR_OTHER(-999, "未知错误code");
private int code; private int code;
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/order/QueryLogisticsQO.java 0 → 100644
package com.gic.haoban.manage.web.qo.order;
import java.io.Serializable;
/**
* @description: 这里是描述文字
* @author: 巴弗
* @createDate: 2023/2/27 13:51
*/
public class QueryLogisticsQO implements Serializable {
private static final long serialVersionUID = 274417196390718102L;
/**
* 类型 0：会员下单 1：退货物流 2：换货-买家 3：换货-卖家
* @see com.gic.business.order.enums.LogisticsEnum
*/
private Integer type;
/**
* 企业ID
*/
private String enterpriseId;
/**
* 主键ID
* 会员下单传订单ID
* 换货-换货单ID
* 退货-退货单ID
*/
private String id;
/**
* 物流ID
* 根据type区分换货，退货退款和下单的物流ID
*/
private String logisticsId;
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getLogisticsId() {
return logisticsId;
}
public void setLogisticsId(String logisticsId) {
this.logisticsId = logisticsId;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/order/integral/ClerkQo.java 0 → 100644
package com.gic.haoban.manage.web.qo.order.integral;
/**
* @description:
* @author:Yaorw
* @createTime:2020/4/10 14:09
* @version:1.0
*/
public class ClerkQo {
private String haobanClerkId;
private String storeId;
private String clerkId;
private String clerkCode;
private String clerkName;
private String haobanEnterpriseId;
private String enterpriseId;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getHaobanClerkId() {
return haobanClerkId;
}
public void setHaobanClerkId(String haobanClerkId) {
this.haobanClerkId = haobanClerkId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getHaobanEnterpriseId() {
return haobanEnterpriseId;
}
public void setHaobanEnterpriseId(String haobanEnterpriseId) {
this.haobanEnterpriseId = haobanEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/EvaluateVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.util.List;
/**
* 订单评价
*/
public class EvaluateVO {
private String orderId;
/**
* 评语
*/
private String reviews;
/**
* 纬度评分
*/
private List<EvaluateScore> evaluateScoreList;
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getReviews() {
return reviews;
}
public void setReviews(String reviews) {
this.reviews = reviews;
}
public List<EvaluateScore> getEvaluateScoreList() {
return evaluateScoreList;
}
public void setEvaluateScoreList(List<EvaluateScore> evaluateScoreList) {
this.evaluateScoreList = evaluateScoreList;
}
public static class EvaluateScore{
private String name;
private Double value;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Double getValue() {
return value;
}
public void setValue(Double value) {
this.value = value;
}
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/LogisticsVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
/**
*
* @ClassName: LogisticsVO
* @Description: TODO(这里用一句话描述这个类的作用)
* @author xugh
* @date 2023年2月27日 下午3:36:38
*
*/
public class LogisticsVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = 7507847399590848004L;
private String name;
private String code;
private String image;
public String getName() {
return name;
}
public String getCode() {
return code;
}
public String getImage() {
return image;
}
public void setName(String name) {
this.name = name;
}
public void setCode(String code) {
this.code = code;
}
public void setImage(String image) {
this.image = image;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/MemberInfoVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
public class MemberInfoVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -2814959714712832104L;
private String memberId;
// 会员信息
private String memberName;
private String memberImage;
private String mainClerkId;
private String mainClerkName;
private String mainClerkCode;
private String mainStoreId;
private String mainStoreName;
private String mainStoreCode;
private String openClerkId;
private String openClerkName;
private String openClerkCode;
private String openStoreId;
private String openStoreName;
private String openStoreCode;
// 收货地址
private String addressName;
private String addressPhone;
private String addressDetail;
public String getMainClerkCode() {
return mainClerkCode;
}
public String getMainStoreCode() {
return mainStoreCode;
}
public String getOpenClerkCode() {
return openClerkCode;
}
public String getOpenStoreCode() {
return openStoreCode;
}
public void setMainClerkCode(String mainClerkCode) {
this.mainClerkCode = mainClerkCode;
}
public void setMainStoreCode(String mainStoreCode) {
this.mainStoreCode = mainStoreCode;
}
public void setOpenClerkCode(String openClerkCode) {
this.openClerkCode = openClerkCode;
}
public void setOpenStoreCode(String openStoreCode) {
this.openStoreCode = openStoreCode;
}
public String getOpenClerkId() {
return openClerkId;
}
public String getOpenClerkName() {
return openClerkName;
}
public String getOpenStoreId() {
return openStoreId;
}
public String getOpenStoreName() {
return openStoreName;
}
public void setOpenClerkId(String openClerkId) {
this.openClerkId = openClerkId;
}
public void setOpenClerkName(String openClerkName) {
this.openClerkName = openClerkName;
}
public void setOpenStoreId(String openStoreId) {
this.openStoreId = openStoreId;
}
public void setOpenStoreName(String openStoreName) {
this.openStoreName = openStoreName;
}
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public String getAddressName() {
return addressName;
}
public String getAddressPhone() {
return addressPhone;
}
public String getAddressDetail() {
return addressDetail;
}
public void setAddressName(String addressName) {
this.addressName = addressName;
}
public void setAddressPhone(String addressPhone) {
this.addressPhone = addressPhone;
}
public void setAddressDetail(String addressDetail) {
this.addressDetail = addressDetail;
}
public String getMemberName() {
return memberName;
}
public String getMemberImage() {
return memberImage;
}
public String getMainClerkId() {
return mainClerkId;
}
public String getMainClerkName() {
return mainClerkName;
}
public String getMainStoreId() {
return mainStoreId;
}
public String getMainStoreName() {
return mainStoreName;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public void setMemberImage(String memberImage) {
this.memberImage = memberImage;
}
public void setMainClerkId(String mainClerkId) {
this.mainClerkId = mainClerkId;
}
public void setMainClerkName(String mainClerkName) {
this.mainClerkName = mainClerkName;
}
public void setMainStoreId(String mainStoreId) {
this.mainStoreId = mainStoreId;
}
public void setMainStoreName(String mainStoreName) {
this.mainStoreName = mainStoreName;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderCountVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
public class OrderCountVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = 6650213319733017895L;
private int total;
private int noDeliverCount;
private int deliverCount;
public int getTotal() {
return total;
}
public int getNoDeliverCount() {
return noDeliverCount;
}
public int getDeliverCount() {
return deliverCount;
}
public void setTotal(int total) {
this.total = total;
}
public void setNoDeliverCount(int noDeliverCount) {
this.noDeliverCount = noDeliverCount;
}
public void setDeliverCount(int deliverCount) {
this.deliverCount = deliverCount;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderDetailItemVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
/**
* @description: 这里是描述文字
* @author: 巴弗
* @createDate: 2023/2/21 15:11
*/
public class OrderDetailItemVO implements Serializable {
private static final long serialVersionUID = 2204393471540203217L;
/**
* 订单项ID
*/
private String orderItemId;
/**
* 商城商品Name
*/
private String mallProName;
/**
* 商城商品零售价(sku单价)
*/
private Double mallProPrice;
/**
* 商城商品图片url
*/
private String mallProImageUrl;
/**
* 商城商品件数（或单位 贵金属-重量等）
*/
private Double mallProNumber;
/**
* 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
*/
private String mallProSkuAttr;
/**
* 商品编号
*/
private String proCode;
/**
* 是否赠品,1是0否
*/
private Integer isGift;
/**
* 实付金额
*/
private Double payAmount;
// 物流ID
private String logisticsId ;
/**
* 是否有退款 0无退款 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
*/
private Integer refundStatus;
/**
* 是否有换货 0无 1换货中 2成功 3失败
*/
private Integer exchangeStatus;
/**
* 订单项状态:0(交易关闭),2待发货,3已发货,4已确认(交易成功)'
*/
private Integer orderItemStatus;
/**0: 无售后
1：退款中
2、换货中
3、退款成功
4、换货成功 */
private int afterSalesStatus ;
public int getAfterSalesStatus() {
return afterSalesStatus;
}
public void setAfterSalesStatus(int afterSalesStatus) {
this.afterSalesStatus = afterSalesStatus;
}
public Integer getOrderItemStatus() {
return orderItemStatus;
}
public void setOrderItemStatus(Integer orderItemStatus) {
this.orderItemStatus = orderItemStatus;
}
public String getLogisticsId() {
return logisticsId;
}
public Integer getRefundStatus() {
return refundStatus;
}
public Integer getExchangeStatus() {
return exchangeStatus;
}
public void setLogisticsId(String logisticsId) {
this.logisticsId = logisticsId;
}
public void setRefundStatus(Integer refundStatus) {
this.refundStatus = refundStatus;
}
public void setExchangeStatus(Integer exchangeStatus) {
this.exchangeStatus = exchangeStatus;
}
public String getOrderItemId() {
return orderItemId;
}
public String getMallProName() {
return mallProName;
}
public Double getMallProPrice() {
return mallProPrice;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public Double getMallProNumber() {
return mallProNumber;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public String getProCode() {
return proCode;
}
public Integer getIsGift() {
return isGift;
}
public Double getPayAmount() {
return payAmount;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProPrice(Double mallProPrice) {
this.mallProPrice = mallProPrice;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProNumber(Double mallProNumber) {
this.mallProNumber = mallProNumber;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setProCode(String proCode) {
this.proCode = proCode;
}
public void setIsGift(Integer isGift) {
this.isGift = isGift;
}
public void setPayAmount(Double payAmount) {
this.payAmount = payAmount;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderDetailVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @description: 这里是描述文字
* @author: 巴弗
* @createDate: 2023/2/20 15:42
*/
public class OrderDetailVO implements Serializable {
private static final long serialVersionUID = 5215230055823016992L;
/**
* 订单ID
*/
private String orderId;
/**
* 订单编号
*/
private String orderNumber;
/**
* 下单时间
*/
private Date createTime;
// 付款时间
private Date payTime;
// 买家留言
private String buyerRemark;
/**
* 订单来源 0:会员自行购买 1导购推荐订单 （原字段为 订单类型：0:微商城 1:导购推荐订单）
*/
private Integer orderType;
/**
* 发货渠道类型((2自提 , 1快递))
*/
private Integer deliveryChannel;
/**
* 订单流程阶段 0交易关闭 1未付款（待付款、等待买家付款） 2已付款未发货（待发货、买家已付款） 3已发货未签收（待收货、已发货） 4已确认交易结束,5已发货订单项退款中,6待付款订单项退款中,7部分发货
*/
private String orderStep;
/**
* 实付金额 不含运费
*/
private Double payAmount;
/**
* 最终实际运费（可手动修改）
*/
private Double actualFreight;
/**
* 订单项列表
*/
private List<OrderDetailItemVO> orderItemList;
/**
* 客户信息
*/
private MemberInfoVO member;
/**
* 优惠折扣详情 JSON
*/
private String discountAmountInfo;
/**
* 应付金额详情 JSON
*/
private String amountPayableInfo;
// 自动收货时间
private Date autoTaskOverTime;
/**
* 收货人
*/
private String buyerName;
/**
* 收货人联系方式
*/
private String buyerPhone;
/**
* 自提门店ID
*/
private String pickUpStoreId;
/**
* 自提门店code
*/
private String pickUpStoreCode;
/**
* 自提门店名称
*/
private String pickUpStoreName;
private String pickUpCode ;
private String pickUpName ;
/**
* 自提收货地址
*/
private String addressInfo;
/**
* 自提时间
*/
private Date pickUpTime;
// 核销码
private String writeOffCode ;
// 核销导购
private String verificationClerkName ;
// 能否标识
private boolean canDeliverFlag = true ;
// 物流包裹列表
private List<String> orderLogisticsIdList ;
public List<String> getOrderLogisticsIdList() {
return orderLogisticsIdList;
}
public void setOrderLogisticsIdList(List<String> orderLogisticsIdList) {
this.orderLogisticsIdList = orderLogisticsIdList;
}
public String getPickUpCode() {
return pickUpCode;
}
public String getPickUpName() {
return pickUpName;
}
public void setPickUpCode(String pickUpCode) {
this.pickUpCode = pickUpCode;
}
public void setPickUpName(String pickUpName) {
this.pickUpName = pickUpName;
}
public String getVerificationClerkName() {
return verificationClerkName;
}
public void setVerificationClerkName(String verificationClerkName) {
this.verificationClerkName = verificationClerkName;
}
public boolean isCanDeliverFlag() {
return canDeliverFlag;
}
public void setCanDeliverFlag(boolean canDeliverFlag) {
this.canDeliverFlag = canDeliverFlag;
}
public String getWriteOffCode() {
return writeOffCode;
}
public void setWriteOffCode(String writeOffCode) {
this.writeOffCode = writeOffCode;
}
public Date getPickUpTime() {
return pickUpTime;
}
public void setPickUpTime(Date pickUpTime) {
this.pickUpTime = pickUpTime;
}
public String getBuyerName() {
return buyerName;
}
public String getBuyerPhone() {
return buyerPhone;
}
public String getPickUpStoreId() {
return pickUpStoreId;
}
public String getPickUpStoreCode() {
return pickUpStoreCode;
}
public String getPickUpStoreName() {
return pickUpStoreName;
}
public String getAddressInfo() {
return addressInfo;
}
public void setBuyerName(String buyerName) {
this.buyerName = buyerName;
}
public void setBuyerPhone(String buyerPhone) {
this.buyerPhone = buyerPhone;
}
public void setPickUpStoreId(String pickUpStoreId) {
this.pickUpStoreId = pickUpStoreId;
}
public void setPickUpStoreCode(String pickUpStoreCode) {
this.pickUpStoreCode = pickUpStoreCode;
}
public void setPickUpStoreName(String pickUpStoreName) {
this.pickUpStoreName = pickUpStoreName;
}
public void setAddressInfo(String addressInfo) {
this.addressInfo = addressInfo;
}
public Date getAutoTaskOverTime() {
return autoTaskOverTime;
}
public void setAutoTaskOverTime(Date autoTaskOverTime) {
this.autoTaskOverTime = autoTaskOverTime;
}
public Date getPayTime() {
return payTime;
}
public String getBuyerRemark() {
return buyerRemark;
}
public void setPayTime(Date payTime) {
this.payTime = payTime;
}
public void setBuyerRemark(String buyerRemark) {
this.buyerRemark = buyerRemark;
}
public MemberInfoVO getMember() {
return member;
}
public void setMember(MemberInfoVO member) {
this.member = member;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getDeliveryChannel() {
return deliveryChannel;
}
public void setDeliveryChannel(Integer deliveryChannel) {
this.deliveryChannel = deliveryChannel;
}
public String getOrderStep() {
return orderStep;
}
public void setOrderStep(String orderStep) {
this.orderStep = orderStep;
}
public Double getPayAmount() {
return payAmount;
}
public void setPayAmount(Double payAmount) {
this.payAmount = payAmount;
}
public Double getActualFreight() {
return actualFreight;
}
public void setActualFreight(Double actualFreight) {
this.actualFreight = actualFreight;
}
public List<OrderDetailItemVO> getOrderItemList() {
return orderItemList;
}
public void setOrderItemList(List<OrderDetailItemVO> orderItemList) {
this.orderItemList = orderItemList;
}
public String getDiscountAmountInfo() {
return discountAmountInfo;
}
public String getAmountPayableInfo() {
return amountPayableInfo;
}
public void setDiscountAmountInfo(String discountAmountInfo) {
this.discountAmountInfo = discountAmountInfo;
}
public void setAmountPayableInfo(String amountPayableInfo) {
this.amountPayableInfo = amountPayableInfo;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListItemVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
/**
* @description: 这里是描述文字
* @author: 巴弗
* @createDate: 2023/2/21 15:11
*/
public class OrderListItemVO implements Serializable {
private static final long serialVersionUID = 2204393471540203217L;
/**
* 订单项ID
*/
private String orderItemId;
private String mallProId ;
/**
* 商城商品Name
*/
private String mallProName;
/**
* 商城商品零售价(sku单价)
*/
private Double mallProPrice;
/**
* 商城商品图片url
*/
private String mallProImageUrl;
/**
* 商城商品件数（或单位 贵金属-重量等）
*/
private Double mallProNumber;
/**
* 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
*/
private String mallProSkuAttr;
private String mallProSkuId ;
/**
* 商品编号
*/
private String proCode;
/**
* 是否赠品,1是0否
*/
private Integer isGift;
/**
* 实付金额
*/
private Double payAmount;
// 库存
private int storeStock ;
// 物流ID
private String logisticsId ;
/**
* 是否有退款 0无退款 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
*/
private Integer refundStatus;
/**
* 是否有换货 0无 1换货中 2成功 3失败
*/
private Integer exchangeStatus;
/**
* 订单项状态:0(交易关闭),2待发货,3已发货,4已确认(交易成功)'
*/
private Integer orderItemStatus;
/**0: 无售后
1：退款中
2、换货中
3、退款成功
4、换货成功 */
private int afterSalesStatus ;
public String getMallProSkuId() {
return mallProSkuId;
}
public void setMallProSkuId(String mallProSkuId) {
this.mallProSkuId = mallProSkuId;
}
public String getMallProId() {
return mallProId;
}
public void setMallProId(String mallProId) {
this.mallProId = mallProId;
}
public int getAfterSalesStatus() {
return afterSalesStatus;
}
public void setAfterSalesStatus(int afterSalesStatus) {
this.afterSalesStatus = afterSalesStatus;
}
public Integer getOrderItemStatus() {
return orderItemStatus;
}
public void setOrderItemStatus(Integer orderItemStatus) {
this.orderItemStatus = orderItemStatus;
}
public Integer getRefundStatus() {
return refundStatus;
}
public Integer getExchangeStatus() {
return exchangeStatus;
}
public void setRefundStatus(Integer refundStatus) {
this.refundStatus = refundStatus;
}
public void setExchangeStatus(Integer exchangeStatus) {
this.exchangeStatus = exchangeStatus;
}
public String getLogisticsId() {
return logisticsId;
}
public void setLogisticsId(String logisticsId) {
this.logisticsId = logisticsId;
}
public int getStoreStock() {
return storeStock;
}
public void setStoreStock(int storeStock) {
this.storeStock = storeStock;
}
public String getOrderItemId() {
return orderItemId;
}
public String getMallProName() {
return mallProName;
}
public Double getMallProPrice() {
return mallProPrice;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public Double getMallProNumber() {
return mallProNumber;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public String getProCode() {
return proCode;
}
public Integer getIsGift() {
return isGift;
}
public Double getPayAmount() {
return payAmount;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProPrice(Double mallProPrice) {
this.mallProPrice = mallProPrice;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProNumber(Double mallProNumber) {
this.mallProNumber = mallProNumber;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setProCode(String proCode) {
this.proCode = proCode;
}
public void setIsGift(Integer isGift) {
this.isGift = isGift;
}
public void setPayAmount(Double payAmount) {
this.payAmount = payAmount;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @description: 这里是描述文字
* @author: 巴弗
* @createDate: 2023/2/20 15:42
*/
public class OrderListVO implements Serializable {
private static final long serialVersionUID = 5215230055823016992L;
/**
* 订单ID
*/
private String orderId;
/**
* 订单编号
*/
private String orderNumber;
/**
* 下单时间
*/
private Date createTime;
/**
* 订单来源 0:会员自行购买 1导购推荐订单 （原字段为 订单类型：0:微商城 1:导购推荐订单）
*/
private Integer orderType;
/**
* 会员ID
*/
private String memberId;
/**
* 会员姓名
*/
private String memberRealName;
/**
* 会员卡号
*/
private String memberCardNum;
/**
* 订单流程阶段 0交易关闭 1未付款（待付款、等待买家付款） 2已付款未发货（待发货、买家已付款） 3已发货未签收（待收货、已发货） 4已确认交易结束,5已发货订单项退款中,6待付款订单项退款中,7部分发货
*/
private String orderStep;
/**
* 实付金额 不含运费
*/
private Double payAmount;
/**
* 最终实际运费（可手动修改）
*/
private Double actualFreight;
/**
* 订单项列表
*/
private List<OrderListItemVO> orderItemList;
private String belongClerkId;
private String belongStoreId;
private String belongClerkName ;
// 自提时间
private Date pickUpTime ;
// 应付总额
private Double mallProAllPrice ;
/**
* 核销吗code
*/
private String writeOffCode;
/**
* 核销导购code
*/
private String writeOffClerkCode;
// 核销导购
private String verificationClerkName ;
/**
* 核销导购ID
*/
private String writeOffClerkId;
/**
* 评价
*/
private EvaluateVO evaluateVO;
public String getVerificationClerkName() {
return verificationClerkName;
}
public void setVerificationClerkName(String verificationClerkName) {
this.verificationClerkName = verificationClerkName;
}
public String getWriteOffClerkCode() {
return writeOffClerkCode;
}
public String getWriteOffClerkId() {
return writeOffClerkId;
}
public void setWriteOffClerkCode(String writeOffClerkCode) {
this.writeOffClerkCode = writeOffClerkCode;
}
public void setWriteOffClerkId(String writeOffClerkId) {
this.writeOffClerkId = writeOffClerkId;
}
public String getWriteOffCode() {
return writeOffCode;
}
public void setWriteOffCode(String writeOffCode) {
this.writeOffCode = writeOffCode;
}
public EvaluateVO getEvaluateVO() {
return evaluateVO;
}
public void setEvaluateVO(EvaluateVO evaluateVO) {
this.evaluateVO = evaluateVO;
}
public Double getMallProAllPrice() {
return mallProAllPrice;
}
public void setMallProAllPrice(Double mallProAllPrice) {
this.mallProAllPrice = mallProAllPrice;
}
public Date getPickUpTime() {
return pickUpTime;
}
public void setPickUpTime(Date pickUpTime) {
this.pickUpTime = pickUpTime;
}
public String getBelongClerkName() {
return belongClerkName;
}
public void setBelongClerkName(String belongClerkName) {
this.belongClerkName = belongClerkName;
}
public String getBelongClerkId() {
return belongClerkId;
}
public String getBelongStoreId() {
return belongStoreId;
}
public void setBelongClerkId(String belongClerkId) {
this.belongClerkId = belongClerkId;
}
public void setBelongStoreId(String belongStoreId) {
this.belongStoreId = belongStoreId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public String getMemberRealName() {
return memberRealName;
}
public void setMemberRealName(String memberRealName) {
this.memberRealName = memberRealName;
}
public String getMemberCardNum() {
return memberCardNum;
}
public void setMemberCardNum(String memberCardNum) {
this.memberCardNum = memberCardNum;
}
public String getOrderStep() {
return orderStep;
}
public void setOrderStep(String orderStep) {
this.orderStep = orderStep;
}
public Double getPayAmount() {
return payAmount;
}
public void setPayAmount(Double payAmount) {
this.payAmount = payAmount;
}
public Double getActualFreight() {
return actualFreight;
}
public void setActualFreight(Double actualFreight) {
this.actualFreight = actualFreight;
}
public List<OrderListItemVO> getOrderItemList() {
return orderItemList;
}
public void setOrderItemList(List<OrderListItemVO> orderItemList) {
this.orderItemList = orderItemList;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/integral/CheckVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.integral;
/**
* @description:
* @author:Yaorw
* @createTime:2020/4/13 10:26
* @version:1.0
*/
public class CheckVO {
/**
* 核销校验信息
*/
private String message;
/**
* 核销校验code
*/
private Integer code;
/**
* 核销记录id
*/
private String id;
/**
* 是否核销成功
*/
private Boolean success;
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Boolean getSuccess() {
return success;
}
public void setSuccess(Boolean success) {
this.success = success;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/integral/HxOrderCountVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.integral;
import java.io.Serializable;
public class HxOrderCountVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -4599873362174653386L;
private int integralDoneCount;
private int integralUndoneCount;
private int mallDoneCount;
private int mallUndoneCount;
private int totalDoneCount;
private int totalUndownCount;
public int getIntegralDoneCount() {
return integralDoneCount;
}
public int getIntegralUndoneCount() {
return integralUndoneCount;
}
public int getMallDoneCount() {
return mallDoneCount;
}
public int getMallUndoneCount() {
return mallUndoneCount;
}
public int getTotalDoneCount() {
return totalDoneCount;
}
public int getTotalUndownCount() {
return totalUndownCount;
}
public void setIntegralDoneCount(int integralDoneCount) {
this.integralDoneCount = integralDoneCount;
}
public void setIntegralUndoneCount(int integralUndoneCount) {
this.integralUndoneCount = integralUndoneCount;
}
public void setMallDoneCount(int mallDoneCount) {
this.mallDoneCount = mallDoneCount;
}
public void setMallUndoneCount(int mallUndoneCount) {
this.mallUndoneCount = mallUndoneCount;
}
public void setTotalDoneCount(int totalDoneCount) {
this.totalDoneCount = totalDoneCount;
}
public void setTotalUndownCount(int totalUndownCount) {
this.totalUndownCount = totalUndownCount;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/integral/ProductSku.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.integral;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* @author 蘑小菇
* @Description:
* @date 2019/6/27 14:31
*/
public class ProductSku{
@JsonIgnore
private String valueId;
private String valueName;
@JsonIgnore
private String proId;
private String proName;
public String getValueId(){
return valueId;
}
public void setValueId(String valueId){
this.valueId = valueId;
}
public String getValueName(){
return valueName;
}
public void setValueName(String valueName){
this.valueName = valueName;
}
public String getProId(){
return proId;
}
public void setProId(String proId){
this.proId = proId;
}
public String getProName(){
return proName;
}
public void setProName(String proName){
this.proName = proName;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/integral/ProductVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.integral;
import java.util.List;
/**
* @author 蘑小菇
* @Description:
* @date 2019/6/26 16:59
*/
public class ProductVO{
private String proName;
private String proCode;
private String proImage;
private List<ProductSku> proSku;
private Integer proNumber;
private Double proPrice;
private Integer proIntegral;
public Double getProPrice(){
return proPrice;
}
public void setProPrice(Double proPrice){
this.proPrice = proPrice;
}
public Integer getProIntegral(){
return proIntegral;
}
public void setProIntegral(Integer proIntegral){
this.proIntegral = proIntegral;
}
public String getProName(){
return proName;
}
public void setProName(String proName){
this.proName = proName;
}
public String getProCode(){
return proCode;
}
public void setProCode(String proCode){
this.proCode = proCode;
}
public String getProImage(){
return proImage;
}
public void setProImage(String proImage){
this.proImage = proImage;
}
public List<ProductSku> getProSku(){
return proSku;
}
public void setProSku(List<ProductSku> proSku){
this.proSku = proSku;
}
public Integer getProNumber(){
return proNumber;
}
public void setProNumber(Integer proNumber){
this.proNumber = proNumber;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/integral/ScanVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.integral;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ScanVO implements Serializable{
private static final long serialVersionUID = 1L;
private String recordId;
private Integer hasOrder;
private String enterpriseId;
private Date finishTime;
/**
* 核销时间 诺手说，这认这个名字
*/
private Date createTime;
private Date payTime;
private String payNumber;
private String orderNo;
private String exchangeId;
private Integer allCostIntegral;
private Double payCost;
private Integer status;
private String consignee;
private String consigneePhone;
private String address;
private String point;
private String takeTime;
private String writeOffCode;
private String fetchCode;
private List<ProductVO> products;
/**
* 1 核销，0 未核销
*/
private Integer checked;
public Integer getChecked() {
return checked;
}
public void setChecked(Integer checked) {
this.checked = checked;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public void pushProduct(ProductVO productVO){
if(this.products ==null){
products = new ArrayList<>( );
}
products.add( productVO );
}
public Integer getHasOrder(){
return hasOrder;
}
public void setHasOrder(Integer hasOrder){
this.hasOrder = hasOrder;
}
public List<ProductVO> getProducts(){
return products;
}
public void setProducts(List<ProductVO> products){
this.products = products;
}
public String getRecordId(){
return recordId;
}
public void setRecordId(String recordId){
this.recordId = recordId;
}
public String getEnterpriseId(){
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId){
this.enterpriseId = enterpriseId;
}
public Date getFinishTime(){
return finishTime;
}
public void setFinishTime(Date finishTime){
this.finishTime = finishTime;
}
public Date getPayTime(){
return payTime;
}
public void setPayTime(Date payTime){
this.payTime = payTime;
}
public String getPayNumber(){
return payNumber;
}
public void setPayNumber(String payNumber){
this.payNumber = payNumber;
}
public String getOrderNo(){
return orderNo;
}
public void setOrderNo(String orderNo){
this.orderNo = orderNo;
}
public String getExchangeId(){
return exchangeId;
}
public void setExchangeId(String exchangeId){
this.exchangeId = exchangeId;
}
public Integer getAllCostIntegral(){
return allCostIntegral;
}
public void setAllCostIntegral(Integer allCostIntegral){
this.allCostIntegral = null == allCostIntegral?0:allCostIntegral;
}
public Double getPayCost(){
return payCost;
}
public void setPayCost(Double payCost){
this.payCost = payCost;
}
public Integer getStatus(){
return status;
}
public void setStatus(Integer status){
this.status = status;
}
public String getConsignee(){
return consignee;
}
public void setConsignee(String consignee){
this.consignee = consignee;
}
public String getConsigneePhone(){
return consigneePhone;
}
public void setConsigneePhone(String consigneePhone){
this.consigneePhone = consigneePhone;
}
public String getAddress(){
return address;
}
public void setAddress(String address){
this.address = address;
}
public String getPoint(){
return point;
}
public void setPoint(String point){
this.point = point;
}
public String getTakeTime(){
return takeTime;
}
public void setTakeTime(String takeTime){
this.takeTime = takeTime;
}
public String getWriteOffCode(){
return writeOffCode;
}
public void setWriteOffCode(String writeOffCode){
this.writeOffCode = writeOffCode;
}
public String getFetchCode(){
return fetchCode;
}
public void setFetchCode(String fetchCode){
this.fetchCode = fetchCode;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeConsultVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* 商城订单协商记录表
* @TableName tab_gic_mall_order_exchange_consult
*/
public class OrderExchangeConsultVO implements Serializable {
/**
* 协商记录id
*/
private String orderExchangeConsultId;
/**
* 退款记录id
*/
private String orderExchangeId;
/**
* 消息类型:1 系统信息,2 协商信息 3物流信息，4商品信息
*/
private Integer msgType;
/**
* 买家还是卖家：1买家，2卖家
*/
private Integer role;
private String reason ;
/**
* 卖家与买家操作记录信息
*/
private String msg;
/**
* 扩展信息json
*/
private String extJson;
/**
* 协商信息(买家换货说明/商家拒绝说明)
*/
private String remark;
/**
* 协商信息图片地址
*/
private String imgUrl;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
/**
* 协商记录id
*/
public String getOrderExchangeConsultId() {
return orderExchangeConsultId;
}
/**
* 协商记录id
*/
public void setOrderExchangeConsultId(String orderExchangeConsultId) {
this.orderExchangeConsultId = orderExchangeConsultId;
}
/**
* 退款记录id
*/
public String getOrderExchangeId() {
return orderExchangeId;
}
/**
* 退款记录id
*/
public void setOrderExchangeId(String orderExchangeId) {
this.orderExchangeId = orderExchangeId;
}
/**
* 消息类型:1 系统信息,2 协商信息 3物流信息，4商品信息
*/
public Integer getMsgType() {
return msgType;
}
/**
* 消息类型:1 系统信息,2 协商信息 3物流信息，4商品信息
*/
public void setMsgType(Integer msgType) {
this.msgType = msgType;
}
/**
* 买家还是卖家：1买家，2卖家
*/
public Integer getRole() {
return role;
}
/**
* 买家还是卖家：1买家，2卖家
*/
public void setRole(Integer role) {
this.role = role;
}
/**
* 卖家与买家操作记录信息
*/
public String getMsg() {
return msg;
}
/**
* 卖家与买家操作记录信息
*/
public void setMsg(String msg) {
this.msg = msg;
}
/**
* 扩展信息json
*/
public String getExtJson() {
return extJson;
}
/**
* 扩展信息json
*/
public void setExtJson(String extJson) {
this.extJson = extJson;
}
/**
* 协商信息(买家换货说明/商家拒绝说明)
*/
public String getRemark() {
return remark;
}
/**
* 协商信息(买家换货说明/商家拒绝说明)
*/
public void setRemark(String remark) {
this.remark = remark;
}
/**
* 协商信息图片地址
*/
public String getImgUrl() {
return imgUrl;
}
/**
* 协商信息图片地址
*/
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
/**
* 创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 更新时间
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* 更新时间
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeExcelVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* tab_gic_mall_order_exchange
*/
public class OrderExchangeExcelVO implements Serializable {
private static final long serialVersionUID = 1L;
private String orderExchangeId;
/**
* 订单换货流水号
*/
private String orderExchangeNumber;
/**
* 订单ID
*/
private String orderId;
/**
* 订单项ID
*/
private String orderItemId;
/**
* 订单流程ID
*/
private String orderNumber;
/**
* 会员ID
*/
private String memberId;
private String memberName;
private String memberCardNo;
/**
* 商家备注
*/
private String sellerRemark;
/**
* 换货商品件数（或单位 贵金属-重量等）
*/
private Double exchangeNumber;
/**
* 换货状态 1待换货待处理 2商家拒绝申请 3待买家退货 4待商家收货并发货 5待买家确认收货 6拒绝换货 7换货成功 8换货失败
*/
private Integer exchangeStatus;
/**
* 买家物流号（退货物流）
*/
private String buyerLogisticsCode;
/**
* 买家物流公司（退货物流）
*/
private String buyerLogisticsCompanyName;
private String sellerLogisticsCompanyName;
private String sellerLogisticsCode;
private String mallProId ;
/**
* 商城商品名称
*/
private String mallProName;
/**
* 商品编号
*/
private String mallProCode;
/**
* 商城商品图片url
*/
private String mallProImageUrl;
/**
* 商城商品零售价
*/
private Double mallProPrice;
private String mallProSkuAttr;
private Date createTime;
/**
* 目标商品SKU_ID
*/
private String targetProSkuId;
/**
* 目标商品SKU_CODE
*/
private String targetProSkuCode;
/**
* 目标商品SKU属性
*/
private String targetProSkuAttr;
/**
* 目标商品图片
*/
private String targetProImageUrl;
public String getTargetProSkuId() {
return targetProSkuId;
}
public String getTargetProSkuCode() {
return targetProSkuCode;
}
public String getTargetProSkuAttr() {
return targetProSkuAttr;
}
public String getTargetProImageUrl() {
return targetProImageUrl;
}
public void setTargetProSkuId(String targetProSkuId) {
this.targetProSkuId = targetProSkuId;
}
public void setTargetProSkuCode(String targetProSkuCode) {
this.targetProSkuCode = targetProSkuCode;
}
public void setTargetProSkuAttr(String targetProSkuAttr) {
this.targetProSkuAttr = targetProSkuAttr;
}
public void setTargetProImageUrl(String targetProImageUrl) {
this.targetProImageUrl = targetProImageUrl;
}
public String getMallProId() {
return mallProId;
}
public void setMallProId(String mallProId) {
this.mallProId = mallProId;
}
public String getOrderExchangeId() {
return orderExchangeId;
}
public String getOrderExchangeNumber() {
return orderExchangeNumber;
}
public String getOrderId() {
return orderId;
}
public String getOrderItemId() {
return orderItemId;
}
public String getOrderNumber() {
return orderNumber;
}
public String getMemberId() {
return memberId;
}
public String getMemberName() {
return memberName;
}
public String getMemberCardNo() {
return memberCardNo;
}
public String getSellerRemark() {
return sellerRemark;
}
public Double getExchangeNumber() {
return exchangeNumber;
}
public Integer getExchangeStatus() {
return exchangeStatus;
}
public String getBuyerLogisticsCode() {
return buyerLogisticsCode;
}
public String getBuyerLogisticsCompanyName() {
return buyerLogisticsCompanyName;
}
public String getSellerLogisticsCompanyName() {
return sellerLogisticsCompanyName;
}
public String getSellerLogisticsCode() {
return sellerLogisticsCode;
}
public String getMallProName() {
return mallProName;
}
public String getMallProCode() {
return mallProCode;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public Double getMallProPrice() {
return mallProPrice;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public Date getCreateTime() {
return createTime;
}
public void setOrderExchangeId(String orderExchangeId) {
this.orderExchangeId = orderExchangeId;
}
public void setOrderExchangeNumber(String orderExchangeNumber) {
this.orderExchangeNumber = orderExchangeNumber;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public void setMemberCardNo(String memberCardNo) {
this.memberCardNo = memberCardNo;
}
public void setSellerRemark(String sellerRemark) {
this.sellerRemark = sellerRemark;
}
public void setExchangeNumber(Double exchangeNumber) {
this.exchangeNumber = exchangeNumber;
}
public void setExchangeStatus(Integer exchangeStatus) {
this.exchangeStatus = exchangeStatus;
}
public void setBuyerLogisticsCode(String buyerLogisticsCode) {
this.buyerLogisticsCode = buyerLogisticsCode;
}
public void setBuyerLogisticsCompanyName(String buyerLogisticsCompanyName) {
this.buyerLogisticsCompanyName = buyerLogisticsCompanyName;
}
public void setSellerLogisticsCompanyName(String sellerLogisticsCompanyName) {
this.sellerLogisticsCompanyName = sellerLogisticsCompanyName;
}
public void setSellerLogisticsCode(String sellerLogisticsCode) {
this.sellerLogisticsCode = sellerLogisticsCode;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProCode(String mallProCode) {
this.mallProCode = mallProCode;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProPrice(Double mallProPrice) {
this.mallProPrice = mallProPrice;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeListVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* tab_gic_mall_order_exchange
*/
public class OrderExchangeListVO implements Serializable {
private static final long serialVersionUID = 1L;
private String orderExchangeId;
/**
* 订单换货流水号
*/
private String orderExchangeNumber;
/**
* 订单ID
*/
private String orderId;
/**
* 订单项ID
*/
private String orderItemId;
/**
* 订单流程ID
*/
private String orderNumber;
/**
* 会员ID
*/
private String memberId;
private String memberName;
private String memberCardNo;
/**
* 商家备注
*/
private String sellerRemark;
/**
* 换货商品件数（或单位 贵金属-重量等）
*/
private Double exchangeNumber;
/**
* 换货状态 1待换货待处理 2商家拒绝申请 3待买家退货 4待商家收货并发货 5待买家确认收货 6拒绝换货 7换货成功 8换货失败
*/
private Integer exchangeStatus;
/**
* 买家物流号（退货物流）
*/
private String buyerLogisticsCode;
/**
* 买家物流公司（退货物流）
*/
private String buyerLogisticsCompanyName;
private String sellerLogisticsCompanyName;
private String sellerLogisticsCode;
private String mallProId ;
/**
* 商城商品名称
*/
private String mallProName;
/**
* 商品编号
*/
private String mallProCode;
/**
* 商城商品图片url
*/
private String mallProImageUrl;
/**
* 商城商品零售价
*/
private Double mallProPrice;
private String mallProSkuAttr;
private Date createTime;
/**
* 目标商品SKU_ID
*/
private String targetProSkuId;
/**
* 目标商品SKU_CODE
*/
private String targetProSkuCode;
/**
* 目标商品SKU属性
*/
private String targetProSkuAttr;
/**
* 目标商品图片
*/
private String targetProImageUrl;
// 赠品1是0否
private int giftFlag;
private String buyerLogisticsId;
private String sellerLogisticsId;
public String getBuyerLogisticsId() {
return buyerLogisticsId;
}
public String getSellerLogisticsId() {
return sellerLogisticsId;
}
public void setBuyerLogisticsId(String buyerLogisticsId) {
this.buyerLogisticsId = buyerLogisticsId;
}
public void setSellerLogisticsId(String sellerLogisticsId) {
this.sellerLogisticsId = sellerLogisticsId;
}
public int getGiftFlag() {
return giftFlag;
}
public void setGiftFlag(int giftFlag) {
this.giftFlag = giftFlag;
}
public String getTargetProSkuId() {
return targetProSkuId;
}
public String getTargetProSkuCode() {
return targetProSkuCode;
}
public String getTargetProSkuAttr() {
return targetProSkuAttr;
}
public String getTargetProImageUrl() {
return targetProImageUrl;
}
public void setTargetProSkuId(String targetProSkuId) {
this.targetProSkuId = targetProSkuId;
}
public void setTargetProSkuCode(String targetProSkuCode) {
this.targetProSkuCode = targetProSkuCode;
}
public void setTargetProSkuAttr(String targetProSkuAttr) {
this.targetProSkuAttr = targetProSkuAttr;
}
public void setTargetProImageUrl(String targetProImageUrl) {
this.targetProImageUrl = targetProImageUrl;
}
public String getMallProId() {
return mallProId;
}
public void setMallProId(String mallProId) {
this.mallProId = mallProId;
}
public String getOrderExchangeId() {
return orderExchangeId;
}
public String getOrderExchangeNumber() {
return orderExchangeNumber;
}
public String getOrderId() {
return orderId;
}
public String getOrderItemId() {
return orderItemId;
}
public String getOrderNumber() {
return orderNumber;
}
public String getMemberId() {
return memberId;
}
public String getMemberName() {
return memberName;
}
public String getMemberCardNo() {
return memberCardNo;
}
public String getSellerRemark() {
return sellerRemark;
}
public Double getExchangeNumber() {
return exchangeNumber;
}
public Integer getExchangeStatus() {
return exchangeStatus;
}
public String getBuyerLogisticsCode() {
return buyerLogisticsCode;
}
public String getBuyerLogisticsCompanyName() {
return buyerLogisticsCompanyName;
}
public String getSellerLogisticsCompanyName() {
return sellerLogisticsCompanyName;
}
public String getSellerLogisticsCode() {
return sellerLogisticsCode;
}
public String getMallProName() {
return mallProName;
}
public String getMallProCode() {
return mallProCode;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public Double getMallProPrice() {
return mallProPrice;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public Date getCreateTime() {
return createTime;
}
public void setOrderExchangeId(String orderExchangeId) {
this.orderExchangeId = orderExchangeId;
}
public void setOrderExchangeNumber(String orderExchangeNumber) {
this.orderExchangeNumber = orderExchangeNumber;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public void setMemberCardNo(String memberCardNo) {
this.memberCardNo = memberCardNo;
}
public void setSellerRemark(String sellerRemark) {
this.sellerRemark = sellerRemark;
}
public void setExchangeNumber(Double exchangeNumber) {
this.exchangeNumber = exchangeNumber;
}
public void setExchangeStatus(Integer exchangeStatus) {
this.exchangeStatus = exchangeStatus;
}
public void setBuyerLogisticsCode(String buyerLogisticsCode) {
this.buyerLogisticsCode = buyerLogisticsCode;
}
public void setBuyerLogisticsCompanyName(String buyerLogisticsCompanyName) {
this.buyerLogisticsCompanyName = buyerLogisticsCompanyName;
}
public void setSellerLogisticsCompanyName(String sellerLogisticsCompanyName) {
this.sellerLogisticsCompanyName = sellerLogisticsCompanyName;
}
public void setSellerLogisticsCode(String sellerLogisticsCode) {
this.sellerLogisticsCode = sellerLogisticsCode;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProCode(String mallProCode) {
this.mallProCode = mallProCode;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProPrice(Double mallProPrice) {
this.mallProPrice = mallProPrice;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderListVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* @description: 这里是描述文字
* @author: 巴弗
* @createDate: 2023/2/20 15:42
*/
public class OrderListVO implements Serializable {
private static final long serialVersionUID = 5215230055823016992L;
// 退款单id
private String orderRefundId;
// 退款单号
private String orderRefundNumber;
// 1仅退款 2退货退款 3 换货
private Integer refundType;
/**
* 申请时间
*/
private Date refundTime;
/**
* 订单ID
*/
private String orderId;
/**
* 订单编号
*/
private String orderNumber;
/**
* 商城商品Name
*/
private String mallProName;
/**
* 商城商品图片url
*/
private String mallProImageUrl;
/**
* 商城商品件数（或单位 贵金属-重量等）
*/
private Double mallProNumber;
/**
* 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
*/
private String mallProSkuAttr;
/**
* 订单项实付金额
*/
private Double itemPayAmount;
public String getOrderRefundId() {
return orderRefundId;
}
public String getOrderRefundNumber() {
return orderRefundNumber;
}
public Integer getRefundType() {
return refundType;
}
public Date getRefundTime() {
return refundTime;
}
public String getOrderId() {
return orderId;
}
public String getOrderNumber() {
return orderNumber;
}
public String getMallProName() {
return mallProName;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public Double getMallProNumber() {
return mallProNumber;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public Double getItemPayAmount() {
return itemPayAmount;
}
public void setOrderRefundId(String orderRefundId) {
this.orderRefundId = orderRefundId;
}
public void setOrderRefundNumber(String orderRefundNumber) {
this.orderRefundNumber = orderRefundNumber;
}
public void setRefundType(Integer refundType) {
this.refundType = refundType;
}
public void setRefundTime(Date refundTime) {
this.refundTime = refundTime;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProNumber(Double mallProNumber) {
this.mallProNumber = mallProNumber;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setItemPayAmount(Double itemPayAmount) {
this.itemPayAmount = itemPayAmount;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundConsultVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* 商城订单协商记录表
* @TableName tab_gic_mall_order_refund_consult
*/
public class OrderRefundConsultVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = 4924928859885431070L;
/**
* 协商记录id
*/
private String orderRefundConsultId;
/**
* 退款记录id
*/
private String orderRefundId;
/**
* 买家还是卖家：1买家，2卖家
*/
private Integer role;
/**
* 卖家与买家操作记录信息
*/
private String msg;
/**
* 退款原因
*/
private String refundReason;
/**
* 退款类型：1，仅退款，2退货退款
*/
private Integer refundType;
/**
* 退款金额(申请退款金额)
*/
private Double refundPrice;
/**
* 退款说明
*/
private String description;
/**
* 退款图片地址
*/
private String imgUrl;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 退还积分
*/
private Double refundPoint;
/**
* 消息类型:REFUND_TYPE退款类型,MSG_TYPE沟通信息类型
*/
private String msgType;
/**
* 退款时发货类型：1：未发货类型，2：已发货类型
*/
private Integer refundDeliverType;
private String extJson ;
public String getExtJson() {
return extJson;
}
public void setExtJson(String extJson) {
this.extJson = extJson;
}
/**
* 协商记录id
*/
public String getOrderRefundConsultId() {
return orderRefundConsultId;
}
/**
* 协商记录id
*/
public void setOrderRefundConsultId(String orderRefundConsultId) {
this.orderRefundConsultId = orderRefundConsultId;
}
/**
* 退款记录id
*/
public String getOrderRefundId() {
return orderRefundId;
}
/**
* 退款记录id
*/
public void setOrderRefundId(String orderRefundId) {
this.orderRefundId = orderRefundId;
}
/**
* 买家还是卖家：1买家，2卖家
*/
public Integer getRole() {
return role;
}
/**
* 买家还是卖家：1买家，2卖家
*/
public void setRole(Integer role) {
this.role = role;
}
/**
* 卖家与买家操作记录信息
*/
public String getMsg() {
return msg;
}
/**
* 卖家与买家操作记录信息
*/
public void setMsg(String msg) {
this.msg = msg;
}
/**
* 退款原因
*/
public String getRefundReason() {
return refundReason;
}
/**
* 退款原因
*/
public void setRefundReason(String refundReason) {
this.refundReason = refundReason;
}
/**
* 退款类型：1，仅退款，2退货退款
*/
public Integer getRefundType() {
return refundType;
}
/**
* 退款类型：1，仅退款，2退货退款
*/
public void setRefundType(Integer refundType) {
this.refundType = refundType;
}
/**
* 退款金额(申请退款金额)
*/
public Double getRefundPrice() {
return refundPrice;
}
/**
* 退款金额(申请退款金额)
*/
public void setRefundPrice(Double refundPrice) {
this.refundPrice = refundPrice;
}
/**
* 退款说明
*/
public String getDescription() {
return description;
}
/**
* 退款说明
*/
public void setDescription(String description) {
this.description = description;
}
/**
* 退款图片地址
*/
public String getImgUrl() {
return imgUrl;
}
/**
* 退款图片地址
*/
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
/**
* 创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 更新时间
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* 更新时间
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* 退还积分
*/
public Double getRefundPoint() {
return refundPoint;
}
/**
* 退还积分
*/
public void setRefundPoint(Double refundPoint) {
this.refundPoint = refundPoint;
}
/**
* 消息类型:REFUND_TYPE退款类型,MSG_TYPE沟通信息类型
*/
public String getMsgType() {
return msgType;
}
/**
* 消息类型:REFUND_TYPE退款类型,MSG_TYPE沟通信息类型
*/
public void setMsgType(String msgType) {
this.msgType = msgType;
}
/**
* 退款时发货类型：1：未发货类型，2：已发货类型
*/
public Integer getRefundDeliverType() {
return refundDeliverType;
}
/**
* 退款时发货类型：1：未发货类型，2：已发货类型
*/
public void setRefundDeliverType(Integer refundDeliverType) {
this.refundDeliverType = refundDeliverType;
}
}
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundExcelVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* 商城退款记录
*
* @author zxy
*/
public class OrderRefundExcelVO implements Serializable {
private static final long serialVersionUID = 1L;
private String orderRefundId;
private String orderId;// 订单ID
private String orderItemId;// 订单项ID
private String orderNumber;
private String orderRefundNumber; // 退款编号
private Integer refundType;// 退款类型：0，仅退款，1退货退款
private double refundNumber = 0.00d;// 退款商品件数（或单位 贵金属-重量等）
private double payAmount; // 实付金额
private double applyRefundPrice = 0.00d;// 申请退款金额
private double refundPrice = 0.00d;// 退款金额 实付部分
private int refundPoints = 0;// 退款 积分部分
private String refundLogisticsId; // 物流退款id
private String logisticsName;// 物流名称
private String logisticsNumber;// 物流单号
// 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
private int refundStatus = 1;
private Date createTime;// 创建记录时间
private String mallProName;// 商城商品Name
private String mallProImageUrl;// 商城商品图片url
private String mallProSkuAttr;
private String mallProSkuCode;
private String sellerRemark; // 商家备注
private String memberId ;
private String memberName;
private String memberCardNo;
// 赠品1是0否
private int giftFlag;
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public int getGiftFlag() {
return giftFlag;
}
public void setGiftFlag(int giftFlag) {
this.giftFlag = giftFlag;
}
public String getOrderRefundId() {
return orderRefundId;
}
public String getOrderId() {
return orderId;
}
public String getOrderItemId() {
return orderItemId;
}
public String getOrderNumber() {
return orderNumber;
}
public String getOrderRefundNumber() {
return orderRefundNumber;
}
public Integer getRefundType() {
return refundType;
}
public double getRefundNumber() {
return refundNumber;
}
public String getRefundLogisticsId() {
return refundLogisticsId;
}
public String getLogisticsName() {
return logisticsName;
}
public String getLogisticsNumber() {
return logisticsNumber;
}
public double getApplyRefundPrice() {
return applyRefundPrice;
}
public double getRefundPrice() {
return refundPrice;
}
public int getRefundStatus() {
return refundStatus;
}
public int getRefundPoints() {
return refundPoints;
}
public Date getCreateTime() {
return createTime;
}
public String getMallProName() {
return mallProName;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public double getPayAmount() {
return payAmount;
}
public String getMallProSkuCode() {
return mallProSkuCode;
}
public String getMemberName() {
return memberName;
}
public String getMemberCardNo() {
return memberCardNo;
}
public void setOrderRefundId(String orderRefundId) {
this.orderRefundId = orderRefundId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public void setOrderRefundNumber(String orderRefundNumber) {
this.orderRefundNumber = orderRefundNumber;
}
public void setRefundType(Integer refundType) {
this.refundType = refundType;
}
public void setRefundNumber(double refundNumber) {
this.refundNumber = refundNumber;
}
public void setRefundLogisticsId(String refundLogisticsId) {
this.refundLogisticsId = refundLogisticsId;
}
public void setLogisticsName(String logisticsName) {
this.logisticsName = logisticsName;
}
public void setLogisticsNumber(String logisticsNumber) {
this.logisticsNumber = logisticsNumber;
}
public void setApplyRefundPrice(double applyRefundPrice) {
this.applyRefundPrice = applyRefundPrice;
}
public void setRefundPrice(double refundPrice) {
this.refundPrice = refundPrice;
}
public void setRefundStatus(int refundStatus) {
this.refundStatus = refundStatus;
}
public void setRefundPoints(int refundPoints) {
this.refundPoints = refundPoints;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setPayAmount(double payAmount) {
this.payAmount = payAmount;
}
public void setMallProSkuCode(String mallProSkuCode) {
this.mallProSkuCode = mallProSkuCode;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public void setMemberCardNo(String memberCardNo) {
this.memberCardNo = memberCardNo;
}
public String getSellerRemark() {
return sellerRemark;
}
public void setSellerRemark(String sellerRemark) {
this.sellerRemark = sellerRemark;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundListVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.Date;
/**
* 商城退款记录
*
* @author zxy
*/
public class OrderRefundListVO implements Serializable {
private static final long serialVersionUID = 1L;
private String orderRefundId;
private String orderId;// 订单ID
private String orderItemId;// 订单项ID
private String orderNumber;
private String orderRefundNumber; // 退款编号
private Integer refundType;// 退款类型：0，仅退款，1退货退款
private double refundNumber = 0.00d;// 退款商品件数（或单位 贵金属-重量等）
private double payAmount; // 实付金额
private double applyRefundPrice = 0.00d;// 申请退款金额
private double refundPrice = 0.00d;// 退款金额 实付部分
private int refundPoints = 0;// 退款 积分部分
private String refundLogisticsId; // 物流退款id
private String logisticsName;// 物流名称
private String logisticsNumber;// 物流单号
// 1退款待处理 2成功 3退款关闭 4待买家退货 5待商家收货 6拒绝退款
private int refundStatus = 1;
private Date createTime;// 创建记录时间
private String mallProId;
private String mallProCode;
private String mallProName;// 商城商品Name
private String mallProImageUrl;// 商城商品图片url
private String mallProSkuAttr;
private String mallProSkuCode;
private String sellerRemark; // 商家备注
private String memberId;
private String memberName;
private String memberCardNo;
// 赠品1是0否
private int giftFlag;
public String getMallProId() {
return mallProId;
}
public String getMallProCode() {
return mallProCode;
}
public void setMallProId(String mallProId) {
this.mallProId = mallProId;
}
public void setMallProCode(String mallProCode) {
this.mallProCode = mallProCode;
}
public String getMemberId() {
return memberId;
}
public void setMemberId(String memberId) {
this.memberId = memberId;
}
public int getGiftFlag() {
return giftFlag;
}
public void setGiftFlag(int giftFlag) {
this.giftFlag = giftFlag;
}
public String getOrderRefundId() {
return orderRefundId;
}
public String getOrderId() {
return orderId;
}
public String getOrderItemId() {
return orderItemId;
}
public String getOrderNumber() {
return orderNumber;
}
public String getOrderRefundNumber() {
return orderRefundNumber;
}
public Integer getRefundType() {
return refundType;
}
public double getRefundNumber() {
return refundNumber;
}
public String getRefundLogisticsId() {
return refundLogisticsId;
}
public String getLogisticsName() {
return logisticsName;
}
public String getLogisticsNumber() {
return logisticsNumber;
}
public double getApplyRefundPrice() {
return applyRefundPrice;
}
public double getRefundPrice() {
return refundPrice;
}
public int getRefundStatus() {
return refundStatus;
}
public int getRefundPoints() {
return refundPoints;
}
public Date getCreateTime() {
return createTime;
}
public String getMallProName() {
return mallProName;
}
public String getMallProImageUrl() {
return mallProImageUrl;
}
public String getMallProSkuAttr() {
return mallProSkuAttr;
}
public double getPayAmount() {
return payAmount;
}
public String getMallProSkuCode() {
return mallProSkuCode;
}
public String getMemberName() {
return memberName;
}
public String getMemberCardNo() {
return memberCardNo;
}
public void setOrderRefundId(String orderRefundId) {
this.orderRefundId = orderRefundId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public void setOrderRefundNumber(String orderRefundNumber) {
this.orderRefundNumber = orderRefundNumber;
}
public void setRefundType(Integer refundType) {
this.refundType = refundType;
}
public void setRefundNumber(double refundNumber) {
this.refundNumber = refundNumber;
}
public void setRefundLogisticsId(String refundLogisticsId) {
this.refundLogisticsId = refundLogisticsId;
}
public void setLogisticsName(String logisticsName) {
this.logisticsName = logisticsName;
}
public void setLogisticsNumber(String logisticsNumber) {
this.logisticsNumber = logisticsNumber;
}
public void setApplyRefundPrice(double applyRefundPrice) {
this.applyRefundPrice = applyRefundPrice;
}
public void setRefundPrice(double refundPrice) {
this.refundPrice = refundPrice;
}
public void setRefundStatus(int refundStatus) {
this.refundStatus = refundStatus;
}
public void setRefundPoints(int refundPoints) {
this.refundPoints = refundPoints;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public void setMallProName(String mallProName) {
this.mallProName = mallProName;
}
public void setMallProImageUrl(String mallProImageUrl) {
this.mallProImageUrl = mallProImageUrl;
}
public void setMallProSkuAttr(String mallProSkuAttr) {
this.mallProSkuAttr = mallProSkuAttr;
}
public void setPayAmount(double payAmount) {
this.payAmount = payAmount;
}
public void setMallProSkuCode(String mallProSkuCode) {
this.mallProSkuCode = mallProSkuCode;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public void setMemberCardNo(String memberCardNo) {
this.memberCardNo = memberCardNo;
}
public String getSellerRemark() {
return sellerRemark;
}
public void setSellerRemark(String sellerRemark) {
this.sellerRemark = sellerRemark;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/RefundAddressVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
/**
*
* @ClassName: RefundAddressVO
* @Description: 退款地址
* @author xugh
* @date 2023年2月27日 下午6:57:43
*
*/
public class RefundAddressVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -9031869412982343516L;
private String id;
// 0归属门店 1发货门店 2平台地址
private int addressType;
private String phone;
private String name;
private String storeName;
private String storeCode;
private String address;
private int ifDefault;
private String areaId ;
public String getAreaId() {
return areaId;
}
public void setAreaId(String areaId) {
this.areaId = areaId;
}
public String getStoreName() {
return storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public int getIfDefault() {
return ifDefault;
}
public void setIfDefault(int ifDefault) {
this.ifDefault = ifDefault;
}
public int getAddressType() {
return addressType;
}
public void setAddressType(int addressType) {
this.addressType = addressType;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getPhone() {
return phone;
}
public String getName() {
return name;
}
public String getAddress() {
return address;
}
public void setPhone(String phone) {
this.phone = phone;
}
public void setName(String name) {
this.name = name;
}
public void setAddress(String address) {
this.address = address;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/SellerAddressVO.java 0 → 100644
package com.gic.haoban.manage.web.vo.order.refund;
import java.io.Serializable;
import java.util.List;
/**
*
* @ClassName: RefundAddressVO
* @Description: 退款地址
* @author xugh
* @date 2023年2月27日 下午6:57:43
*
*/
public class SellerAddressVO implements Serializable {
/**
* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
*/
private static final long serialVersionUID = -3262328396877481444L;
// 归属门店
private RefundAddressVO ownerStoreAddress;
// 发货门店
private RefundAddressVO deliverStoreAddress;
// 平台退货地址
private List<RefundAddressVO> sellerAddressList;
public RefundAddressVO getOwnerStoreAddress() {
return ownerStoreAddress;
}
public RefundAddressVO getDeliverStoreAddress() {
return deliverStoreAddress;
}
public List<RefundAddressVO> getSellerAddressList() {
return sellerAddressList;
}
public void setOwnerStoreAddress(RefundAddressVO ownerStoreAddress) {
this.ownerStoreAddress = ownerStoreAddress;
}
public void setDeliverStoreAddress(RefundAddressVO deliverStoreAddress) {
this.deliverStoreAddress = deliverStoreAddress;
}
public void setSellerAddressList(List<RefundAddressVO> sellerAddressList) {
this.sellerAddressList = sellerAddressList;
}
}
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
...@@ -122,8 +122,17 @@ ...@@ -122,8 +122,17 @@
<dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false"/> <dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false"/>
<dubbo:reference interface="com.gic.content.api.service.ContentMaterialShareApiService" id="contentMaterialShareApiService" timeout="10000" retries="0" check="false"/> <dubbo:reference interface="com.gic.content.api.service.ContentMaterialShareApiService" id="contentMaterialShareApiService" timeout="10000" retries="0" check="false"/>
<dubbo:reference id="settingApiService" interface="com.gic.haoban.app.aggregation.api.service.SettingApiService" timeout="10000" retries="0" check="false"/> <dubbo:reference id="settingApiService" interface="com.gic.haoban.app.aggregation.api.service.SettingApiService" timeout="10000" retries="0" check="false"/>
<dubbo:reference id="newDataTargetConfigApiService" interface="com.gic.enterprise.api.service.target.NewDataTargetConfigApiService" timeout="100000" retries="0" check="false" /> <dubbo:reference id="newDataTargetConfigApiService" interface="com.gic.enterprise.api.service.target.NewDataTargetConfigApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="logisticsApiService" interface="com.gic.business.order.service.logistics.LogisticsApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="orderVerificationRecordApiService" interface="com.gic.haoban.app.aggregation.api.service.evaluation.OrderVerificationRecordApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="orderRefundApiService" interface="com.gic.business.order.service.ordermanage.OrderRefundApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="mallSellerAddressApiService" interface="com.gic.business.order.service.ordermanage.MallSellerAddressApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="webOrderManageApiService" interface="com.gic.business.order.service.ordermanage.WebOrderManageApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="afterSalesManageApiService" interface="com.gic.business.order.api.service.order.AfterSalesManageApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="memberReferClerkApiService" interface="com.gic.business.order.service.activity.MemberReferClerkApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="productStockApiService" interface="com.gic.store.goods.service.ProductStockApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="orderSettingApiService" interface="com.gic.business.order.service.setting.OrderSettingApiService" timeout="100000" retries="0" check="false" />
<dubbo:reference id="evaluateDataApiService" interface="com.gic.evaluate.manage.api.service.EvaluateDataApiService" timeout="100000" retries="0" check="false" />
</beans> </beans>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment