Merge remote-tracking branch 'origin/new_member' into new_member

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/admin/AdamMemberBuildParam.java

@@ -31,7 +31,8 @@ public class AdamMemberBuildParam implements Serializable {
     private String avatar;
     @ApiModelProperty(required = true, value = "弹窗文案[200]", example = "加入摩登天空会员您可享受到.....")
     @NotBlank(message = "弹窗文案不能为空")
-    private String interestsDetail;
+//    private String interestsDetail;
+    private String noticeInfo;
     @ApiModelProperty(required = true, value = "注意事项[200]", example = "摩登天空会员需注意以下事项.....")
     @NotBlank(message = "注意事项不能为空")
     private String notes;

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

@@ -44,7 +44,7 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable {
     private BigDecimal priceRefund;
     @ApiModelProperty(value = "退款张数")
     private Integer refundNumber;
-    @ApiModelProperty(value = "是否使用优惠卷 exchange/no")
+    @ApiModelProperty(value = "是否使用优惠券 exchange/no")
     private String couponType;
     @ApiModelProperty(value = "取票方式 电子票electronic快递票express")
     private String getTicketType;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -88,7 +88,7 @@ public class AdamMemberAdminController extends BaseController {
                         AdamMember::getLimitation,
                         AdamMember::getLimitbAt,
                         AdamMember::getLimiteAt,
-                        AdamMember::getInterestsDetail,
+                        AdamMember::getNoticeInfo,
                         AdamMember::getNotes,
                         AdamMember::getType,
                         AdamMember::getOnsale,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/common.js

@@ -224,7 +224,6 @@ var refreshItem = function(){
 
 /** 关闭选项卡 */
 var closeItem = function(dataId){
-    console.log(dataId, '这个科技')
 	var topWindow = $(window.parent.document);
 	if($.common.isNotEmpty(dataId)){
 	    window.parent.$.modal.closeLoading();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -929,7 +929,6 @@ var table = {
             },
             // 关闭选项卡
             closeTab: function (dataId) {
-                console.log(dataId, '看看这个是啥')
             	closeItem(dataId);
             },
             // 禁用按钮

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html

@@ -188,7 +188,8 @@
                                     <div class="form-group">
                                         <label class="col-sm-2 control-label">会员弹窗文案：</label>
                                         <div class="col-sm-10">
-                                            <textarea class="form-control text_menber" name="interestsDetail" size="10" th:field="*{interestsDetail}"/>
+<!--                                            <textarea class="form-control text_menber" name="interestsDetail" size="10" th:field="*{interestsDetail}"/>-->
+                                            <textarea class="form-control text_menber" name="noticeInfo" size="10" th:field="*{noticeInfo}"/>
                                         </div>
                                     </div>
                                     <div class="form-group">
@@ -880,10 +881,13 @@
             subTitle:{
                 required:true,
             },
-            limitation:{
-                required:true,
-            },
-            interestsDetail:{
+            // limitation:{
+            //     required:true,
+            // },
+            // interestsDetail:{
+            //     required:true,
+            // },
+            noticeInfo:{
                 required:true,
             },
             notes:{
@@ -900,14 +904,17 @@
             "subTitle": {
                 required: "请输入会员说明",
             },
-            "limitation": {
-                required: "请选择是否限购",
-            },
-            "interestsDetail": {
-                required: "请选择注意事项",
+            // "limitation": {
+            //     required: "请选择是否限购",
+            // },
+            // "interestsDetail": {
+            //     required: "请填写弹窗文案",
+            // },
+            "noticeInfo": {
+                required: "请填写弹窗文案",
             },
             "notes": {
-                required: "请选择是否限购",
+                required: "请填写注意事项",
             },
             "onsale": {
                 required: "请选择是否开售",

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html

@@ -316,7 +316,7 @@
             showId = '';
         }
         if (showId) {
-            useScope = 90;
+            useScope = 80;
             busiName = $('#searchIpt').val();
             busiId = showId;
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon101.html

@@ -64,6 +64,7 @@
 			// updateUrl: prefix + "/edit/{id}",
 			// exportUrl: prefix + "/export",
 			sortName: "createdAt",
+			sortOrder: "desc",
 			modalName: "优先券",
 			columns: [
 				{

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -298,6 +298,10 @@
                     field: 'statusName',
                     title: '退款状态'
                 },
+                {
+                    field: 'mailno',
+                    title: '运单号'
+                },
                 {
                     field: 'refundError',
                     title: '退款结果备注',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberServiceAdminImpl.java

@@ -53,6 +53,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         AdamMember adamMember = new AdamMember();
         BeanUtils.copyProperties(parameter, adamMember);
         adamMember.setLimitation(0);
+        adamMember.setName(adamMember.getTitle());
 //        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 //        adamMember.setLimitbAt(LocalDateTime.parse(parameter.getLimitbAt(), dateTimeFormatter));
 //        adamMember.setLimiteAt(LocalDateTime.parse(parameter.getLimitbAt(), dateTimeFormatter));

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -10,8 +10,7 @@ public class SmsEnum {
         M02("正在现场"),
         M03("新血计划"),
         M04("摩登小家伙"),
-        M05("五百里Live")
-        ;
+        M05("五百里Live");
         private final String val;
 
         ADSignName(String val) {
@@ -65,6 +64,12 @@ public class SmsEnum {
          * - 模版内容:您已成功购买$(name)门票。可至个人中心查看订单http://tcn/ExMir1B。演出$(time)开始。微信关注摩登天空服务号，联系我们。
          */
         SMS_223203737,
+        /**
+         * 购票短信
+         * - 模版内容:您已成功购买${name}门票。可至个人中心查看订单 http://t.cn/ExMlr1B。演出${time}开始。微信关注 摩登天空服务号，获得更多演出资讯。特别提示：下载“正在现场APP”最新版，使用“在场”功能，可结识该场演出中共同观演的在场好友。
+         */
+        SMS_225995308,
         ;
+
     }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml

@@ -99,4 +99,5 @@ global-auth:
     - ${liquidnet.info.context}/webjars/**
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
-    - ${liquidnet.info.context}/candy-coupon/useBack
\ No newline at end of file
+    - ${liquidnet.info.context}/candy-coupon/useBack
+    - ${liquidnet.info.context}/candy-coupon/useBackJxl
\ No newline at end of file

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -76,6 +76,8 @@ public class OrderRefundDao implements Serializable {
 
     private String performanceTitle;
 
+    private String mailno;
+
     public void setStatusName(Integer status){
         this.status=status;
         switch (status){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -34,10 +34,11 @@
         <result column="created_at" property="createdAt"/>
     </resultMap>
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
-        SELECT a.*, b.order_code, b.performance_title
+        SELECT a.*, b.order_code, b.performance_title, d.mailno
         FROM kylin_order_refunds AS a
         JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
         JOIN kylin_order_ticket_relations AS c ON a.order_tickets_id = c.order_id
+        LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
         <where>
             <if test="orderTicketsId!=''">
                 AND a.order_tickets_id = #{orderTicketsId}
@@ -75,7 +76,7 @@
                 </otherwise>
             </choose>
         </where>
-        ORDER BY mid DESC
+        ORDER BY a.mid DESC
     </select>
     <select id="selectRefundingCount" resultType="java.lang.Integer">
         SELECT COUNT(*)

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -313,7 +313,7 @@
         INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
         INNER JOIN kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
 
-        LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3)) AS oe ON oe.order_tickets_id =
+        LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3) AND send_type = 1) AS oe ON oe.order_tickets_id =
         kot.order_tickets_id
         -- LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id =
         -- oer.order_express_id

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -96,7 +96,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
             initUserMobileLocateObjs.add(new Object[]{
                     userInfoVo.getUid(), mobile, 1,
                     mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
-                    cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
+                    mobile, cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
             });
         }
 
@@ -164,7 +164,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 initUserMobileLocateObjs.add(new Object[]{
                         userInfoVo.getUid(), userInfoVo.getMobile(), 1,
                         mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
-                        cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
+                        userInfoVo.getMobile(), cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
                 });
             }
 

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java

 package com.liquidnet.service.candy.controller;
 
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.service.ICandyCouponService;
@@ -15,6 +17,7 @@ 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.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,6 +25,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -202,6 +206,29 @@ public class CandyCouponController {
         return ResponseDto.success();
     }
 
+    @PostMapping("useBackJxl")
+    @ApiOperation("回退券jxl")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "String", name = "uCouponIds", value = "uCouponIds", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "uid", value = "uid", required = true),
+    })
+    public ResponseDto<Boolean> useBackCoupon(
+            @RequestParam("uCouponIds") @NotNull @NotBlank String uCouponIds,
+            @RequestParam("uid") @NotNull @NotBlank String uid
+    ) {
+        BackCouponParam aNew = BackCouponParam.getNew();
+        aNew.setuCouponIds(uCouponIds);
+        aNew.setUid(uid);
+        List<BackCouponParam> backCouponParam = new ArrayList<>();
+        backCouponParam.add(aNew);
+
+        if (backCouponParam.size() > 100) {
+            return ResponseDto.failure("数据量不得大于100");
+        }
+        candyCouponService.useBackCoupon(backCouponParam);
+        return ResponseDto.success();
+    }
+
     //兑换券
     @PostMapping("receive")
     @ApiOperation("领取券")

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -393,19 +393,20 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
 
             if (vo.getCouType() != -1) {
                 redisDataUtils.setCouponByUid(uid, dtoList);
+                LocalDateTime now = LocalDateTime.now();
                 //入库
-                if (dto.getCcouponId() == null) {
+                if (dto.getCcouponId() == null || (null != dto.getCcouponId() && dto.getUsedAt() != null)) {// 是公有券且为使用后退回的券，则更新
                     queueUtils.sendMsgByRedis(
                             MQConst.CandyQueue.COUPON_USE.getKey(),
                             SqlMapping.get("candy_coupon.use",
-                                    LocalDateTime.now(), content, uid, uCouponId
+                                    now, content, uid, uCouponId
                             )
                     );
                 } else {
                     queueUtils.sendMsgByRedis(
                             MQConst.CandyQueue.COUPON_USE.getKey(),
                             SqlMapping.get("candy_coupon.use_insert",
-                                    uCouponId, uid, dto.getCouponId(), LocalDateTime.now(), content
+                                    uCouponId, uid, dto.getCouponId(), dto.getBindAt(), dto.getDuedAt(), now, content, now
                             )
                     );
                 }

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

 #  --  使用券  --
 candy_coupon.use=UPDATE candy_user_coupon SET state = 3 ,used_at = ? , used_for = ?  WHERE uid = ? AND ucoupon_id = ?
-candy_coupon.use_insert=INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id  , used_at , used_for ) VALUE ( ? , ? , 3 , ? , ? ,?  )
+#candy_coupon.use_insert=INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id  , used_at , used_for ) VALUE ( ? , ? , 3 , ? , ? ,?  )
+candy_coupon.use_insert=INSERT INTO candy_user_coupon (ucoupon_id , uid , state , coupon_id  , bind_at, dued_at, used_at , used_for, created_at) VALUE ( ? , ? , 3 , ? , ? , ?, ?, ?, ?)
 #  --  回退券  --
 candy_coupon.back=UPDATE candy_user_coupon SET state = 1 WHERE uid = ? AND ucoupon_id = ?
 #  --  领取券  --

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

@@ -875,6 +875,8 @@ alter table kylin_order_express add express_phone varchar(255) not null default
 alter table kylin_order_express add send_express_address varchar(255) not null default '' comment '退票发货快递地址' after express_phone;
 alter table kylin_order_express add appointment_time varchar(255) not null default '' comment '退票发货快递预约取件时间' after send_express_address;
 
+alter table kylin_order_express add order_refunds_id varchar(255)   NOT NULL DEFAULT '' COMMENT 'order_refunds_id' after order_tickets_id;
+
 drop TABLE if exists `kylin_order_express_fee_info`;
 CREATE TABLE `kylin_order_express_fee_info`
 (

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

@@ -247,11 +247,11 @@ public class KylinOrderTicketsRefundServiceImpl {
 
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
-            String orderRefundId = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice, priceExpress, priceCharges, orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
+            String orderRefundId = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice, priceExpress, priceCharges, orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size(), sendExpressType);
             if (!orderRefundId.isEmpty()) {
                 // 退款申请成功 异步去快递下单
                 if (orderTicketVo.getGetTicketType().equals("express") && sendExpressType > 0) {// 快递票
-                    expressPlace(sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
+                    expressPlace(sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo, orderRefundId);
                 }
 
                 HashMap<String, String> map = CollectionUtil.mapStringString();
@@ -313,7 +313,11 @@ public class KylinOrderTicketsRefundServiceImpl {
     }
 
     @Async
-    public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo) {
+    public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
+        expressContacts = (null == expressContacts) ? "" : expressContacts;
+        expressPhone = (null == expressPhone) ? "" : expressPhone;
+        sendExpressAddress = (null == sendExpressAddress) ? "" : sendExpressAddress;
+        appointmentTime = (null == appointmentTime) ? "" : appointmentTime;
         if (sendExpressType == 1) { // 上门取件
             // 请求下单数据
             Map<String, String> hBody = new HashMap<>();
@@ -345,12 +349,14 @@ public class KylinOrderTicketsRefundServiceImpl {
 
             // 生成签名并请求
             String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/placeOrder");
+            log.info("expressPlaceResult result:[{}]", result);
             HashMap hashMap = new HashMap();
             try {
                 hashMap = JsonUtils.fromJson(result, HashMap.class);
             } catch (Exception e) {
-                log.info("expressPlaceExceptionInfo sendExpressType:[{}], sendExpressAddress:[{}], appointmentTime:[{}], expressNumber:[{}], orderTicketVo:[{}]", sendExpressType, sendExpressAddress, appointmentTime, expressNumber, orderTicketVo);
-                log.error("expressPlaceExceptionError", e);
+                log.info("expressPlaceParams sendExpressType:[{}], expressNumber:[{}], expressContacts:[{}], expressPhone:[{}], sendExpressAddress:[{}], appointmentTime:[{}], orderTicketVo:[{}], performanceVo:[{}]",
+                        sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
+                log.error("expressPlaceFromJsonException e:[{}]", e);
             }
             if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
                 String msg = "";
@@ -359,8 +365,9 @@ public class KylinOrderTicketsRefundServiceImpl {
                 } else {
                     msg = (String) hashMap.get("msg");
                 }
-                log.info("expressPlaceExceptionInfo sendExpressType:[{}], sendExpressAddress:[{}], appointmentTime:[{}], expressNumber:[{}], orderTicketVo:[{}]", sendExpressType, sendExpressAddress, appointmentTime, expressNumber, orderTicketVo);
-                log.error("expressPlaceResultError", msg);
+                log.info("expressPlaceParams sendExpressType:[{}], expressNumber:[{}], expressContacts:[{}], expressPhone:[{}], sendExpressAddress:[{}], appointmentTime:[{}], orderTicketVo:[{}], performanceVo:[{}]",
+                        sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
+                log.error("expressPlaceResultError msg:[{}]", msg);
             } else {
                 HashMap hashMapResult = (HashMap) hashMap.get("result");
                 // 生成预快递单 REDIS 队列入数据库
@@ -368,10 +375,18 @@ public class KylinOrderTicketsRefundServiceImpl {
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                String remark = (String) hashMapResult.get("remark");
+                String proName = (String) hashMapResult.get("proName");
+                String goodsValueTotal = (String) hashMapResult.get("goodsValueTotal");
+                String goodsNumber = (String) hashMapResult.get("goodsNumber");
+                remark = (null == remark) ? "" : remark;
+                proName = (null == proName) ? "" : proName;
+                goodsValueTotal = (null == goodsValueTotal) ? "" : goodsValueTotal;
+                goodsNumber = (null == goodsNumber) ? "" : goodsNumber;
                 sqlsDataA.add(new Object[]{
-                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), hashMapResult.get("remark"), KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId, OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
                         , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
-                        , hashMapResult.get("proName"), hashMapResult.get("cargoTypeCode"), hashMapResult.get("limitTypeCode"), hashMapResult.get("expressTypeCode"), hashMapResult.get("goodsValueTotal"), hashMapResult.get("goodsNumber")
+                        , proName, hashMapResult.get("cargoTypeCode"), hashMapResult.get("limitTypeCode"), hashMapResult.get("expressTypeCode"), goodsValueTotal, goodsNumber
                         , now
                 });
                 queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_REFUND_EXPRESS.getKey(),
@@ -389,13 +404,13 @@ public class KylinOrderTicketsRefundServiceImpl {
         } else if (sendExpressType == 2) { // 自主发货
             // 生成预快递单 REDIS 队列入数据库
             String orderExpressId = IDGenerator.nextSnowId();
-            String OrderExpressCode = "NEWUR" + orderExpressId;
+            String OrderExpressCode = "NOWUR" + orderExpressId;
             LocalDateTime now = LocalDateTime.now();
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
             sqlsDataA.add(new Object[]{
-                    orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), OrderExpressCode, expressNumber, expressType, "", "", KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                    orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId, OrderExpressCode, expressNumber, expressType, "", "", KylinTableStatusConst.ORDER_EXPRESS_STATUS2
                     , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
                     , "", "", "", "", "", ""
                     , now

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

@@ -60,7 +60,8 @@ public class KylinRefundsStatusServiceImpl {
             String picList,
             String uid,
             String username,
-            int refundCount
+            int refundCount,
+            Integer sendExpressType
     ) {
         try {
             LocalDateTime time = LocalDateTime.now();
@@ -110,7 +111,11 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefunds.setPriceExpress(priceExpress);
             kylinOrderRefunds.setPriceCharges(priceCharges);
             kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
-            kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY);
+            if (orderInfo.getGetTicketType().equals("express") && sendExpressType > 0) {// 快递票
+                kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY3);
+            } else {
+                kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY2);
+            }
             kylinOrderRefunds.setApplicantId(uid);
             kylinOrderRefunds.setApplicantName(username);
             kylinOrderRefunds.setApplicantAt(time);

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

@@ -72,13 +72,13 @@ public class HttpsUtils {
             HttpPost httpPost = new HttpPost(url);
             // 设置头信息
 
-            if (CollectionUtils.isEmpty(header)) {
+            if (!CollectionUtils.isEmpty(header)) {
                 for (Map.Entry<String, String> entry : header.entrySet()) {
                     httpPost.addHeader(entry.getKey(), entry.getValue());
                 }
             }
             // 设置请求参数
-            if (CollectionUtils.isEmpty(param)) {
+            if (!CollectionUtils.isEmpty(param)) {
                 List<NameValuePair> formparams = new ArrayList<NameValuePair>();
                 for (Map.Entry<String, String> entry : param.entrySet()) {
                     //给参数赋值

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

@@ -73,6 +73,7 @@ public class ShunfengSignUtils {
         Map<String, String> querys = new HashMap<>();
         try {
             HttpEntity httpEntity = new StringEntity(body, "utf-8");
+            log.info("generateSignatureAndRequestNew body:[{}], headers:[{}]", body, headers);
             String post = HttpsUtils.post(URL + url, headers, querys, httpEntity);
             return post;
         } catch (Exception e) {

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

@@ -31,7 +31,7 @@ kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_pay
 kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,price_charges,status,type,applicant_id,applicant_name,applicant_at,reason,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
-kylin_order_refund.refundOrderExpress=INSERT INTO kylin_order_express (order_express_id,performances_id,order_tickets_id,order_express_code,mailno,express_type,filter_result,remark,express_status,send_type,send_express_type,express_contacts,express_phone,send_express_address,appointment_time,pro_name,cargo_type_code,limit_type_code,express_type_code,goods_value_total,goods_number,created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_refund.refundOrderExpress=INSERT INTO kylin_order_express (order_express_id,performances_id,order_tickets_id,order_refunds_id,order_express_code,mailno,express_type,filter_result,remark,express_status,send_type,send_express_type,express_contacts,express_phone,send_express_address,appointment_time,pro_name,cargo_type_code,limit_type_code,express_type_code,goods_value_total,goods_number,created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------用户发起订单退款撤回----------------------------
 kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -193,7 +193,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             int ticketMemberLimit = ticketData.getLimitCountMember();//会员票种限购
             int performanceLimit = performanceData.getLimitCount();//普通演出限购
 //            int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
-            int performanceMemberLimit = 0;//会员演出限购
+            int performanceMemberLimit = 1;//会员演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
             if (!canBuyStatus.contains(performanceData.getAppStatus())) {
@@ -905,9 +905,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 SmsEnum.ADTemplate adTemplate = null;
                 if (orderTicketData.getGetTicketType().equals("express")) {
-                    adTemplate = SmsEnum.ADTemplate.SMS_223203737;
+                    adTemplate = SmsEnum.ADTemplate.SMS_225995308;
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
-                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_223203737 : SmsEnum.ADTemplate.SMS_223203737;
+                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_225995308 : SmsEnum.ADTemplate.SMS_225995308;
                 }
 
                 if (null != adTemplate) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -217,7 +217,7 @@ public class KylinRefundsStatusServiceImpl {
         dataUtils.delOrderRefundVo(refundInfo.getOrderRefundsId());
         dataUtils.delOrderRefundVoByOrderId(refundInfo.getOrderTicketsId());
 
-        if (refundInfo.getType() == KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY) {
+        if (refundInfo.getType() != KylinTableStatusConst.ORDER_REFUND_TYPE_AUTO) {
             // 退还库存
             for (String entitiesId : orderTicketEntitiesIdsArr) {
                 KylinOrderTicketEntities entitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(
@@ -229,7 +229,7 @@ public class KylinRefundsStatusServiceImpl {
                     dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
                 }
             }
-            // 退所有优惠券 提前购优惠卷不退
+            // 退所有优惠券 提前购优惠券不退
             if (newStatus == KylinTableStatusConst.ORDER_STATUS4) {
                 KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderRelations.getPerformanceId());
                 if (performanceVo.getIsRefundVoucher() > 0) {