Merge branch 'hjc_wanqing_fix' into pre

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -87,4 +87,8 @@ public class KylinRedisConst {
 
     public static final String KYLIN_EXPRESS_MODULES = "kylin:express:modules";
     public static final String REDIS_KEY_KYLIN_PERFORM_SUBSCRIBE = "kylin:performSubscribe:uid:";
+
+
+    public static final String REDIS_WQ_ORDER_FIX = "kylin:wq:order:";//纪录万青 订单填写快递地址
+    public static final String REDIS_WQ_ORDER_EXPRESS = "kylin:wq:pxress:order:";//万青补偿快递vo 订单填写快递地址
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/WqTempParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 万青快递补偿param
+ */
+@ApiModel(value = "WqTempParam")
+@Data
+public class WqTempParam {
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "收货人姓名")
+    private String name;
+    @ApiModelProperty(value = "代理id")
+    private String Province;
+    @ApiModelProperty(value = "省份行政编码")
+    private String county;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "收货地址")
+    private String address;
+    @ApiModelProperty(value = "区县")
+    private String phone;
+    @ApiModelProperty(value = "区县行政编码")
+    private String countyId;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/WqTempVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "WqTempVo")
+@Data
+public class WqTempVo implements Cloneable{
+
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "收货人姓名")
+    private String name;
+    @ApiModelProperty(value = "代理id")
+    private String Province;
+    @ApiModelProperty(value = "省份行政编码")
+    private String county;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "收货地址")
+    private String address;
+    @ApiModelProperty(value = "区县")
+    private String phone;
+    @ApiModelProperty(value = "快递单号")
+    private String mailNo;
+    @ApiModelProperty(value = "是否是万青补偿订单")
+    private Integer isTemp;
+
+    private static final WqTempVo obj = new WqTempVo();
+
+    public static WqTempVo getNew() {
+        try {
+            return (WqTempVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new WqTempVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTempService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+
+/**
+ * <p>
+ * 补偿接口 胡佳晨
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-05
+ */
+public interface IKylinTempService {
+
+    ResponseDto<Boolean> setWqRedis(String orderId);
+
+    ResponseDto<Boolean> delWqRedis(String orderId);
+
+    ResponseDto<Boolean> insertWqTempExpress(WqTempParam param);
+
+    ResponseDto<WqTempVo> getWqTempExpress(String orderId);
+
+    ResponseDto<Boolean> updateMailNo(String orderId,String mailNo);
+}

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -48,7 +48,7 @@ public class MQConst {
         SQL_ORDER_WITHDRAW("kylin:stream:rk.order.withdraw", "group.order.withdraw", "订单申请撤回"),
         SQL_ORDER_OVERTIME_REFUND("kylin:stream:rk.order.overtime.refund", "group.order.overtime.refund", "超时支付申请退款"),
         SQL_STATION("kylin:stream:rk.station", "group.station", "验票更新"),
-        SQL_TRANSFER("kylin:stream:rk.transfer", "group.transfer", "订单发起转赠"),
+        SQL_TRANSFER("kylin:stream:rk.transfer", "group.transfer", "订单发起转赠/万青补偿快递"),
         SQL_TRANSFER_RESULT("kylin:stream:rk.transfer.result", "group.transfer.result", "订单结果转赠"),
         SQL_TRANSFER_OVERTIME("kylin:stream:rk.transfer.overtime", "group.transfer.overtime", "订单结果转赠"),
         ;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_wq.sql

+CREATE TABLE `kylin_order_express_ex`
+(
+    `mid`              int unsigned NOT NULL AUTO_INCREMENT,
+    `order_id`         varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
+    `express_contacts` varchar(255) NOT NULL DEFAULT '' COMMENT '收货人',
+    `express_address`  varchar(255) NOT NULL DEFAULT '' COMMENT '收货地址',
+    `province`         varchar(60)  NOT NULL DEFAULT '' COMMENT '省份',
+    `city`             varchar(60)  NOT NULL DEFAULT '' COMMENT '城市',
+    `county`           varchar(60)  NOT NULL DEFAULT '' COMMENT '区县',
+    `express_phone`    varchar(255) NOT NULL DEFAULT '' COMMENT '收货人联系方式',
+    `mail_no`          varchar(255) NOT NULL DEFAULT '' COMMENT '快递单号',
+    `created_at`       datetime     NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`       datetime     NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    KEY `order_id_id` (`order_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci COMMENT '订单-弥补-快递信息';

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/TempController.java

+package com.liquidnet.service.kylin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+import com.liquidnet.service.kylin.service.IKylinTempService;
+import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "补偿接口")
+@RestController
+@RequestMapping("temp")
+@Slf4j
+public class TempController {
+
+    @Autowired
+    private IKylinTempService kylinTempService;
+
+    @PostMapping("tempRedis")
+    @ApiOperation("设置需要填写补偿快递信息的订单id")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "orderId", value = "订单id", required = true),
+    })
+    public ResponseDto<Boolean> setTempRedis(String orderId) {
+        return kylinTempService.setWqRedis(orderId);
+    }
+
+    @DeleteMapping("tempRedis")
+    @ApiOperation("删除需要填写补偿快递信息的订单id")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "orderId", value = "订单id", required = true),
+    })
+    public ResponseDto<Boolean> delTempRedis(String orderId) {
+        return kylinTempService.delWqRedis(orderId);
+    }
+
+    @PutMapping("wqExpress")
+    @ApiOperation("添加万青订单快递信息")
+    public ResponseDto<Boolean> insertWqTempExpress(@RequestBody WqTempParam param) {
+        return kylinTempService.insertWqTempExpress(param);
+    }
+
+    @GetMapping("wqExpress")
+    @ApiOperation("获取万青订单快递信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "orderId", value = "订单id", required = true),
+    })
+    public ResponseDto<WqTempVo> getWqTempVo(String orderId) {
+        return kylinTempService.getWqTempExpress(orderId);
+    }
+
+    @GetMapping("sendMail")
+    @ApiOperation("发货万青订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "orderId", value = "订单id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "mailNo", value = "快递单号", required = true),
+
+    })
+    public ResponseDto<Boolean> updateMailNo(String orderId, String mailNo) {
+        return kylinTempService.updateMailNo(orderId, mailNo);
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/TempServiceImpl.java

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.service.IKylinTempService;
+import com.liquidnet.service.kylin.utils.DataUtils;
+import com.liquidnet.service.kylin.utils.QueueUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * 轮播图 服务实现类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-02
+ */
+@Service
+@Slf4j
+public class TempServiceImpl implements IKylinTempService {
+
+    @Autowired
+    DataUtils dataUtils;
+    @Autowired
+    QueueUtils queueUtils;
+
+    @Override
+    public ResponseDto<Boolean> setWqRedis(String orderId) {
+        try {
+            dataUtils.setWqOrderId(orderId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            log.error("ERROR 添加 万青订单id ", e);
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> delWqRedis(String orderId) {
+        try {
+            dataUtils.delWqOrderId(orderId);
+            return ResponseDto.success();
+        } catch (Exception e) {
+            log.error("ERROR 删除 万青订单id ", e);
+            return ResponseDto.failure();
+        }
+    }
+
+    @Override
+    public ResponseDto<Boolean> insertWqTempExpress(WqTempParam param) {
+        try {
+            String uid = CurrentUtil.getCurrentUid();
+            KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(param.getOrderId());
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
+                if (!orderTicketVo.getUserId().equals(uid)) {
+                    return ResponseDto.failure(ErrorMapping.get("20003"));
+                }
+            }
+
+            Integer isTemp = dataUtils.getWqOrderId(param.getOrderId());
+            if(isTemp == 0){
+                return ResponseDto.failure(ErrorMapping.get("20003"));
+            }
+
+            LocalDateTime now = LocalDateTime.now();
+            //获取用户相关
+            String expressContact = param.getName();
+            String expressAddress = param.getProvince() + param.getCity() + param.getCounty() + param.getAddress();
+            String expressPhone = param.getPhone();
+            String city = param.getCity();
+            String province = param.getProvince();
+            String county = param.getCounty();
+
+            WqTempVo vo = WqTempVo.getNew();
+            vo.setAddress(expressAddress);
+            vo.setCity(city);
+            vo.setCounty(county);
+            vo.setProvince(province);
+            vo.setMailNo("");
+            vo.setName(expressContact);
+            vo.setOrderId(param.getOrderId());
+            vo.setPhone(expressPhone);
+            dataUtils.setWqOrderVo(vo);
+
+            queueUtils.sendMsgByRedis(
+                    MQConst.KylinQueue.SQL_TRANSFER.getKey(),
+                    SqlMapping.get("kylin_order_express_ex.insert",
+                            param.getOrderId(), expressContact, expressAddress,
+                            province, city, county, expressPhone, now));
+        } catch (Exception e) {
+            log.error("ERROR 添加 万青快递 ", e);
+            return ResponseDto.failure();
+        }
+        return ResponseDto.success();
+    }
+
+    @Override
+    public ResponseDto<WqTempVo> getWqTempExpress(String orderId) {
+        String uid = CurrentUtil.getCurrentUid();
+        KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        if (uid.equals("809406") || uid.equals("773650")) {
+        } else {
+            if (!orderTicketVo.getUserId().equals(uid)) {
+                return ResponseDto.failure(ErrorMapping.get("20003"));
+            }
+        }
+        WqTempVo vo = dataUtils.getWqOrderVo(orderId);
+        return ResponseDto.success(vo);
+    }
+
+    @Override
+    public ResponseDto<Boolean> updateMailNo(String orderId, String mailNo) {
+        try {
+            LocalDateTime now = LocalDateTime.now();
+            WqTempVo vo = dataUtils.getWqOrderVo(orderId);
+            vo.setMailNo(mailNo);
+            dataUtils.setWqOrderVo(vo);
+            queueUtils.sendMsgByRedis(
+                    MQConst.KylinQueue.SQL_TRANSFER.getKey(),
+                    SqlMapping.get("kylin_order_express_ex.sendMail",
+                            mailNo, now, orderId));
+            return ResponseDto.success();
+        } catch (Exception e) {
+            log.error("ERROR 万青发货 ", e);
+            return ResponseDto.failure();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll;
@@ -902,4 +903,47 @@ public class DataUtils {
                 .concat(uid);
         redisUtil.del(redisKey);
     }
+
+    //万青补偿id 获取
+    public Integer getWqOrderId(String orderId){
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX.concat(orderId);
+        Object obj = redisUtil.get(rdk);
+        if(obj==null){
+            return 0;
+        }else{
+            return 1;
+        }
+    }
+
+    //万青补偿id 添加
+    public void setWqOrderId(String orderId){
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX.concat(orderId);
+        redisUtil.set(rdk,orderId);
+    }
+
+    //万青补偿id 删除
+    public void delWqOrderId(String orderId){
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX.concat(orderId);
+        redisUtil.del(rdk,orderId);
+    }
+    // 万青补偿vo覆盖
+    public void setWqOrderVo(WqTempVo vo){
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_EXPRESS.concat(vo.getOrderId());
+        redisUtil.set(rdk,vo);
+    }
+    // 万青补偿vo获取
+    public WqTempVo getWqOrderVo(String orderId){
+        String rdk = KylinRedisConst.REDIS_WQ_ORDER_EXPRESS.concat(orderId);
+        Object obj = redisUtil.get(rdk);
+        if(obj==null){
+            WqTempVo vo = WqTempVo.getNew();
+            vo.setIsTemp(getWqOrderId(orderId));
+            return vo;
+        }else{
+            WqTempVo vo = (WqTempVo) obj;
+            vo.setIsTemp(getWqOrderId(orderId));
+            return vo;
+        }
+    }
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -33,3 +33,6 @@ kylin_order_ticket_relation.transfer.update=UPDATE kylin_order_ticket_relations
 kylin_order_refund_entities.supplementEnter=UPDATE kylin_order_ticket_entities SET enter_type = ?,enter_name = ?,enter_mobile = ?,enter_id_code = ?,updated_at = ? WHERE order_ticket_entities_id = ?
 # ------------------------ 演出预约 ----------------------------
 kylin_perform_sub.insert=INSERT INTO kylin_perform_sub (perform_sub_id,performance_id,user_id,user_name,user_mobile,source_type) VALUES (?,?,?,?,?,?)
+# ------------------------ 万青弥补订单 ----------------------------
+kylin_order_express_ex.insert = INSERT INTO kylin_order_express_ex (`order_id`,`express_contacts`,`express_address`,`province`,`city`,`county`,`express_phone`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
+kylin_order_express_ex.sendMail = UPDATE kylin_order_express_ex SET mail_no = ? , updated_at = ? where order_id = ?
\ No newline at end of file