Merge branch 'dev' into test

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

@@ -53,9 +53,12 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
     @ApiModelProperty(value = "退款失败原因")
     private String refundError;
 
-    @ApiModelProperty(value = "退款总金额")
+    @ApiModelProperty(value = "退款票总金额")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "退款快递总金额")
+    private BigDecimal priceExpress;
+
     @ApiModelProperty(value = "退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败")
     private Integer status;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -14,12 +14,17 @@ import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.dto.vo.returns.RefundOrderDetailsVo;
+import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 /**
@@ -207,4 +212,25 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
+    @Autowired
+    IKylinOrderRefundsService kylinOrderRefundsService;
+
+    //    @RequiresPermissions("order:switch:search:code")
+    @ApiOperation(value = "根据截取订单号获取全量订单号")
+    @GetMapping("/search/code")
+    @ResponseBody
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "订单号", example = ""),
+            @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "type", value = "1退款单号 2订单号", example = ""),
+    })
+    public AjaxResult loginSmsSwitch(@NotNull(message = "订单号不能为空") @RequestParam String code,
+                                              @NotNull(message = "类型不能为空") @RequestParam int type) {
+        String codeNum = kylinOrderRefundsService.getOrderRefundCode(code,type);
+        if(codeNum==null){
+            return success("ERROR");
+        }else{
+            return success(codeNum);
+        }
+    }
+
 }

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

@@ -21,8 +21,10 @@
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.RefundId}"></div>
         </div>
         <div class="form-group">
-            <label class="col-sm-2 control-label">退款总金额：</label>
+            <label class="col-sm-2 control-label">退款票总金额：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.price}"></div>
+            <label class="col-sm-2 control-label">退款快递费总金额：</label>
+            <div class="form-control-static" th:text="${KylinOrderRefundsVo.priceExpress}"></div>
             <label class="col-sm-2 control-label">退款状态：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.statusName}"></div>
             <label class="col-sm-2 control-label">成功退款时间：</label>

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

@@ -43,6 +43,26 @@
                 </div>
             </form>
         </div>
+        <div class="col-sm-12 search-collapse">
+            <form id="formId2">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>短订单号：</label>
+                            <input type="text" name="findCode"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="findCode()"><i
+                                    class="fa fa-search"></i>&nbsp;查询</a>
+                        </li>
+                        <li>
+                            <label>长订单号：</label>
+                            <input type="text" name="allCode" readonly/>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:refund:apply">
@@ -98,6 +118,14 @@
 
     var prefix = ctx + "kylin/refund";
 
+    function findCode() {
+        var shortCode = document.getElementsByName("findCode")[0].value;
+        var allCode = document.getElementsByName("allCode")[0];
+        $.operate.get(prefix + "/search/code?code=" + shortCode + "&type=2", function (res) {
+            allCode.value=res.msg;
+        });
+    }
+
     function review(id) {
         var data = '';
         if (id) {
@@ -209,7 +237,11 @@
                 },
                 {
                     field: 'price',
-                    title: '退款总金额'
+                    title: '退票金额'
+                },
+                {
+                    field: 'priceExpress',
+                    title: '退快递费金额'
                 },
                 {
                     field: 'statusName',

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

@@ -406,6 +406,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
                 new QueryWrapper<KylinOrderTickets>().eq("order_code", orderCode)
         );
+        BigDecimal oldPriceExpress = kylinOrderTickets.getPriceExpress();
         // 传的快递费不能大于实际的快递费=（支付的快递费-已退的快递费）
         BigDecimal refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费
                 kylinOrderTickets.getOrderTicketsId(),
@@ -437,7 +438,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                             .eq("order_id", kylinOrderTickets.getOrderTicketsId())
                             .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
             );
-            BigDecimal onePrice = (priceActual.subtract(priceExpress)).divide(BigDecimal.valueOf(allEntitiesCount));//单价
+            BigDecimal onePrice = (priceActual.subtract(oldPriceExpress)).divide(BigDecimal.valueOf(allEntitiesCount));//单价
             for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
                 BigDecimal refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
                         kylinOrderTickets.getOrderTicketsId(),
@@ -474,6 +475,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
     @Override
     public String getOrderRefundCode(String code, int type) {
         String orderCode = null;
+        try {
             if (type == 1) {
                 KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code", code));
                 if (data == null) {
@@ -489,6 +491,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                     orderCode = data.getOrderCode();
                 }
             }
+        }catch (Exception e){
+
+        }
         return orderCode;
     }
 }

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

@@ -26,6 +26,7 @@ public class OrderRefundDao implements Serializable {
     private String refundError;
 
     private BigDecimal price;
+    private BigDecimal priceExpress;
 
     private Integer status;
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -73,19 +73,19 @@ public class SweetAppletController {
     @ApiOperation("时间表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部传 \"\"", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部传 \"\"", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部传 \"\"", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部传 \"\"", required = false),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isSign", value = "是否签名(1是0否)", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = false),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = false),
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
     })
     public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam String manualId,
-                                                           @RequestParam String dateTime,
-                                                           @RequestParam String stage,
+                                                           @RequestParam(required = false) String dateTime,
+                                                           @RequestParam(required = false) String stage,
                                                            @RequestParam Integer isSign,
-                                                           @RequestParam Integer page,
-                                                           @RequestParam Integer size,
+                                                           @RequestParam(required = false) Integer page,
+                                                           @RequestParam(required = false) Integer size,
                                                            @RequestParam String uid) {
 
         List<SweetManualArtistListDto> allReturnArtist = new ArrayList();
@@ -103,7 +103,7 @@ public class SweetAppletController {
             endPosition = (page) * size;
         }
 
-        if (page != null && dateTime.equals("")) {
+        if (page != null && dateTime==null) {
             try {
                 dateTime = data.getDate().get(0);
             } catch (Exception e) {
@@ -120,14 +120,14 @@ public class SweetAppletController {
                 }
             }
 
-            if (!dateTime.isEmpty()) {
+            if (dateTime!=null) {
                 if (item.getPerformanceStart().contains(dateTime)) {
                     //保留
                     isSave = true;
                 }
             }
 
-            if (!stage.isEmpty()) {
+            if (stage!=null) {
                 if (item.getTitle().equalsIgnoreCase(stage)) {
                     //保留
                     isSave = true;