Merge branch 'master' of https://gitee.com/youlaitech/youlai-mall

mall-oms/oms-api/src/main/java/com/youlai/mall/oms/enums/OrderPayTypeEnum.java

+package com.youlai.mall.oms.enums;
+
+import com.youlai.common.base.BaseCodeEnum;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+
+/**
+ * @author huawei
+ * @desc 订单来源类型枚举
+ * @email huawei_code@163.com
+ * @date 2021/1/16
+ */
+@ToString
+@AllArgsConstructor
+public enum OrderPayTypeEnum implements BaseCodeEnum {
+
+    WEIXIN(1, "微信支付"),
+    ALIPAY(2, "支付宝支付"),
+    BALANCE(3, "会员余额支付"),
+    ;
+    public final Integer code;
+
+    public final String desc;
+
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+}

mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/form/OrderPayForm.java

+package com.youlai.mall.oms.pojo.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author huawei
+ * @desc 订单支付表单
+ * @email huawei_code@163.com
+ * @date 2021/2/21
+ */
+@Data
+public class OrderPayForm implements Serializable {
+
+    @NotNull(message = "支付类型不能为空")
+    private Integer payType;
+
+    @NotBlank(message = "订单id不能为空")
+    private String orderId;
+}

mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/vo/PayInfoVO.java

+package com.youlai.mall.oms.pojo.vo;
+
+import com.youlai.common.base.BaseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author huawei
+ * @desc 支付订单详情模型
+ * @email huawei_code@163.com
+ * @date 2021/2/21
+ */
+@ApiModel("支付订单详情模型")
+@Data
+public class PayInfoVO extends BaseVO {
+
+    /**
+     * 支付金额
+     */
+    @ApiModelProperty("支付金额")
+    private Long payPrice;
+
+    /**
+     * 会员余额
+     */
+    @ApiModelProperty("会员余额")
+    private Long balance;
+}

mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/UmsUser.java

@@ -45,7 +45,7 @@ public class UmsUser extends BaseEntity {
     @TableField(exist = false)
     private List<UmsAddress> addressList;
 
-    @TableField(exist = false)
-    private Integer balance;
+//    @TableField(exist = false)
+    private Long balance;
 
 }

mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/dto/MemberDTO.java

@@ -10,4 +10,6 @@ public class MemberDTO {
     private String nickname;
 
     private String mobile;
+
+    private Long balance;
 }