Просмотр исходного кода

//tt tttest

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
1ea768764e
2 измененных файлов: 40 добавлений и 82 удалений
  1. +40
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +0
    -82
      mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java

+ 40
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -2,6 +2,8 @@ package com.iformall.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.AuthIgnore;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
@@ -10,6 +12,7 @@ import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.dto.OrderSaveDto;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCouponCVo;
import com.iformall.domain.vo.WxOrderCouponPressVo;
import com.iformall.domain.vo.WxOrderCouponVo;
@@ -18,7 +21,9 @@ import com.iformall.exception.MallinkException;
import com.iformall.service.*;
import com.iformall.service.order.OrderFactory;
import com.iformall.service.order.entity.WxComposeOrder;
import com.iformall.service.pay.entity.PayExtraParam;
import com.iformall.utils.Constant;
import com.iformall.utils.IPUtil;
import com.iformall.utils.RedisLock;

import io.swagger.annotations.Api;
@@ -675,4 +680,39 @@ public class WxOrderController extends BaseController {
return new ResultData(refundOrder);
}

// @AuthIgnore
// @TenantIgnore
// @ApiOperation("")
// @GetMapping("getgettest")
// public ResultData getgettest() {
// // 下订单
// OrderSaveDto orderSaveDto = new OrderSaveDto();
// orderSaveDto.setCouponChannelId(695062636554543104l);
//
// List<OrderComposeSaveDto> list = new ArrayList<>();
// OrderComposeSaveDto dto = new OrderComposeSaveDto();
// dto.setSignleOrder(orderSaveDto);
// dto.setCount(1);
// list.add(dto);
//
// TenantEntity tenantEntity = new TenantEntity();
// tenantEntity.setTenantId("1028");
// Long userId = 678037072832552960l;
// String openid = "2d8d04fd-bfbe-4c32-90c6-6831861c9852";
// ResultData resultData = wxOrderService.composeSaveOrder(false, EnumComposeOrder.SINGLE, list, userId, EnumPayWay.PAY_WAY_TT, tenantEntity);
// WxComposeOrder data = (WxComposeOrder) resultData.data;
//
// WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantEntity, EnumAppPlat.TOUTIAO);
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,tenantEntity.getFinalTenantId());
//
// WxPayOrder record = new WxPayOrder();
// record.setOrderId(data.getMainOrderId());
// record.setOpenId(openid);
// record.setComposeOrder(data.getComposeOrderType());
//
// ResultData openId = wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, EnumPayWay.PAY_WAY_TT, new PayExtraParam("openId", openid));
//
// return openId;
// }

}

+ 0
- 82
mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java Просмотреть файл

@@ -261,89 +261,7 @@ public class OrderSnapshot extends TenantEntity {
}
return false;
}
public boolean validDate(boolean isShare,boolean hasShareAmount,Date curr) {
Map retMap = calcuteValidDate(isShare, hasShareAmount, curr);
int success = (int) retMap.get("success");
if (success > 0) {
return true;
}else {
return false;
}
}
public Date getRealValidDate(boolean isShare,boolean hasShareAmount,Date curr) {
Map retMap = calcuteValidDate(isShare,hasShareAmount,curr);
return (Date) retMap.get("realDate");
}

private Map calcuteValidDate(boolean isShare,boolean hasShareAmount,Date curr) {
int limit_days = Constant.WX_LIMIT_DAYS;
int success = 1;
Date valid_date = null;
if (this.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode()) ||
this.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) {

if( this.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){
valid_date = this.getPickEndDate();
}else{
valid_date = this.getValidEndDate();
}
if (this.getSalePrice() > 0 && !this.checkIsCard()) {
if (hasShareAmount) {
if (isShare) {
// 分账有价券核销有效期不能大于分账过期时间
Date limit_date = DateUtils.getTimeAfterDays(limit_days, curr);
if (valid_date.after(limit_date)) {
valid_date = limit_date;
success = 0;
}
}
}
}
} else {
if (this.getSalePrice() > 0 && !this.checkIsCard()) {
if (hasShareAmount) {
// 分账有价券核销有效期不能大于分账过期时间
if (isShare) {
if (this.getValidDays() < Constant.WX_LIMIT_DAYS) {
limit_days = this.getValidDays();
}else {
success = 0;
}
}else {
limit_days = this.getValidDays();
}
}else{
limit_days = this.getValidDays();
}
} else {
limit_days = this.getValidDays();
}
valid_date = DateUtils.getTimeAfterDays(limit_days, curr);
}
Map retMap = new HashMap();
retMap.put("success", success);
retMap.put("realDate", valid_date);
return retMap;
}
public Date getOuterRealValidDate(Date curr) {
int limit_days = Constant.WX_LIMIT_DAYS;
Date valid_date = null;
if (this.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode())) {
if( this.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){
valid_date = this.getPickEndDate();
}else{
valid_date = this.getValidEndDate();
}
} else {
limit_days = this.getValidDays();
valid_date = DateUtils.getTimeAfterDays(limit_days, curr);
}
return valid_date;
}

public List<WxCoupon> getGiftCouponList(){
if(StringUtils.isNotBlank(giftList)){


Загрузка…
Отмена
Сохранить