|
@@ -13,6 +13,7 @@ import com.ym.mec.collectfee.utils.ShortUrlUtil;
|
|
import com.ym.mec.collectfee.utils.yqpay.*;
|
|
import com.ym.mec.collectfee.utils.yqpay.*;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
|
|
+import org.apache.http.protocol.HTTP;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -183,6 +184,18 @@ public class YqPayController extends BaseController {
|
|
|
|
|
|
Map rqMap = orderService.getPayMap(routingAccount, order, school); //获取支付map
|
|
Map rqMap = orderService.getPayMap(routingAccount, order, school); //获取支付map
|
|
|
|
|
|
|
|
+ //订单金额为0,直接成功
|
|
|
|
+ if(order.getAmount().compareTo(new BigDecimal("0")) <= 0){
|
|
|
|
+ HashMap<String, String> notifyMap = new HashMap<>();
|
|
|
|
+ notifyMap.put("tradeState","1");
|
|
|
|
+ notifyMap.put("merOrderNo",order.getOrderNo());
|
|
|
|
+ notifyMap.put("channelType","10");
|
|
|
|
+ notifyMap.put("orderNo","");
|
|
|
|
+ notifyMap.put("totalMoney","0");
|
|
|
|
+ this.updateOrder(notifyMap);
|
|
|
|
+ return failed(HttpStatus.CREATED,"报名成功");
|
|
|
|
+ }
|
|
|
|
+
|
|
return succeed(rqMap);
|
|
return succeed(rqMap);
|
|
}
|
|
}
|
|
|
|
|