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

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

@@ -119,6 +119,7 @@ public class KylinOrderRefundsVo implements Serializable {
 
     private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVoList;
     private List<KylinOrderRefundPicVo> orderRefundPicVos;
+    private List<String> picList;
 
     public void setStatus(Integer status){
         try {

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

@@ -52,6 +52,22 @@
             <label class="col-sm-2 control-label">执行备注：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.refuse}"></div>
         </div>
+
+        <div class="form-group">
+            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+                <legend>图片</legend>
+            </fieldset>
+            <table class="col-sm-8 select-table table-bordered">
+                <tbody>
+                <tr>
+                    <td th:each="str : ${KylinOrderRefundsVo.picList}" style="float: left">
+                        <img th:src="${str}" width="25%">
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
         <div class="form-group">
             <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
                 <legend>票种</legend>
@@ -81,4 +97,4 @@
 </div>
 <th:block th:include="include :: footer"/>
 </body>
-</html>
\ No newline at end of file
+</html>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.utils.DateUtils;
@@ -19,6 +20,7 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
+import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
@@ -79,6 +81,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
     @Autowired
     private KylinOrderRefundsEntitiesMapper kylinOrderRefundsEntitiesMapper;
 
+    @Autowired
+    private KylinOrderRefundPicMapper kylinOrderRefundPicMapper;
+
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
@@ -198,8 +203,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 ticketEntityIds, realRefundPriceList
         );
 
-        HashMap<String,Object> map = new HashMap<>();
-        map.put("isHaveRefundDetails",1);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("isHaveRefundDetails", 1);
         BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
@@ -367,6 +372,12 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
         kylinOrderRefundsVo.setEntities(entities);
         BeanUtils.copyProperties(data, kylinOrderRefundsVo);
+        KylinOrderRefundPic kylinOrderRefundPic = kylinOrderRefundPicMapper.selectOne(new UpdateWrapper<KylinOrderRefundPic>().eq("order_refunds_id", orderRefundId));
+        if (kylinOrderRefundPic != null) {
+            String picStr = kylinOrderRefundPic.getPicUrl();
+            List<String> strList = JsonUtils.fromJson(picStr, new TypeReference<List<String>>() {});
+            kylinOrderRefundsVo.setPicList(strList);
+        }
 
         return kylinOrderRefundsVo;
     }

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

-package com.liquidnet.service.kylin.utils;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.MD5;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.security.MessageDigest;
-import java.time.LocalDateTime;
-
-@Service
-@Slf4j
-public class OtherUtils {
-
-    @Value("${liquidnet.url-service.url}")
-    private String serviceUrl;
-
-    //发短信
-    public boolean sendMessage(String mobile, MessageDataVo data, MessageConfigVo configVo, Integer sign_id) {
-        try {
-            if (null != configVo && null != configVo.getStatus() && configVo.getStatus()) {
-                LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<>();
-                httpData.add("mobile", mobile);
-                httpData.add("templateId", configVo.getId());
-                httpData.add("signId", sign_id.toString());
-                httpData.add("data", JsonUtils.toJson(data));
-                String sign = Ksort(httpData);
-                sign = sign.concat("&key=").concat("R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V");
-                sign = sign.toUpperCase();
-                httpData.add("sign", sign);
-
-                System.out.println("data = = = "+httpData.toString());
-
-                String returnData = HttpUtil.post(serviceUrl + "sendSmsMessage", httpData);
-                JsonNode postResultNew = JsonUtils.fromJson(returnData, JsonNode.class);
-                if (!postResultNew.get("message").toString().equals("OK")) {
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public String Ksort(MultiValueMap<String, String> map) {
-        String sb = "";
-        String[] key = new String[map.size()];
-        int index = 0;
-        for (String k : map.keySet()) {
-            key[index] = k;
-            index++;
-        }
-        for (String s : key) {
-            sb += s + "=" + map.get(s).get(0) + "&";
-        }
-        sb = sb.substring(0, sb.length() - 1);
-        // 将得到的字符串进行处理得到目标格式的字符串
-        try {
-            sb = URLDecoder.decode(sb, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }// 使用常见的UTF-8编码
-        sb = sb.replace("%3D", "=").replace("%26", "&");
-        return sb;
-    }
-
-    public static String md5s(String txt) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            md.update(txt.getBytes("GBK"));    //问题主要出在这里，Java的字符串是unicode编码，不受源码文件的编码影响；而PHP的编码是和源码文件的编码一致，受源码编码影响。
-            StringBuilder buf = new StringBuilder();
-            for (byte b : md.digest()) {
-                buf.append(String.format("%02x", b & 0xff));
-            }
-            return buf.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

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

@@ -852,7 +852,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
                     configVo.setId(ticketData.getIsShowCode() == 1 ? "SMS_171358560" : "SMS_181500419");
                 }
-//            otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
+                otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
 
                 // 大麦回调
                 sycDamaiOrder(orderTickets.getOrderTicketsId());

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

@@ -38,7 +38,7 @@ public class OtherUtils {
 
                 System.out.println("data = = = "+httpData.toString());
 
-                String returnData = HttpUtil.post(serviceUrl + "sendSmsMessage", httpData);
+                String returnData = HttpUtil.post(serviceUrl + "sendSmsMessageJ", httpData);
                 JsonNode postResultNew = JsonUtils.fromJson(returnData, JsonNode.class);
                 if (!postResultNew.get("message").toString().equals("OK")) {
                     return false;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -408,6 +408,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                             ticketSellTime.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEnd()));
                             ticketSellTime.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()));
                             ticketSellTime.setAdvanceMinuteMember(null);
+                            ticketSellTime.setTimeEndExpress(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEndExpress()));
                             ticketSellTime.setPayCountdownMinute(kylinPerformanceMisVo.getPayCountdownMinute());
                             //修改 价格
                             ticketSellTime.setPrice(ticketItem.getPrice());