提交 admin 退款详情

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-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());