Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/enums/PaymentMethodEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 11:06 2018/9/27
+ */
+public enum PaymentMethodEnum implements KeyedNamed {
+    PAY(1,"已付费"),
+    NOT_PAY(0, "未付费");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    PaymentMethodEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static PaymentMethodEnum getEnum(Integer key) {
+        for (PaymentMethodEnum item : PaymentMethodEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        PaymentMethodEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.enums.AuditStatusEnum;
+import com.diagbot.enums.PaymentMethodEnum;
 import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -85,12 +86,13 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "审核状态修改失败");
         }
+        orderDetails.setStatus(PaymentMethodEnum.PAY.getKey());
         Long userId =Long.parseLong(UserUtils.getCurrentPrincipleID());
         OpenedProducts openedProducts =new OpenedProducts();
         openedProducts.setGmtCreate(DateUtil.now());
         openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
         openedProducts.setProductId(orderDetails.getProductId());
-        openedProducts.setUserId(userId);
+        openedProducts.setUserId(orderDetails.getUserId());
         openedProducts.setStartTime(DateUtil.parseDate(auditStatusVO.getStartTime()));
         openedProducts.setEndTime(DateUtil.parseDate(auditStatusVO.getEndTime()));
         openedProducts.setOrderId(productOrder.getId());