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

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

 package com.liquidnet.service.kylin.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 
 /**
  * <p>
@@ -12,5 +10,5 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
  * @since 2021-05-26
  */
 public interface IKylinOrderRefundsService  {
-
+    String getOrderRefundCode(String orderRefundCode,int type);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/order/OrderSwitchAdminController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.order;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
+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.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotNull;
+
+@Api(tags = "ORDER 订单号")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("order/switch")
+public class OrderSwitchAdminController {
+    @Autowired
+    IKylinOrderRefundsService kylinOrderRefundsService;
+
+    @RequiresPermissions("order:switch:search:code")
+    @ApiOperation(value = "开放/限制校验证码")
+    @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 = ""),
+    })
+    @PostMapping("search/code")
+    public ResponseDto<Object> loginSmsSwitch(@RequestParam @NotNull String code,@RequestParam @NotNull int type) {
+        String codeNum = kylinOrderRefundsService.getOrderRefundCode(code,type);
+        if(codeNum==null){
+            return ResponseDto.success("未查询到");
+        }else{
+            return ResponseDto.success(codeNum);
+        }
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html

@@ -35,6 +35,7 @@
                             <li>
                                 <label>购买方式：</label>
                                 <select name="mode" th:with="type=${@dict.getType('zhengzai_buy_mode')}">
+                                    <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>

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

@@ -466,4 +466,25 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
 
         return refundOrderDetailsVo;
     }
+
+    @Override
+    public String getOrderRefundCode(String code,int type) {
+        String orderCode = null;
+        if(type==1){
+            KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code",code));
+            if(data==null){
+                return null;
+            }else{
+                orderCode = data.getOrderRefundCode();
+            }
+        }else if(type==2){
+            KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code",code));
+            if(data==null){
+                return null;
+            }else{
+                orderCode = data.getOrderCode();
+            }
+        }
+        return orderCode;
+    }
 }

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

@@ -218,7 +218,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                     LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
                     if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("")
-                            && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) == 0) {
+                            && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0) {
                         vo.setIsCanRefund(1);
                     } else {
                         vo.setIsCanRefund(0);
@@ -297,6 +297,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
+            orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
 
             BeanUtils.copyProperties(orderTicketVo, vo);
             vo.setIsTrueName(performanceVo.getIsTrueName());
@@ -320,7 +321,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
+            orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length()-10));
             KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
+            kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length()-10));
+            kylinOrderRefundsVoBase.setRefundCode(kylinOrderRefundsVoBase.getRefundCode().substring(kylinOrderRefundsVoBase.getRefundCode().length()-10));
             vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
             vo.setOrderTicketVo(orderTicketVo);
             return ResponseDto.success(vo);

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

@@ -71,4 +71,9 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
             return false;
         }
     }
+
+    @Override
+    public String getOrderRefundCode(String orderRefundCode,int type) {
+        return null;
+    }
 }

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

@@ -104,4 +104,8 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
         return "success";
     }
 
+    @Override
+    public String getOrderRefundCode(String orderRefundCode,int type) {
+        return null;
+    }
 }