Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/java/com/ym/mec/collectfee/CollectFeeServerApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
@@ -16,6 +17,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 @EnableFeignClients
 @EnableSwagger2
+@EnableScheduling
 public class CollectFeeServerApplication {
 
 	public static void main(String[] args) {

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -66,6 +66,8 @@ public class YqPayController extends BaseController {
         order.setCreateTime(new Date()); //订单提交时间
         order.setStatus(1); //订单状态
 
+        orderService.insert(order);
+
         //获取支付成功跟支付中的订单数
         int branchId = order.getBranchId();
         int payOrderNums = orderService.getPayOrderNums();

src/main/java/com/ym/mec/collectfee/entity/Order.java

@@ -22,7 +22,7 @@ public class Order {
 	private Integer oid;
 
 	/** 订单号。订单流水号 */
-	@ApiModelProperty(name = "branchId", value = "分部id", hidden = false)
+	@ApiModelProperty(name = "branchId", value = "分部id",required = true)
 	private Integer branchId;
 
 	/**自己系统订单号 */
@@ -106,11 +106,11 @@ public class Order {
 	private String musicalInstruments;
 
 	/** 辅件 */
-	@ApiModelProperty(name = "adjunct", value = "辅件-价格json（以json内容）")
+	@ApiModelProperty(name = "adjunct", value = "辅件-价格（以json内容）")
 	private String adjunct;
 
 	/** 其他 */
-	@ApiModelProperty(name = "other", value = "其他-价格json（以json内容）")
+	@ApiModelProperty(name = "other", value = "其他-价格（以json内容）")
 	private String other;