Skip to content

O
order-group
Commit b39abcea by 周晓航
Options

Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' into qa 

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
parents 618b99fd 921fdc25
Showing with 324 additions and 21 deletions
order-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivitysDtoNew.java 0 → 100644
package cn.freemud.entities.dto.activity;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/6/23 下午9:24
* @description :
*/
@Data
public class ActivitysDtoNew {
/**
* 活动号
*/
private String activityId;
/**
* 活动名称
*/
private String activityName;
/**
* 活动弹窗图片
*/
private String activityPicture;
/**
* 跳转类型:0:无 5:跳转页面 10:外部小程序 15:跳转商品 20:跳转H5
*/
private String redirectType;
/**
* 跳转页面5和20跳转外部H5对应的路径或者URL
*/
private String redirectPage;
/**
* 跳转商品对象
*/
private GoodsConfig goodsConfig;
/**
* 跳转小程序对象
*/
private MicroProgramConfig microProgramConfig;
@Data
@NoArgsConstructor
static class GoodsConfig {
/**
* 跳转商品ID
*/
private String goodsId;
/**
* 跳转商品名称
*/
private String goodsName;
/**
* 跳转商品价格,单位分
*/
private String price;
}
@Data
@NoArgsConstructor
static class MicroProgramConfig {
/**
* 跳转小程序ID
*/
private String appId;
/**
* 跳转小程序跳转路径
*/
private String redirectUrl;
}
}
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDtoNew.java 0 → 100644
package cn.freemud.entities.dto.activity;
import cn.freemud.entities.vo.PayGiftCouponVo;
import cn.freemud.entities.vo.PayGiftWechatCouponInfoVo;
import lombok.Data;
import java.util.List;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/6/23 下午9:22
* @description :
*/
@Data
public class PayGiftCheckAndJoinResponseDtoNew {
/**
* 发送方式
* 0-静默发送
* 5-手动发送
*/
private Integer sendType;
/**
* 活动类型 支付有礼-6
*/
private String type;
/**
* 奖励类型：0-非码券，2-微信商家券，3-弹窗奖励
*/
private String syncWechat;
/**
* 微信发券插件对象
*/
private PayGiftWechatCouponInfoVo wechatCouponInfo;
/**
* 券列表
*/
private List<PayGiftCouponVo> coupons;
/**
*活动及弹窗奖励的集合
*/
private List<ActivitysDtoNew> activitys;
}
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseObj.java 0 → 100644
package cn.freemud.entities.dto.activity;
import lombok.Data;
import java.util.List;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2021/6/24 上午11:20
* @description :
*/
@Data
public class PayGiftCheckAndJoinResponseObj {
private PayGiftCheckAndJoinResponseDto oldPayGift;
private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
}
order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftCouponVo.java
...@@ -6,7 +6,7 @@ import lombok.Data; ...@@ -6,7 +6,7 @@ import lombok.Data;
public class PayGiftCouponVo { public class PayGiftCouponVo {
/** /**
* 优惠券类型 0-商品券 1-代金券 2-折扣券 * 优惠券类型 0-商品券 1-代金券 3-折扣券 4-换购券 5-配送券
*/ */
private Integer couponType; private Integer couponType;
/** /**
...@@ -29,7 +29,10 @@ public class PayGiftCouponVo { ...@@ -29,7 +29,10 @@ public class PayGiftCouponVo {
* 抵扣金额 * 抵扣金额
*/ */
private Integer discountAmount; private Integer discountAmount;
// 废弃
private String validityPeriodEnd; private String validityPeriodEnd;
// 废弃
private String validityPeriodStart; private String validityPeriodStart;
/** /**
* 有效期 2019.01.12-2019.02.12 * 有效期 2019.01.12-2019.02.12
...@@ -44,4 +47,9 @@ public class PayGiftCouponVo { ...@@ -44,4 +47,9 @@ public class PayGiftCouponVo {
* 券log * 券log
*/ */
private String logo; private String logo;
/**
* 起用金额
*/
private String minAmount;
} }
order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftWechatCouponInfoVo.java
...@@ -22,5 +22,7 @@ public class PayGiftWechatCouponInfoVo { ...@@ -22,5 +22,7 @@ public class PayGiftWechatCouponInfoVo {
private String stock_id; private String stock_id;
//发券凭证 //发券凭证
private String out_request_no; private String out_request_no;
// 券code，如果批次是发放时指定code的类型，则发券时必填
private String coupon_code;
} }
} }
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
...@@ -14,6 +14,7 @@ package cn.freemud.entities.vo; ...@@ -14,6 +14,7 @@ package cn.freemud.entities.vo;
import cn.freemud.entities.dto.PromotionMessageDto; import cn.freemud.entities.dto.PromotionMessageDto;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto; import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
import cn.freemud.entities.dto.promotion.QueryHistoryGroupVO; import cn.freemud.entities.dto.promotion.QueryHistoryGroupVO;
import cn.freemud.entities.dto.promotion.QuerySpellGroupVo; import cn.freemud.entities.dto.promotion.QuerySpellGroupVo;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
...@@ -640,4 +641,8 @@ public class QueryOrderResponseVo { ...@@ -640,4 +641,8 @@ public class QueryOrderResponseVo {
*/ */
private boolean orderCompareAfterSaleOrder; private boolean orderCompareAfterSaleOrder;
/**
* 【订单聚合层】总部和区域活动可同时生效 直接反馈促销给的活动数据
*/
private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
} }
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -28,8 +28,7 @@ import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse; ...@@ -28,8 +28,7 @@ import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse;
import cn.freemud.entities.dto.PayAccessResponse; import cn.freemud.entities.dto.PayAccessResponse;
import cn.freemud.entities.dto.*; import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean; import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto; import cn.freemud.entities.dto.activity.*;
import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
import cn.freemud.entities.dto.delivery.OrderRemindRequestDto; import cn.freemud.entities.dto.delivery.OrderRemindRequestDto;
import cn.freemud.entities.dto.delivery.QueryDeliveryAmountResponseDto; import cn.freemud.entities.dto.delivery.QueryDeliveryAmountResponseDto;
import cn.freemud.entities.dto.delivery.QueryLocusRiderTrackDto; import cn.freemud.entities.dto.delivery.QueryLocusRiderTrackDto;
...@@ -1323,28 +1322,153 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1323,28 +1322,153 @@ public class OrderServiceImpl implements Orderservice {
payGitRequestDto.setVer(1); payGitRequestDto.setVer(1);
} }
BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto); // BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
//fisherman 【ID1032306】 【订单聚合层】总部和区域活动可同时生效
BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
ApiLog.info("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) { if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult(); PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
//版本前 原参数保留，暂不变更 PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();
//防止牵扯其他服务返回参数结构引起异常 // fisherman 版本前 原参数保留，暂不变更 向下兼容
queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName()); if (oldPayGift != null) {
queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons()); queryOrderResponseVo.setActivityName(oldPayGift.getActivityName());
queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo()); queryOrderResponseVo.setCoupons(oldPayGift.getCoupons());
queryOrderResponseVo.setWechatCouponInfo(oldPayGift.getWechatCouponInfo());
//20201223本次变更-》去掉set，直接以对象进行返参 queryOrderResponseVo.setPayGiftReps(oldPayGift);
queryOrderResponseVo.setPayGiftReps(payGiftResponse); }
// queryOrderResponseVo.setActivityNo(payGiftResponse.getActivityNo()); //queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
// queryOrderResponseVo.setSyncWechat(payGiftResponse.getSyncWechat()); queryOrderResponseVo.setNewPayGift(getDemoData());
// queryOrderResponseVo.setActivityPicture(payGiftResponse.getActivityPicture());
// queryOrderResponseVo.setRedirectType(payGiftResponse.getRedirectType());
// queryOrderResponseVo.setGoodsConfig(payGiftResponse.getGoodsConfig());
// queryOrderResponseVo.setMicroProgramConfig(payGiftResponse.getMicroProgramConfig());
// queryOrderResponseVo.setRedirectPage(payGiftResponse.getRedirectPage());
// queryOrderResponseVo.setActivitySendType(payGiftResponse.getSendType());
} }
} }
private List<PayGiftCheckAndJoinResponseDtoNew> getDemoData() {
List<PayGiftCheckAndJoinResponseDtoNew> list = new ArrayList<>();
PayGiftCheckAndJoinResponseDtoNew demo1 = new PayGiftCheckAndJoinResponseDtoNew();
demo1.setSendType(0);
demo1.setType("6");
demo1.setSyncWechat("0");
PayGiftWechatCouponInfoVo demo11 = new PayGiftWechatCouponInfoVo();
demo11.setSend_coupon_merchant("发券商户号");
demo11.setSend_coupon_params(new ArrayList<>());
demo11.setSign("this is sign");
demo1.setWechatCouponInfo(demo11);
List<PayGiftCouponVo> demo111 =new ArrayList<>();
for (int i = 0; i < 2; i++) {
PayGiftCouponVo vo = new PayGiftCouponVo();
vo.setCouponType(i);
vo.setActivityCode(i+"");
vo.setCouponCode(i+"");
vo.setCouponName(i+"");
vo.setExpiryTime(i+"");
vo.setDiscountAmount(i);
vo.setEffectiveData(i+"");
vo.setBenefitRebate(i+"");
vo.setLogo(i+"");
vo.setMinAmount(i+"");
demo111.add(vo);
}
demo1.setCoupons(demo111);
List<ActivitysDtoNew> demo1111 =new ArrayList<>();
for (int i = 0; i < 2; i++) {
ActivitysDtoNew vo = new ActivitysDtoNew();
vo.setActivityId(i+"");
vo.setActivityName(i+"");
vo.setActivityPicture(i+"");
vo.setRedirectType(5+"");
vo.setRedirectPage(i+"");
demo1111.add(vo);
}
demo1.setActivitys(demo1111);
list.add(demo1);
// ==========
PayGiftCheckAndJoinResponseDtoNew demo2 = new PayGiftCheckAndJoinResponseDtoNew();
demo2.setSendType(5);
demo2.setType("6");
demo2.setSyncWechat("2");
PayGiftWechatCouponInfoVo demo22 = new PayGiftWechatCouponInfoVo();
demo22.setSend_coupon_merchant("发券商户号");
demo22.setSend_coupon_params(new ArrayList<>());
demo22.setSign("this is sign");
demo2.setWechatCouponInfo(demo22);
List<PayGiftCouponVo> demo222 =new ArrayList<>();
for (int i = 0; i < 2; i++) {
PayGiftCouponVo vo = new PayGiftCouponVo();
vo.setCouponType(i);
vo.setActivityCode(i+"");
vo.setCouponCode(i+"");
vo.setCouponName(i+"");
vo.setExpiryTime(i+"");
vo.setDiscountAmount(i);
vo.setEffectiveData(i+"");
vo.setBenefitRebate(i+"");
vo.setLogo(i+"");
vo.setMinAmount(i+"");
demo222.add(vo);
}
demo2.setCoupons(demo222);
List<ActivitysDtoNew> demo2222 =new ArrayList<>();
for (int i = 0; i < 2; i++) {
ActivitysDtoNew vo = new ActivitysDtoNew();
vo.setActivityId(i+"");
vo.setActivityName(i+"");
vo.setActivityPicture(i+"");
vo.setRedirectType(5+"");
vo.setRedirectPage(i+"");
demo2222.add(vo);
}
demo2.setActivitys(demo2222);
list.add(demo2);
PayGiftCheckAndJoinResponseDtoNew demo3 = new PayGiftCheckAndJoinResponseDtoNew();
demo3.setSendType(5);
demo3.setType("6");
demo3.setSyncWechat("2");
PayGiftWechatCouponInfoVo demo33 = new PayGiftWechatCouponInfoVo();
demo33.setSend_coupon_merchant("发券商户号");
demo33.setSend_coupon_params(new ArrayList<>());
demo33.setSign("this is sign");
demo3.setWechatCouponInfo(demo33);
List<PayGiftCouponVo> demo333 =new ArrayList<>();
for (int i = 0; i < 2; i++) {
PayGiftCouponVo vo = new PayGiftCouponVo();
vo.setCouponType(i);
vo.setActivityCode(i+"");
vo.setCouponCode(i+"");
vo.setCouponName(i+"");
vo.setExpiryTime(i+"");
vo.setDiscountAmount(i);
vo.setEffectiveData(i+"");
vo.setBenefitRebate(i+"");
vo.setLogo(i+"");
vo.setMinAmount(i+"");
demo333.add(vo);
}
demo3.setCoupons(demo333);
List<ActivitysDtoNew> demo3333 =new ArrayList<>();
for (int i = 0; i < 2; i++) {
ActivitysDtoNew vo = new ActivitysDtoNew();
vo.setActivityId(i+"");
vo.setActivityName(i+"");
vo.setActivityPicture(i+"");
vo.setRedirectType(5+"");
vo.setRedirectPage(i+"");
demo3333.add(vo);
}
demo3.setActivitys(demo3333);
list.add(demo3);
return list;
}
private void orderStatusTracking(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderStatusTrackingInfoDto orderStatusTrackingInfoByOid) { private void orderStatusTracking(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderStatusTrackingInfoDto orderStatusTrackingInfoByOid) {
List<OrderStatusTrackingInfoDto.OrderStatusTrackingInfo> data = orderStatusTrackingInfoByOid.getData(); List<OrderStatusTrackingInfoDto.OrderStatusTrackingInfo> data = orderStatusTrackingInfoByOid.getData();
if (CollectionUtils.isNotEmpty(data)) { if (CollectionUtils.isNotEmpty(data)) {
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
...@@ -16,6 +16,8 @@ import cn.freemud.base.entity.BaseResponse; ...@@ -16,6 +16,8 @@ import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.activity.ActivityRequestCommon; import cn.freemud.entities.dto.activity.ActivityRequestCommon;
import cn.freemud.entities.dto.activity.CheckAndJoinResponse; import cn.freemud.entities.dto.activity.CheckAndJoinResponse;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto; import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDtoNew;
import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto; import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -40,4 +42,13 @@ public interface ActivityApplicationClient { ...@@ -40,4 +42,13 @@ public interface ActivityApplicationClient {
public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo); public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo);
/**
* 同享支付有礼活动验证与参与
* @param requestVo
* @return
*/
@PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
} }
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