|
@@ -7,6 +7,7 @@ import com.izouma.nineth.config.SandPayProperties;
|
|
|
import com.izouma.nineth.domain.GiftOrder;
|
|
import com.izouma.nineth.domain.GiftOrder;
|
|
|
import com.izouma.nineth.domain.MintOrder;
|
|
import com.izouma.nineth.domain.MintOrder;
|
|
|
import com.izouma.nineth.domain.Order;
|
|
import com.izouma.nineth.domain.Order;
|
|
|
|
|
+import com.izouma.nineth.enums.CollectionSource;
|
|
|
import com.izouma.nineth.enums.MintOrderStatus;
|
|
import com.izouma.nineth.enums.MintOrderStatus;
|
|
|
import com.izouma.nineth.enums.OrderStatus;
|
|
import com.izouma.nineth.enums.OrderStatus;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
@@ -262,6 +263,9 @@ public class SandPayService {
|
|
|
if (order.getStatus() != OrderStatus.NOT_PAID) {
|
|
if (order.getStatus() != OrderStatus.NOT_PAID) {
|
|
|
throw new BusinessException("订单状态错误");
|
|
throw new BusinessException("订单状态错误");
|
|
|
}
|
|
}
|
|
|
|
|
+ if (order.getSource().equals(CollectionSource.TRANSFER)) {
|
|
|
|
|
+ throw new BusinessException("二级市场暂未开放");
|
|
|
|
|
+ }
|
|
|
JSONObject extend = new JSONObject();
|
|
JSONObject extend = new JSONObject();
|
|
|
extend.put("type", "order");
|
|
extend.put("type", "order");
|
|
|
extend.put("id", orderId);
|
|
extend.put("id", orderId);
|
|
@@ -431,7 +435,6 @@ public class SandPayService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
public JSONObject transfer(String id, String name, String bank, BigDecimal amount) {
|
|
public JSONObject transfer(String id, String name, String bank, BigDecimal amount) {
|
|
|
JSONObject request = new JSONObject();
|
|
JSONObject request = new JSONObject();
|
|
|
DecimalFormat df = new DecimalFormat("000000000000", DecimalFormatSymbols.getInstance(Locale.US));
|
|
DecimalFormat df = new DecimalFormat("000000000000", DecimalFormatSymbols.getInstance(Locale.US));
|