修改传参。

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrdersService.java

@@ -8,12 +8,7 @@ import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import javax.servlet.http.HttpServletRequest;
 
 public interface IDragonOrdersService {
-    /**
-     * 如果直接调用service层方法，boolean 传true
-     * 如果controller调用，boolean传false
-     * @return
-     */
-    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto,boolean function);
+    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
 
     String dragonNotify(HttpServletRequest request,String payType,String deviceFrom);
 

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -115,7 +115,7 @@ public class PayController {
 //        dragonPayBaseReqDto.setCode(code);
         dragonPayBaseReqDto.setCreateDate(createDate);
         dragonPayBaseReqDto.setExpireTime(expireTime);
-        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto,false);
+        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto);
         log.info("PayController->dragonPay->总耗时:{}", (System.currentTimeMillis() - startTime) + "毫秒");
         return responseDto;
     }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrdersServiceImpl.java

@@ -54,7 +54,7 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     private ApplepayImpl applepay;
 
     @Override
-    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto,boolean function) {
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
         //设置支付编号
         dragonPayBaseReqDto.setCode(IDGenerator.payCode());
         log.info("dragon:dragonPay:req:dragonPayBaseReqDto : {}",dragonPayBaseReqDto.toString());

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

 package com.liquidnet.service.dragon.controller;
 
-import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
@@ -81,13 +79,13 @@ public class PayController {
             @RequestParam(value = "authCode", required = false) String authCode) {
         long startTime = System.currentTimeMillis();
         //为什么在js和applet中才需要判断open_id?
-        if (payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
+        /*if (payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
             if (deviceFrom.equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || deviceFrom.equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
                 if (StringUtil.isEmpty(openId)) {
                     return ResponseDto.failure("微信支付openId不能为空!");
                 }
             }
-        }
+        }*/
         DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
         dragonPayBaseReqDto.setPayType(payType);
         dragonPayBaseReqDto.setDeviceFrom(deviceFrom);
@@ -95,9 +93,9 @@ public class PayController {
         dragonPayBaseReqDto.setType(type);
         dragonPayBaseReqDto.setPrice(price);
         dragonPayBaseReqDto.setAuthCode(authCode);
-        if(StringUtil.isNotNull(name)&&name.length()>=32){
+      /*  if(StringUtil.isNotNull(name)&&name.length()>=32){
             name = name.substring(0,32);
-        }
+        }*/
         dragonPayBaseReqDto.setName(name);
 //        if(StringUtil.isNotNull(detail)&&detail.length()>=64){
 //            detail = detail.substring(0,64);
@@ -115,7 +113,7 @@ public class PayController {
 //        dragonPayBaseReqDto.setCode(code);
         dragonPayBaseReqDto.setCreateDate(createDate);
         dragonPayBaseReqDto.setExpireTime(expireTime);
-        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto,false);
+        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto);
         log.info("PayController->dragonPay->总耗时:{}", (System.currentTimeMillis() - startTime) + "毫秒");
         return responseDto;
     }

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

@@ -59,19 +59,12 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     @Autowired
     private ApplepayImpl applepay;
 
-    /**
-     * 如果直接调用service层方法，boolean 传true
-     * 如果controller调用，boolean传false
-     * @return
-     */
     @Override
-    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto,boolean function) {
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
         //service层进行效验
-        if(function){
         if(!(boolean)validateDragonPay(dragonPayBaseReqDto).get("resultStatus")){
             return ResponseDto.failure("微信支付openId不能为空!");
         }
-        }
         //设置支付编号
         dragonPayBaseReqDto.setCode(IDGenerator.payCode());
         log.info("dragon:dragonPay:req:dragonPayBaseReqDto : {}",dragonPayBaseReqDto.toString());