修改预支付， service 层支持。

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

@@ -8,7 +8,7 @@ import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import javax.servlet.http.HttpServletRequest;
 
 public interface IDragonOrdersService {
-    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
+    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto,boolean function);
 
     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);
+        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto,false);
         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) {
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto,boolean function) {
         //设置支付编号
         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

@@ -115,7 +115,7 @@ public class PayController {
 //        dragonPayBaseReqDto.setCode(code);
         dragonPayBaseReqDto.setCreateDate(createDate);
         dragonPayBaseReqDto.setExpireTime(expireTime);
-        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto);
+        ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto,false);
         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

@@ -19,6 +19,7 @@ import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import com.liquidnet.service.dragon.service.IDragonOrdersService;
 import com.liquidnet.service.dragon.utils.ApplepayUtils;
 import com.liquidnet.service.dragon.utils.DataUtilsDragon;
+import com.liquidnet.service.dragon.utils.ObjectUtilDragon;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -31,6 +32,8 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -56,13 +59,42 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     @Autowired
     private ApplepayImpl applepay;
 
+    /**
+     * 如果直接调用service层方法，boolean 传true
+     * 如果controller调用，boolean传false
+     * @return
+     */
     @Override
-    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto,boolean function) {
+        //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());
         return payChannelStrategyContext.getStrategy(dragonPayBaseReqDto.getPayType()).dragonPay(dragonPayBaseReqDto);
     }
+    public Map validateDragonPay(DragonPayBaseReqDto dragonPayBaseReqDto){
+        HashMap<String, Object> map= ObjectUtilDragon.cloneHashMapStringAndObj();
+        if (dragonPayBaseReqDto.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
+            if (dragonPayBaseReqDto.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || dragonPayBaseReqDto.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
+                if (StringUtil.isEmpty(dragonPayBaseReqDto.getOpenId())) {
+                    map.put("resultStatus",false);
+                    map.put("erro","微信支付openId不能为空!");
+                    return map;
+                }
+            }
+        }
+        if(StringUtil.isNotBlank(dragonPayBaseReqDto.getName())){
+            dragonPayBaseReqDto.setName(dragonPayBaseReqDto.getName().substring(0,32));
+        }
+        dragonPayBaseReqDto.setDetail("正在现场");
+        map.put("resultStatus",true);
+        return map;
+    }
 
     @Override
     public String dragonNotify(HttpServletRequest request,String payType,String deviceFrom) {