记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 93d853b7 authored by anjiabin's avatar anjiabin
Browse files
Options

Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

parents 11fd30ee 3644e5ee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1998 additions and 255 deletions
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java
View file @ 93d853b7
......@@ -2,6 +2,7 @@ package com.liquidnet.commons.lang.util;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Arrays;
import java.util.Enumeration;
public class IDGenerator {
......@@ -65,18 +66,35 @@ public class IDGenerator {
return ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence;
}
/**
* 根据订单id生成订单号
*
* @param orderTicketId
* @return
*/
public static String ticketOrderCode(String orderTicketId) {
String number = orderTicketId;
int len = orderTicketId.length();
String time = System.currentTimeMillis() / 1000 + "";
String orderCode = "T" + number.substring(0, len - 4);
orderCode+=time.substring(7, 8);
orderCode+=number.substring(len - 2);
orderCode+=time.substring(8, 9);
orderCode+=number.substring(len - 4, len-2);
orderCode += time.substring(7, 8);
orderCode += number.substring(len - 2);
orderCode += time.substring(8, 9);
orderCode += number.substring(len - 4, len - 2);
return orderCode;
}
/**
* 根据 订单号生成qrCode
*
* @param orderTicketId
* @return String
*/
public static String ticketQrCode(String orderTicketId) {
String qrCode = MD5Utils.md5(orderTicketId).toLowerCase();
return "QR" + qrCode.substring(5) + "" + qrCode.substring(0, 4);
}
private static long genTime() {
return useSystemClock ? SystemClock.now() : System.currentTimeMillis();
}
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml
View file @ 93d853b7
......@@ -17,6 +17,9 @@ liquidnet:
level-root: info
mysql:
database-name: dev_ln_scene
url-pay:
pay: "http://testpay.zhengzai.tv/"
check: "http://testpay.zhengzai.tv/order/verify"
#以下为spring各环境个性配置
spring:
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberCodeParam.java
View file @ 93d853b7
......@@ -10,11 +10,11 @@ import java.io.Serializable;
@Data
public class AdamMemberCodeParam implements Serializable {
private static final long serialVersionUID = -7273522103593077617L;
@ApiModelProperty(position = 1, required = false, value = "会员类型ID")
@ApiModelProperty(position = 1, required = true, value = "会员类型ID", example = "67647671736885249")
private String memberId;
@ApiModelProperty(position = 2, required = false, value = "会员价格ID")
@ApiModelProperty(position = 2, required = true, value = "会员价格ID", example = "69153548142796800")
private String memberPriceId;
@ApiModelProperty(position = 3, required = true, value = "类型:0-用户购买兑换码,1-后台生成兑换码", example = "0")
@ApiModelProperty(position = 3, required = true, value = "类型:0-用户购买兑换码,1-后台生成兑换码", example = "1")
private Integer type;
@ApiModelProperty(position = 4, required = false, value = "用户ID", example = "1")
private String buyUid;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderCodeParam.java
View file @ 93d853b7
......@@ -5,18 +5,17 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码")
@Data
public class AdamMemberOrderCodeParam implements Serializable {
private static final long serialVersionUID = 1298109732452201034L;
@ApiModelProperty(position = 10, required = true, value = "类型:2-会员码,3-礼包码", example = "2")
@ApiModelProperty(position = 10, required = true, value = "类型:2-会员码,3-礼包码", example = "3")
private Integer type;
@ApiModelProperty(position = 11, required = true, value = "兑换码", example = "0")
private String memberCode;
@ApiModelProperty(position = 12, required = true, value = "生日", example = "0")
private LocalDateTime birthday;
@ApiModelProperty(position = 12, required = true, value = "生日", example = "2021-05-27")
private String birthday;
@ApiModelProperty(position = 13, required = false, value = "姓名")
private String name;
@ApiModelProperty(position = 14, required = false, value = "身份证件号")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
View file @ 93d853b7
......@@ -14,7 +14,7 @@ public class AdamMemberOrderParam implements Serializable {
private static final long serialVersionUID = 3219448286221952517L;
@ApiModelProperty(position = 10, required = true, value = "会员ID[50]", example = "62960077673504768")
private String memberId;
@ApiModelProperty(position = 11, required = true, value = "购买方式:0-购买会员,1-购买会员码,2-使用会员码", example = "0")
@ApiModelProperty(position = 11, required = true, value = "购买方式:0-购买会员,1-购买会员码", example = "0")
private Integer mode;
@ApiModelProperty(position = 12, required = true, value = "应付金额", example = "0")
private BigDecimal price;
......@@ -23,7 +23,7 @@ public class AdamMemberOrderParam implements Serializable {
@ApiModelProperty(position = 14, required = true, value = "会员价格ID", example = "0")
private String memberPriceId;
@ApiModelProperty(position = 15, required = true, value = "用户生日", example = "0")
private LocalDateTime birthday;
private String birthday;
@ApiModelProperty(position = 16, required = true, value = "支付方式:ALIPAY,WEPAY,WAPALIPAY,WAPWEPAY,JSWEPAY,APPLETWEPAY,APPIAP")
private String payChannel;
@ApiModelProperty(position = 17, required = true, value = "支付用的AuthCode")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberCodeVo.java
View file @ 93d853b7
......@@ -14,58 +14,30 @@ import java.io.Serializable;
@Data
public class AdamMemberCodeVo implements Serializable, Cloneable {
private static final long serialVersionUID = 5258094625450569125L;
@ApiModelProperty(position = 0, value = "会员码")
private String code;
@ApiModelProperty(position = 1, value = "会员类型id")
private String memberId;
@ApiModelProperty(position = 2, value = "会员价格id")
private String memberPriceId;
@ApiModelProperty(position = 3, value = "会员码类型0购买1后台生成")
private String type;
@ApiModelProperty(position = 4, value = "会员编号")
private String memberNo;
@ApiModelProperty(position = 5, value = "会员状态0-未使用 1-已使用 2-不可用")
private Integer state;
/**
* 购买会员码订单号
*/
@ApiModelProperty(position = 6, value = "购买会员码的订单编号")
private String buyOrderNo;
/**
* 购买会员码的用户id
*/
@ApiModelProperty(position = 7, value = "购买会员码的用户id")
private String buyUid;
/**
* 购买时间
*/
@ApiModelProperty(position = 8, value = "购买时间")
private String buyAt;
/**
* 使用会员码的订单号
*/
@ApiModelProperty(position = 9, value = "使用会员码的订单编号")
private String useOrderNo;
/**
* 使用会员码的用户ID
*/
@ApiModelProperty(position = 10, value = "使用会员码的用户id")
private String useUid;
/**
* 使用时间
*/
@ApiModelProperty(position = 11, value = "使用时间")
private String useAt;
/**
* 会员码id
*/
@ApiModelProperty(position = 12, value = "会员码id")
private String memberCodeId;
......@@ -82,26 +54,4 @@ public class AdamMemberCodeVo implements Serializable, Cloneable {
}
return new AdamMemberCodeVo();
}
/**
* 整合数据，适合插入数据库的数据(购买码)
* @param param
* @param state 0-购买 1-生成
* @return
*/
@JsonIgnore
public AdamMemberCode setCodeParam(AdamMemberCodeParam param, int state) {
int type = 0;
String memberNo = "";
String code = MemberUtil.getMemberCode(type);
AdamMemberCode adamMemberCode = new AdamMemberCode();
adamMemberCode.setType(type);
adamMemberCode.setCode(code);
adamMemberCode.setMemberId(param.getMemberId());
adamMemberCode.setMemberPriceId(param.getMemberPriceId());
adamMemberCode.setState(state);
adamMemberCode.setMemberNo(memberNo);
return adamMemberCode;
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderPreviewVo.java
View file @ 93d853b7
......@@ -17,7 +17,9 @@ public class AdamMemberOrderPreviewVo implements Serializable {
@ApiModelProperty(position = 12, value = "价格详情")
private AdamMemberPriceVo priceVo;
@ApiModelProperty(position = 13, value = "是否实名[true-是]")
private Boolean realNamed;
private AdamRealInfoVo realInfoVo;
@ApiModelProperty(position = 14, value = "生日")
private String birthday;
private static final AdamMemberOrderPreviewVo obj = new AdamMemberOrderPreviewVo();
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberCodeAdminService.java
View file @ 93d853b7
......@@ -13,5 +13,5 @@ public interface IAdamMemberCodeAdminService extends IService<AdamMemberCode> {
* 创建礼包码
* @param param
*/
void createGiftCode(AdamMemberCodeParam param);
String createGiftCode(AdamMemberCodeParam param);
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/util/MemberUtil.java
View file @ 93d853b7
......@@ -19,7 +19,15 @@ public class MemberUtil {
return false;
}
public static String getMemberCode(Integer type) {
public static String buyCode() {
return genMemberCode(0);
}
public static String freeCode() {
return genMemberCode(1);
}
public static String genMemberCode(Integer type) {
String code = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
Random rand = new Random();
String word = String.valueOf(code.charAt(rand.nextInt(code.length())));
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java
View file @ 93d853b7
......@@ -17,19 +17,12 @@ public class AdamRedisConst {
public static final String INFO_ADDRESSES = ADAM.concat(":list:addresses:");
public static final String INFO_MEMBERS = ADAM.concat(":list:members");
public static final String INFO_MEMBERS_INFO = ADAM.concat(":list:members:info:");
public static final String INFO_MEMBERS_PRICE_INFO = ADAM.concat(":list:members:price:info:");
public static final String INFO_MEMBERS_CODE_INFO = ADAM.concat(":list:members:code:info:");
public static final String MEMBER_MEMBER_NO_MAX_KEY = ADAM.concat(":members:member_no_max:");
public static final String INFO_MEMBERS_USER = ADAM.concat(":list:members:user");
public static final String INFO_MEMBERS_REPERTORY_INFO = ADAM.concat(":list:members:repertory:");
public static final String INFO_MEMBERS_ORDER_INFO = ADAM.concat(":list:members:order:");
// public static final String USER_CONFIRM_SMS_CODE_KEY = ADAM + ":user:sms_confirm:";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @ 93d853b7
......@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderPreviewVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.IAdamRealNameService;
......@@ -50,8 +51,12 @@ public class AdamMemberOrderController {
AdamMemberOrderPreviewVo previewVo = AdamMemberOrderPreviewVo.getNew();
previewVo.setMemberId(mno);
previewVo.setMemberTitle("摩登天空会员");
previewVo.setRealNamed(null != adamRealNameService.queryByUid(CurrentUtil.getCurrentUid()));
AdamRealInfoVo realInfoVo = adamRealNameService.queryByUid(CurrentUtil.getCurrentUid());
previewVo.setRealInfoVo(realInfoVo);
previewVo.setPriceVo(adamMemberPriceService.query(mno, id));
AdamUserInfoVo userInfoVo = adamUserService.queryByUid(CurrentUtil.getCurrentUid());
previewVo.setBirthday(null == userInfoVo ? null : userInfoVo.getBirthday());
return ResponseDto.success(previewVo);
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberAdminController.java
View file @ 93d853b7
......@@ -3,6 +3,8 @@ package com.liquidnet.service.adam.controller.admin;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamMemberParam;
import com.liquidnet.service.adam.entity.AdamMember;
......@@ -10,7 +12,6 @@ import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -21,12 +22,10 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/admin/member")
public class AdamMemberAdminController {
@Autowired
IAdamMemberAdminService adamMemberService;
@Autowired
AmqpTemplate amqpTemplate;
IAdamMemberCodeAdminService adamMemberCodeAdminService;
@ApiOperationSupport(order = 1)
@ApiOperation(value = "添加会员")
......@@ -43,4 +42,11 @@ public class AdamMemberAdminController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 1)
@ApiOperation(value = "生成兑换码")
@PostMapping("gen_code")
public ResponseDto<Object> genMemberCode(@RequestBody AdamMemberCodeParam parameter) {
return ResponseDto.success(adamMemberCodeAdminService.createGiftCode(parameter));
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberCodeServiceImpl.java
View file @ 93d853b7
......@@ -9,6 +9,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
import com.liquidnet.service.adam.entity.AdamMemberCode;
import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
import com.liquidnet.service.adam.service.IAdamMemberCodeService;
import com.liquidnet.service.adam.util.MemberUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
......@@ -38,7 +39,15 @@ public class AdamMemberCodeServiceImpl extends ServiceImpl<AdamMemberCodeMapper,
@Override
public void add(AdamMemberCodeParam param) {
AdamMemberCode adamMemberCode = (new AdamMemberCodeVo()).setCodeParam(param, 1);
AdamMemberCode adamMemberCode = new AdamMemberCode();
adamMemberCode.setType(param.getType());
adamMemberCode.setCode(MemberUtil.buyCode());
adamMemberCode.setMemberId(param.getMemberId());
adamMemberCode.setMemberPriceId(param.getMemberPriceId());
adamMemberCode.setState(1);// 1-生成
// mysql
adamMemberCodeMapper.insert(adamMemberCode);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 93d853b7
......@@ -136,7 +136,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
String orderNo = IDGenerator.nextSnowId().toString().concat("V");
orderVo.setOrderNo(orderNo);
orderVo.setMemberId(memberId);
orderVo.setBirthday(DateUtil.format(param.getBirthday(), DateUtil.Formatter.yyyyMMddHHmmss));
orderVo.setBirthday(param.getBirthday());
orderVo.setDays(memberPrice.getDays());
orderVo.setMemberPriceId(memberPriceId);
orderVo.setCreatedAt(createdAt);
......@@ -212,8 +212,8 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
if (null != userMemberVo) {
return false;
}
AdamMemberCodeVo memberCodeVo = mongoTemplate.findOne(Query.query(Criteria.where("memberCode").is(code)), AdamMemberCodeVo.class, AdamMemberCodeVo.class.getSimpleName());
if (memberCodeVo.getState() != AdamMemberConst.STATUS_UNPAID) {
AdamMemberCodeVo memberCodeVo = mongoTemplate.findOne(Query.query(Criteria.where("code").is(code)), AdamMemberCodeVo.class, AdamMemberCodeVo.class.getSimpleName());
if (!memberCodeVo.getState().equals(AdamMemberConst.STATUS_UNPAID)) {
return false;
}
......@@ -239,7 +239,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
orderVo.setState(AdamMemberConst.STATUS_UNPAID);
orderVo.setCreatedAt(currentDateTime);
orderVo.setDays(priceVo.getDays());
orderVo.setBirthday(DateUtil.format(param.getBirthday(), DateUtil.Formatter.yyyyMMddHHmmss));
orderVo.setBirthday(param.getBirthday());
orderVo.setPayNo(memberCodeVo.getCode());
orderVo.setPrice(BigDecimal.valueOf(0));
......@@ -370,7 +370,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
createMemberUser.setExpiryAt(expiryAtStr);
// todo vip card code 记录 自动创建并使用
codeVo = this.getAdamMemberCodeVo(orderVo, result.getCode(), 0, currentDateTime);
codeVo = this.getAdamMemberCodeVo(orderVo, result.getCode(), currentDateTime);
codeVo.setState(1);
codeVo.setUseUid(orderVo.getUid());
codeVo.setUseOrderNo(orderVo.getMemberCode());
......@@ -410,7 +410,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
}
if (AdamMemberConst.SUB_TYPE_BUY_VIP_CODE.equals(orderVo.getMode())) { // 购买会员码
cardNumber = adamUserMemberService.getMaxMemberNo(orderVo.getMemberId());
codeVo = this.getAdamMemberCodeVo(orderVo, result.getCode(), 0, currentDateTime);
codeVo = this.getAdamMemberCodeVo(orderVo, result.getCode(), currentDateTime);
codeVo.setState(0);
codeVo.setMemberNo(cardNumber);
......@@ -458,11 +458,10 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
*
* @param orderVo 会员订单
* @param orderCode 订单号
* @param type 会员码类型
* @param currentDateTime 创建时间
* @return AdamMemberCodeVo
*/
private AdamMemberCodeVo getAdamMemberCodeVo(AdamMemberOrderVo orderVo, String orderCode, int type, String currentDateTime) {
private AdamMemberCodeVo getAdamMemberCodeVo(AdamMemberOrderVo orderVo, String orderCode, String currentDateTime) {
AdamMemberCodeVo codeVo = new AdamMemberCodeVo();
codeVo.setMemberId(orderVo.getMemberId());
codeVo.setMemberPriceId(orderVo.getMemberPriceId());
......@@ -470,7 +469,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
codeVo.setBuyOrderNo(orderCode);
codeVo.setType(AdamMemberConst.TYPE_BUY);
codeVo.setMemberNo(orderVo.getMemberNo());
codeVo.setCode(MemberUtil.getMemberCode(type));
codeVo.setCode(MemberUtil.buyCode());
codeVo.setCreatedAt(currentDateTime);
codeVo.setUpdatedAt(currentDateTime);
return codeVo;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/admin/AdamMemberCodeAdminServiceImpl.java
View file @ 93d853b7
......@@ -3,12 +3,12 @@ package com.liquidnet.service.adam.service.impl.admin;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
import com.liquidnet.service.adam.entity.AdamMemberCode;
import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
import com.liquidnet.service.adam.util.MemberUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
......@@ -17,10 +17,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@Slf4j
@Service
public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMapper, AdamMemberCode> implements IAdamMemberCodeAdminService {
......@@ -37,9 +33,15 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
RedisUtil redisUtil;
@Override
public void createGiftCode(AdamMemberCodeParam param) {
public String createGiftCode(AdamMemberCodeParam param) {
// 需要主动生成会员编号
AdamMemberCode adamMemberCode = (new AdamMemberCodeVo()).setCodeParam(param, 0);
AdamMemberCode adamMemberCode = new AdamMemberCode();
adamMemberCode.setType(param.getType());
adamMemberCode.setCode(MemberUtil.buyCode());
adamMemberCode.setMemberId(param.getMemberId());
adamMemberCode.setMemberPriceId(param.getMemberPriceId());
adamMemberCode.setState(0);
adamMemberCodeMapper.insert(adamMemberCode);
// mongo
......@@ -48,5 +50,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
vo.setCreatedAt(DateUtil.format(adamMemberCode.getCreatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
vo.setUpdatedAt(DateUtil.format(adamMemberCode.getUpdatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
mongoTemplate.insert(vo, AdamMemberCodeVo.class.getSimpleName());
return adamMemberCode.getCode();
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @ 93d853b7
package com.liquidnet.service.kylin.constant;
public class KylinRedisConst {
public static final String FIELDS = "kylin:fields:id";
public static final String PERFORMANCES = "kylin:performances:info";
public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:";
public static final String FIELDS = "kylin:fields:id:";
public static final String PERFORMANCES = "kylin:performances:id:";
public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend:id:";
public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:id:";
public static final String SURPLUS_GENERAL = "surplusGeneral";
public static final String SURPLUS_EXCHANGE = "surplusExchange";
public static final String TICKET = "kylin:ticket:info";
public static final String TIMES = "kylin:times:id";
public static final String BANNERS = "kylin:banners";
public static final String TICKET = "kylin:ticket:id:";
public static final String ORDER = "kylin:order:id:";
public static final String ORDER_ENTITIES = "kylin:order_entities:id:";
public static final String TIMES = "kylin:times:id:";
public static final String BANNERS = "kylin:banners:id:";
public static final String AGENT = "kylin:agent:info";
public static final String CHECK_USER = "kylin:checkUser";
public static final String CHECK_USER_RELATION = "kylin:checkUser:relation";
public static final String CHECK_USER = "kylin:checkUser:id:";
public static final String CHECK_USER_RELATION = "kylin:checkUser:relation:id:";
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java
View file @ 93d853b7
......@@ -32,4 +32,19 @@ public class KylinTableStatusConst {
public static final Integer ORDER_REFUND_TYPE_APPLY = 0; // 人工申请类型的退款，可以取消退款，退款完成需返还库存
public static final Integer ORDER_REFUND_TYPE_AUTO = 1; // 自动申请类型的退款，无法取消退款，退款完成不返还库存
// 订单状态
public static final Integer STATUS_UNPAID = 0; // 待付款
public static final Integer STATUS_PAID = 1; // 已付款
public static final Integer STATUS_CLOSE = 2; // 已关闭
public static final Integer STATUS_DELETE = -1; // 关闭后用户主动删除
public static final Integer STATUS_REFUND = 3; // 正在退款
public static final Integer STATUS_REFUNDED = 4; // 已退款
public static final Integer STATUS_WAIT_CLOSE = 5; // 待关闭
// 订单转赠状态
public static final Integer TRANSFER_STATUS_NONE = 0; // 无
public static final Integer TRANSFER_STATUS_ACCEPT = 1; // 接受
public static final Integer TRANSFER_STATUS_GRANT = 2; // 赠予
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayAgainParam.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class PayAgainParam {
@ApiModelProperty(value = "订单id")
@NotNull(message = "必传")
private String orderId;
@ApiModelProperty(value = "支付类型")
@NotNull(message = "必传")
private String payType;
@ApiModelProperty(value = "支付来源")
@NotNull(message = "必传")
private String deviceFrom;
@ApiModelProperty(value = "openId")
private String openId;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/SyncOrderParam.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@Data
public class SyncOrderParam {
@ApiModelProperty(value = "status")
private Integer status;
@ApiModelProperty(value = "type")
private String type;
@ApiModelProperty(value = "code")
private String code;
@ApiModelProperty(value = "payment_id")
private String payment_id;
@ApiModelProperty(value = "order_code")
private String order_code;
@ApiModelProperty(value = "price")
private BigDecimal price;
@ApiModelProperty(value = "payment_type")
private String payment_type;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderListVo.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.dto.vo;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
public class KylinOrderListVo implements Serializable {
private static final long serialVersionUID = 6554829077875538374L;
private String orderTicketsId;
private String performanceTitle;
private String performanceImg;
private String timeStart;
private String ticketTitle;
private String useStart;
private String overdueAt;
private int canBuyTime;
private BigDecimal priceActual;
private Integer number;
private Integer status;
private String createdAt;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderTicketEntitiesVo.java
View file @ 93d853b7
......@@ -22,4 +22,9 @@ public class KylinOrderTicketEntitiesVo implements Serializable {
private Integer sysDamai;
private String checkClient;
private Integer isPayment;
private String performanceTitle;
private String ticketTitle;
private String useStart;
private String useEnd;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderTicketVo.java
View file @ 93d853b7
......@@ -25,6 +25,10 @@ public class KylinOrderTicketVo implements Serializable {
private String userMobile;
@ApiModelProperty(position = 14, value = "演出名称")
private String performanceTitle;
private String ticketTitle;
private String timeStart;
private String useStart;
private String performanceImg;
@ApiModelProperty(position = 15, value = "订单号")
private String orderCode;
@ApiModelProperty(position = 16, value = "支付单号")
......@@ -88,6 +92,10 @@ public class KylinOrderTicketVo implements Serializable {
private String agentId;
private Integer isMember;
private String overdueAt;
private String createdAt;
private String updatedAt;
public void setOrderTicket(KylinOrderTickets orderTicket) {
BeanUtils.copyProperties(orderTicket,this);
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayResultVo.java
View file @ 93d853b7
......@@ -14,6 +14,8 @@ public class PayResultVo implements Serializable {
private String order_code;
private Integer status;
private String order_id;
private BigDecimal price;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressBatchesService.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service;
import com.liquidnet.service.kylin.entity.ExpressBatches;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressBatchesService extends IService<ExpressBatches> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressLogsService.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service;
import com.liquidnet.service.kylin.entity.ExpressLogs;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressLogsService extends IService<ExpressLogs> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressTimelinesService.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 快递时间线表 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressTimelinesService extends IService<ExpressTimelines> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IExpressesService.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service;
import com.liquidnet.service.kylin.entity.Expresses;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 快递表 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IExpressesService extends IService<Expresses> {
// void courierList();
// void observer();
// void observerResult();
// void addExpress();
// void editExpress();
// void getExpressCompany();
// void getExpressCompanyEn();
// void innerAddExpress();
// void expressObserveUnSuccess();
// void expressBatchImport();
// void expressImport();
// void expressEdit();
// void expressEditLog();
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderRefundsService.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 订单退款表 服务类
* </p>
*
* @author jiangxiulong
* @since 2021-05-26
*/
public interface IKylinOrderRefundsService extends IService<KylinOrderRefunds> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
View file @ 93d853b7
package com.liquidnet.service.kylin.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.PayAgainParam;
import com.liquidnet.service.kylin.dto.param.PayOrderParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.PayResultVo;
......@@ -21,24 +25,28 @@ import java.util.List;
public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
// 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
ResponseDto<PayResultVo>checkCanOrder(PayOrderParam payOrderParam);
ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
// 下单接口(无订单->待支付->可支付)
ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData);
// 再次支付(待支付->可支付->倒计时结束释放库存)
// 取消支付(待支付->订单失效->释放库存->中断倒计时)
// 再次支付(待支付->可支付->倒计时结束释放库存)
ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
// 支付回调(待支付->已支付->中断倒计时)
String syncOrder(SyncOrderParam syncOrderParam);
// 同步大麦数据接口
// 代理票务 可买状态判断
//订单列表(状态 待支付 已支付 倒计时 已失效)
PageInfo<List<KylinOrderListVo>> orderList(int page,int size);
//订单详情
//TASK 倒计时
boolean checkOrderTime(String userId);
// 下单接口(无订单->待支付->可支付)
// 删除订单
// 代理票务 可买状态判断
// 取消支付(待支付->订单失效->释放库存->中断倒计时)
// ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData,Object adamEntersList);
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/MybatisPlusCodeGenerator.java
View file @ 93d853b7
......@@ -101,7 +101,8 @@ public class MybatisPlusCodeGenerator {
// String[] dbTableArray = new String[]{"kylin_road_shows"};
// String[] dbTableArray = new String[]{"kylin_buy_notice"};
// String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
// String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
String[] dbTableArray = new String[]{"express_batches","express_logs","express_timelines","expresses"};
doGenerator(resourcePath, dsc, directory, dbTableArray);
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressBatches.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ExpressBatches implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 管理员
*/
private Integer adminId;
/**
* 订单Id，订阅前查询
*/
private Integer orderId;
/**
* 订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单
*/
private String orderType;
/**
* 订单编号
*/
private String orderCode;
/**
* 快递公司名称
*/
private String name;
/**
* 快递公司编号
*/
private String company;
/**
* 快递单号
*/
private String number;
/**
* 状态 0新导入 1订阅成功 2订阅失败
*/
private Integer status;
/**
* 导入时间
*/
private LocalDateTime importTime;
/**
* 导入批次
*/
private Integer batch;
/**
* 失败原因
*/
private String reason;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressLogs.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ExpressLogs implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 订单id
*/
private Integer orderId;
/**
* 订单类型 order_product 商品订单 , order_ticket 票务订单
*/
private String orderType;
/**
* 修改人id
*/
private Integer adminId;
/**
* 修改人名称
*/
private String adminName;
/**
* 快递联系人
*/
private String name;
/**
* 快递联系电话
*/
private String mobile;
/**
* 快递收货地址
*/
private String address;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/ExpressTimelines.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 快递时间线表
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ExpressTimelines implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 快递
*/
private Integer expressId;
/**
* 快递消息
*/
private String context;
/**
* 时间，原始格式
*/
private String time;
/**
* 格式化后时间
*/
private LocalDateTime ftime;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/Expresses.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 快递表
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class Expresses implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 管理员
*/
private Integer adminId;
/**
* 订单Id
*/
private Integer orderId;
/**
* 订单编号
*/
private String orderCode;
/**
* 订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单
*/
private String orderType;
/**
* 状态 -1待揽收、0在途中、1已揽收、2疑难、3已签收
*/
private Integer status;
/**
* 快递单号
*/
private String number;
/**
* 快递公司名称
*/
private String name;
/**
* 快递公司编号
*/
private String company;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefunds.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 订单退款表
* </p>
*
* @author jiangxiulong
* @since 2021-05-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinOrderRefunds implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Integer mid;
/**
* order_refunds_id
*/
private String orderRefundsId;
/**
* 演出 id
*/
private String performanceId;
/**
* 商户id
*/
private String merchantId;
/**
* 票务订单id
*/
private String orderId;
/**
* 商品订单id
*/
private String matterId;
/**
* 管理员id
*/
private String adminId;
/**
* 管理员名称
*/
private String adminName;
/**
* 退款原因
*/
private String reason;
/**
* 批次从1开始
*/
private Integer batch;
/**
* 下单方式
*/
private String orderType;
/**
* 选择支付方式
*/
private String payType;
/**
* 实际支付方式
*/
private String paymentType;
/**
* 订单入场人/搭售款式表
*/
private String refundTable;
/**
* 票务/商品/快递费
*/
private String refundType;
/**
* 订单入场人/搭售款式表 id
*/
private String refundTableId;
/**
* 演出/商品 id
*/
private String refundTypeParentId;
/**
* 票种/款式 id
*/
private String refundTypeId;
/**
* 2关闭或者取消退款3正在退款,4已退款
*/
private Integer refundStatus;
/**
* 数量
*/
private Integer refundNumber;
/**
* 退款金额 快递费有可能为负,意思是补差价
*/
private BigDecimal refundPrice;
/**
* 使用了兑换券/优惠券/无使用
*/
private String couponType;
/**
* 优惠券id
*/
private String couponId;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
/**
* 退款备注
*/
private String refundRemark;
/**
* 退款单号
*/
private String refundCode;
/**
* 退款表refunds的id
*/
private String refundId;
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketEntities.java
View file @ 93d853b7
......@@ -123,4 +123,14 @@ public class KylinOrderTicketEntities implements Serializable {
createdAt, updatedAt
};
}
/**
* 获取 支付回调 数据库参数
* @return
*/
public Object[] getSynOrderObject() {
return new Object[]{
orderId, isPayment, updatedAt
};
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketStatus.java
View file @ 93d853b7
......@@ -79,4 +79,14 @@ public class KylinOrderTicketStatus implements Serializable {
};
}
/**
* 获取 支付回调 数据库参数
* @return
*/
public Object[] getSynOrderObject() {
return new Object[]{
orderId, status,payStatus, updatedAt
};
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java
View file @ 93d853b7
......@@ -190,6 +190,7 @@ public class KylinOrderTickets implements Serializable {
/**
* 获取 添加 数据库参数
*
* @return
*/
public Object[] getAddObject() {
......@@ -201,4 +202,26 @@ public class KylinOrderTickets implements Serializable {
};
}
/**
* 获取 再次支付 数据库参数
*
* @return
*/
public Object[] getPayAgainObject() {
return new Object[]{
orderTicketsId, orderType, updatedAt, orderCode
};
}
/**
* 获取 支付回调 数据库参数
*
* @return
*/
public Object[] getSynOrderObject() {
return new Object[]{
orderTicketsId, paymentType, payCode, timePay, qrCode, updatedAt
};
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressBatchesMapper.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.ExpressBatches;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressBatchesMapper extends BaseMapper<ExpressBatches> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressLogsMapper.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.ExpressLogs;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressLogsMapper extends BaseMapper<ExpressLogs> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressTimelinesMapper.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 快递时间线表 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressTimelinesMapper extends BaseMapper<ExpressTimelines> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/ExpressesMapper.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.Expresses;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 快递表 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface ExpressesMapper extends BaseMapper<Expresses> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderRefundsMapper.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 订单退款表 Mapper 接口
* </p>
*
* @author jiangxiulong
* @since 2021-05-26
*/
public interface KylinOrderRefundsMapper extends BaseMapper<KylinOrderRefunds> {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressBatchesMapper.xml 0 → 100644
View file @ 93d853b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressBatchesMapper">
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressLogsMapper.xml 0 → 100644
View file @ 93d853b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressLogsMapper">
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressTimelinesMapper.xml 0 → 100644
View file @ 93d853b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressTimelinesMapper">
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/ExpressesMapper.xml 0 → 100644
View file @ 93d853b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.ExpressesMapper">
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml 0 → 100644
View file @ 93d853b7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper">
</mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/ExpressesController.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 快递表 前端控制器
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@RestController
@RequestMapping("/expresses")
public class ExpressesController {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ 93d853b7
package com.liquidnet.service.kylin.controller;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.PayAgainParam;
import com.liquidnet.service.kylin.dto.param.PayOrderParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.PayResultVo;
import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsServiceImpl;
import io.swagger.annotations.Api;
......@@ -11,6 +15,8 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* <p>
* 订单 前端控制器
......@@ -34,4 +40,32 @@ public class KylinOrderTicketsController {
return orderTicketsService.checkCanOrder(payOrderParam);
}
@PostMapping("payAgain")
@ApiOperation("再次支付")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayResultVo> payAgain(@RequestBody PayAgainParam payAgainParam) {
return orderTicketsService.payAgain(payAgainParam);
}
@PostMapping("syncOrder")
@ApiOperation("支付回调")
@ApiResponse(code = 200, message = "接口返回对象参数")
public String payAgain(@RequestBody SyncOrderParam syncOrderParam) {
return orderTicketsService.syncOrder(syncOrderParam);
}
@GetMapping("list")
@ApiOperation("订单列表")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<List<KylinOrderListVo>>> payAgain(@RequestParam("page") int page,
@RequestParam("size") int size) {
return ResponseDto.success(orderTicketsService.orderList(page,size));
}
@GetMapping("checkOrderTime")
@ApiOperation("订单过期脚本")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Boolean> checkOrderTime() {
return ResponseDto.success(orderTicketsService.checkOrderTime(null));
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @ 93d853b7
......@@ -171,11 +171,11 @@ public class KylinPerformancesController {
@ApiImplicitParam(type = "path", dataType = "String", name = "performancesId", value = "演出id", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isAgent", value = "是否分销 1是 0不是 空/不传/0")
})
public ResponseDto<List<KylinTicketTimesVo>> ticketTimesPartner(
public ResponseDto<HashMap<String, Object>> ticketTimesPartner(
@PathVariable("performancesId") String performancesId,
@RequestParam(defaultValue = "0") Integer isAgent
) {
List<KylinTicketTimesVo> result = kylinPerformancesService.ticketTimesPartner(performancesId, isAgent);
HashMap<String, Object> result = kylinPerformancesService.ticketTimesPartner(performancesId, isAgent);
if (result.size() > 0) {
return ResponseDto.success(result);
} else {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinRefundAdminController.java
View file @ 93d853b7
package com.liquidnet.service.kylin.controller.admin;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.service.impl.admin.KylinRefundPerformancesAdminServiceImpl;
import com.liquidnet.service.kylin.service.impl.admin.KylinRefundsServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -28,18 +28,32 @@ import org.springframework.web.bind.annotation.RestController;
public class KylinRefundAdminController {
@Autowired
private KylinRefundPerformancesAdminServiceImpl kylinRefundPerformancesAdminServiceImpl;
private KylinRefundsServiceImpl kylinRefundsServiceImpl;
@PostMapping("")
@ApiOperation("创建banner")
public ResponseDto<Object> create(@RequestBody @Validated BannersParam bannersParam) {
return ResponseDto.success();
/*Boolean res = kylinRefundAdminServiceImpl.create(bannersParam);
@PostMapping("apply")
@ApiOperation("申请退款")
@ApiImplicitParams({
@ApiImplicitParam(type = "body", dataType = "String", name = "orderTicketsId", value = "订单id", required = true),
@ApiImplicitParam(type = "body", dataType = "String", name = "orderType", value = "订单order_ticket 商品order_product", required = true),
@ApiImplicitParam(type = "body", dataType = "String", name = "reason", value = "备注", required = true),
@ApiImplicitParam(type = "body", dataType = "String", name = "remark", value = "备注"),
@ApiImplicitParam(type = "body", dataType = "Integer", name = "batch_id", value = "批量id"),
@ApiImplicitParam(type = "body", dataType = "String", name = "refundData", value = "退款数据")
})
public ResponseDto<Object> refundApply(
@RequestBody String orderTicketsId,
@RequestBody String orderType,
@RequestBody String reason,
@RequestBody String remark,
@RequestBody Integer batch_id,
@RequestBody String refundData
) throws Exception {
Boolean res = kylinRefundsServiceImpl.refundApply(orderTicketsId, orderType, reason, remark, batch_id, refundData);
if (res) {
return ResponseDto.success();
} else {
return ResponseDto.failure("添加banner失败");
}*/
return ResponseDto.failure("申请退款失败");
}
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressBatchesServiceImpl.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl;
import com.liquidnet.service.kylin.entity.ExpressBatches;
import com.liquidnet.service.kylin.mapper.ExpressBatchesMapper;
import com.liquidnet.service.kylin.service.IExpressBatchesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Service
public class ExpressBatchesServiceImpl extends ServiceImpl<ExpressBatchesMapper, ExpressBatches> implements IExpressBatchesService {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressLogsServiceImpl.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl;
import com.liquidnet.service.kylin.entity.ExpressLogs;
import com.liquidnet.service.kylin.mapper.ExpressLogsMapper;
import com.liquidnet.service.kylin.service.IExpressLogsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Service
public class ExpressLogsServiceImpl extends ServiceImpl<ExpressLogsMapper, ExpressLogs> implements IExpressLogsService {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressTimelinesServiceImpl.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl;
import com.liquidnet.service.kylin.entity.ExpressTimelines;
import com.liquidnet.service.kylin.mapper.ExpressTimelinesMapper;
import com.liquidnet.service.kylin.service.IExpressTimelinesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 快递时间线表 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Service
public class ExpressTimelinesServiceImpl extends ServiceImpl<ExpressTimelinesMapper, ExpressTimelines> implements IExpressTimelinesService {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/ExpressesServiceImpl.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl;
import com.liquidnet.service.kylin.entity.Expresses;
import com.liquidnet.service.kylin.mapper.ExpressesMapper;
import com.liquidnet.service.kylin.service.IExpressesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 快递表 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Service
public class ExpressesServiceImpl extends ServiceImpl<ExpressesMapper, Expresses> implements IExpressesService {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ 93d853b7
......@@ -213,7 +213,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom) {
KylinPerformanceVo performancesInfo = (KylinPerformanceVo) redisUtil.hget(KylinRedisConst.PERFORMANCES, performancesId);
KylinPerformanceVo performancesInfo = (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES.concat(performancesId));
String roadShowId = "";
if (null == performancesInfo) {
performancesInfo = mongoTemplate.findOne(
......@@ -226,7 +226,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
} else {
roadShowId = performancesInfo.getRoadShowId();
redisUtil.hset(KylinRedisConst.PERFORMANCES, performancesId, performancesInfo);
redisUtil.set(KylinRedisConst.PERFORMANCES.concat(performancesId), performancesInfo);
}
} else {
roadShowId = performancesInfo.getRoadShowId();
......@@ -274,7 +274,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
return performancesInfo;
}
public List<KylinTicketTimesVo> ticketTimesPartner(String performancesId, Integer isAgent) {
public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
List<KylinTicketTimesVo> ticketTimesList = mongoTemplate.find(
Query.query(Criteria.where("performanceId").is(performancesId)),
KylinTicketTimesVo.class,
......@@ -329,7 +329,17 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
partner.setTicketList(ticketList);
}
return ticketTimesList;
KylinPerformanceVo performancesInfo = (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES.concat(performancesId));
HashMap<String, Object> info = new HashMap();
info.put("city_name", performancesInfo.getCityName());
info.put("field_name", performancesInfo.getFieldName());
info.put("title", performancesInfo.getTitle());
HashMap result = new HashMap();
result.put("performancesInfo", info);
result.put("ticketTimesList", ticketTimesList);
return result;
}
public List<KylinPerformanceVo> performanceList(String... performancesIds) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinBannersServiceImpl.java
View file @ 93d853b7
......@@ -121,7 +121,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
// 入缓存
mongoTemplate.insert(kylinBannersVo, KylinBannersVo.class.getSimpleName());
redisUtil.hset(KylinRedisConst.BANNERS, bannersId, kylinBannersVo);
redisUtil.set(KylinRedisConst.BANNERS.concat(bannersId), kylinBannersVo);
return true;
} catch (Exception e) {
......@@ -185,7 +185,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), KylinBannersVo.class));
redisUtil.set(KylinRedisConst.BANNERS.concat(bannersId), JsonUtils.fromJson(doc.toJson(), KylinBannersVo.class));
return true;
} catch (Exception e) {
......@@ -255,8 +255,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
// redis 操作
redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), KylinBannersVo.class));
// redis 操作 后期考虑删除掉 前端取redis不取mongo
redisUtil.set(KylinRedisConst.BANNERS.concat(bannersId), JsonUtils.fromJson(doc.toJson(), KylinBannersVo.class));
return true;
} catch (Exception e) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinOrderRefundsServiceImpl.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl.admin;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 订单退款表 服务实现类
* </p>
*
* @author jiangxiulong
* @since 2021-05-26
*/
@Service
public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsMapper, KylinOrderRefunds> implements IKylinOrderRefundsService {
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinPerformancesAdminServiceImpl.java
View file @ 93d853b7
......@@ -19,9 +19,11 @@ import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -61,7 +63,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
private PerformanceVoTask performanceVoTask;
@Autowired
private RedisUtil redisUtil;
private DataUtils dataUtils;
@Autowired
private KylinPerformancesMapper performancesMapper;
......@@ -164,7 +166,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceVoTask.performanceVoStatus(performancesId);
}
}
redisUtil.hdel(KylinRedisConst.PERFORMANCES, performancesId);
dataUtils.delPerformanceRedis(performancesId);
} else if (status == 4) {
log.info(" PERFORMANCE 演出审核 拒绝");
auditStatus = 2;
......@@ -239,11 +241,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
performanceRelations.setRoadShowId(roadShowId);
performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
//redis TODO 演出缓存
// if(redisUtil.hHasKey(KylinRedisConst.PERFORMANCES,performancesId)){
// redisUtil.hset()
// }
//mongodb
HashMap<String, Object> map = new HashMap<>();
map.put("roadShowId", roadShowId);
......@@ -252,7 +249,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
object
);
redisUtil.hdel(KylinRedisConst.PERFORMANCES, performancesId);
dataUtils.delPerformanceRedis(performancesId);
return true;
} catch (Exception e) {
return false;
......@@ -287,7 +284,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
object2
);
}
redisUtil.del(KylinRedisConst.PERFORMANCES_RECOMMEND);
// dataUtils.delPerformanceRecommendRedis(item.getPerformanceId());
return true;
} catch (Exception e) {
return false;
......@@ -486,7 +483,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
object);
performanceVoTask.performanceVoStatus(performanceId);
redisUtil.hdel(KylinRedisConst.PERFORMANCES, performanceId);
dataUtils.delPerformanceRedis(performanceId);
} else {
HashMap<String, Object> map2 = new HashMap<>();
map2.put("status", 2);
......@@ -553,7 +550,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
object);
redisUtil.hdel(KylinRedisConst.TICKET, ticketId);
dataUtils.delTicketRedis(ticketId);
return true;
} catch (Exception e) {
return false;
......@@ -569,12 +566,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return false;
}
//修改 mysql
if(item.getType().equals("ticket")) {
if (item.getType().equals("ticket")) {
KylinTicketStatus ticketStatus = new KylinTicketStatus();
ticketStatus.setUpdatedAt(updatedAt);
ticketStatus.setSyncDamai(item.getStatus());
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId()));
}else if(item.getType().equals("performance")){
} else if (item.getType().equals("performance")) {
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setUpdatedAt(updatedAt);
performanceStatus.setSyncDamai(item.getStatus());
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundsServiceImpl.java
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl.admin;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.entity.KylinRefundBatches;
import com.liquidnet.service.kylin.entity.KylinRefunds;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.mapper.KylinRefundsMapper;
import com.liquidnet.service.kylin.service.IKylinRefundsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
......@@ -17,4 +24,32 @@ import org.springframework.stereotype.Service;
@Service
public class KylinRefundsServiceImpl extends ServiceImpl<KylinRefundsMapper, KylinRefunds> implements IKylinRefundsService {
@Autowired
private KylinOrderTicketsMapper kylinOrderTicketsMapper;
@Autowired
private KylinRefundsStatusServiceImpl kylinRefundsStatusServiceImpl;
public Boolean refundApply(String orderTicketsId, String orderType, String reason, String remark, Integer batch_id, String refundData) throws Exception {
int count = 0;
if(orderType == "order_ticket"){
count = kylinOrderTicketsMapper.selectCount(
new UpdateWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId).eq("coupon_type2", "full")
);
}
if(count > 0){
throw new Exception("使用满减券 暂不能退款");
}
if (orderType == "order_ticket") { // 票务退款
JsonNode refundDataJson = JsonUtils.fromJson(refundData, JsonNode.class);
JsonNode ticketEntityIds = refundDataJson.get("ticketEntityIds");
int authId = 0;
String authName = "sss";
kylinRefundsStatusServiceImpl.orderTicketRefunding(authId, authName, orderTicketsId, ticketEntityIds, reason, remark, batch_id);
}
return true;
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundsStatusServiceImpl.java 0 → 100644
View file @ 93d853b7
package com.liquidnet.service.kylin.service.impl.admin;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.entity.KylinRefunds;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.mapper.KylinRefundsMapper;
import com.liquidnet.service.kylin.service.IKylinRefundsService;
import org.apache.http.HttpException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
/**
* <p>
* 退款表 服务实现类
* </p>
*
* @author jiaangxiulong
* @since 2021-05-26
*/
@Service
public class KylinRefundsStatusServiceImpl extends ServiceImpl<KylinRefundsMapper, KylinRefunds> implements IKylinRefundsService {
@Autowired
private KylinOrderTicketsMapper kylinOrderTicketsMapper;
@Autowired
private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
@Autowired
private KylinOrderRefundsMapper kylinOrderRefundsMapper;
public void orderTicketRefunding(int authId, String authName, String orderTicketsId, JsonNode ticketEntityIds, String reason, String remark, Integer batch_id) throws HttpException {
/*KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
new UpdateWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
);
KylinOrderTicketStatus orderStatus = kylinOrderTicketStatusMapper.selectOne(
new UpdateWrapper<KylinOrderTicketStatus>().eq("order_id", orderTicketsId)
);
// 订单状态，已支付(其它情况)、已关闭(超时支付、已支付但出票失败等情况)
Integer[] statusArr = {KylinTableStatusConst.STATUS_PAID, KylinTableStatusConst.STATUS_CLOSE, KylinTableStatusConst.STATUS_DELETE};
Set<String> set = new HashSet(Arrays.asList(statusArr));
if (!set.contains(orderStatus.getStatus())) {
throw new HttpException("订单状态信息有误");
}
// 订单支付状态需为已支付
if (orderStatus.getPayStatus() != 1) {
throw new HttpException("订单支付信息有误");
}
// 该订单正在退款或已有退款
int refundingCount = kylinOrderRefundsMapper.selectCount(
new UpdateWrapper<KylinOrderRefunds>().eq("order_id", orderTicketsId)
.eq("order_type", "order_ticket")
.ne("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
);
if (refundingCount > 0) {
throw new HttpException("该订单正在退款或已有退款");
}*/
// 本次退款批次
/*int maxRefundBatch = kylinOrderRefundsMapper.selectCount(
new UpdateWrapper<KylinOrderRefunds>().eq("order_id", orderTicketsId)
.setSql(max)
.ne("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
);
$max_refund_batch = OrderRefund::onWriteConnection()->where('order_id', $order_id)->max('batch');
$batch = $max_refund_batch ? $max_refund_batch + 1 : 1;
# 本次退款总金额
$refund_total_price = 0;*/
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPartnerServiceImpl.java
View file @ 93d853b7
......@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser;
import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -45,7 +46,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Autowired
private MongoConverter mongoConverter;
@Autowired
private RedisUtil redisUtil;
private DataUtils dataUtils;
@Autowired
private KylinCheckUserMapper checkUserMapper;
......@@ -69,7 +70,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
checkUser.setUpdatedAt(LocalDateTime.now());
checkUser.setStatus(0);
checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId));
redisUtil.hdel(KylinRedisConst.CHECK_USER, checkUserId);
dataUtils.delCheckUserRedis(checkUserId);
HashMap<String, Object> map = new HashMap<>();
map.put("status", 0);
......@@ -123,7 +124,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
obj
);
redisUtil.hdel(KylinRedisConst.CHECK_USER, checkUserId);
dataUtils.delCheckUserRedis(checkUserId);
return ResponseDto.success("修改成功");
} catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20103));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPerformancesPartnerServiceImpl.java
View file @ 93d853b7
......@@ -16,6 +16,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPerformancesPartnerService;
import com.liquidnet.service.kylin.utils.DataUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
......@@ -44,16 +45,16 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
@Autowired
private MongoConverter mongoConverter;
@Autowired
private RedisUtil redisUtil;
private DataUtils dataUtils;
@Autowired
private KylinCheckUserPerformancesMapper checkUserPerformancesMapper;
@Override
public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(String merchantId, String checkUserId, int page, int size,String name) {
public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(String merchantId, String checkUserId, int page, int size, String name) {
PageInfo<ChildPerformanceDao> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.childPerformanceList(merchantId, checkUserId,name);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.childPerformanceList(merchantId, checkUserId, name);
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......@@ -62,11 +63,11 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
}
@Override
public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId, String checkUserId, int page, int size,String name) {
public ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId, String checkUserId, int page, int size, String name) {
PageInfo<ChildPerformanceDao> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.unChildPerformanceList(merchantId, checkUserId,name);
List<ChildPerformanceDao> data = checkUserPerformancesMapper.unChildPerformanceList(merchantId, checkUserId, name);
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......@@ -95,7 +96,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(param.getCheckUserId())), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
redisUtil.hdel(KylinRedisConst.CHECK_USER_RELATION, param.getCheckUserId());
dataUtils.delCheckUserRelationRedis(param.getCheckUserId());
return ResponseDto.success("添加成功");
} catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20101));
......@@ -122,7 +123,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
userPerformanceVo.setCheckUserId(checkUserId);
userPerformanceVo.setRelationParams(performanceRelationParamsList);
mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
redisUtil.hdel(KylinRedisConst.CHECK_USER_RELATION, checkUserId);
dataUtils.delCheckUserRelationRedis(checkUserId);
return ResponseDto.success("删除成功");
} catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20102));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap/kylin_order_ticket_entities.properties
View file @ 93d853b7
kylin_order_ticket_entities.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
\ No newline at end of file
kylin_order_ticket_entities.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
kylin_order_ticket_entities.synPay=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap/kylin_order_ticket_status.properties
View file @ 93d853b7
kylin_order_ticket_status.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
\ No newline at end of file
kylin_order_ticket_status.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
kylin_order_ticket_status.synPay=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
kylin_order_ticket_status.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap/kylin_order_tickets.properties
View file @ 93d853b7
kylin_order_ticket.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
\ No newline at end of file
kylin_order_ticket.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
kylin_order_ticket.payAgain=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
kylin_order_ticket.synPay=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
kylin_order_ticket.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?
\ No newline at end of file
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