Merge branch 'dev' of http://git.izouma.com/licailing/modern_point into dev

pom.xml

@@ -411,6 +411,12 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>1.1.21</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>2.2.0</version>
+        </dependency>
     </dependencies>
 
 </project>

src/main/java/com/izouma/nineth/annotations/Debounce.java

@@ -0,0 +1,12 @@
+package com.izouma.nineth.annotations;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Debounce {
+    String key();
+
+    long delay() default 200L;
+}

src/main/java/com/izouma/nineth/aspect/DebounceAspect.java

@@ -0,0 +1,71 @@
+package com.izouma.nineth.aspect;
+
+import com.izouma.nineth.annotations.Debounce;
+import com.izouma.nineth.aspect.debounce.DebounceTask;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+@Slf4j
+public class DebounceAspect {
+
+    private DefaultParameterNameDiscoverer nameDiscoverer  = new DefaultParameterNameDiscoverer();
+    private HashMap<String, Future<Void>>  debounceStore   = new HashMap<>();
+    private ScheduledExecutorService       executorService = Executors.newScheduledThreadPool(10);
+    private Map<String, Long>              debounceCounter = new HashMap<>();
+
+    @Pointcut("@annotation(com.izouma.nineth.annotations.Debounce)")
+    public void debouncePointCut() {
+    }
+
+    @Around(value = "debouncePointCut() && @annotation(debounce)")
+    public synchronized void debounce(ProceedingJoinPoint joinPoint, Debounce debounce) {
+        ExpressionParser parser = new SpelExpressionParser();
+        EvaluationContext context = new StandardEvaluationContext(joinPoint.getSignature());
+        MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
+        Method method = methodSignature.getMethod();
+        String[] paramNames = nameDiscoverer.getParameterNames(method);
+        Object[] args = joinPoint.getArgs();
+        for (int i = 0; i < args.length; i++) {
+            context.setVariable(paramNames[i], args[i]);
+        }
+        String key = Optional.ofNullable(parser.parseExpression(debounce.key()).getValue(context)).map(Object::toString)
+                .orElse("default");
+
+        Future<Void> future = debounceStore.get(key);
+        long lastRun = debounceCounter.getOrDefault(key, 0L);
+        if (future != null && !future.isDone()) {
+            if (System.currentTimeMillis() - lastRun > debounce.delay()) {
+                debounceCounter.put(key, System.currentTimeMillis());
+            } else {
+                future.cancel(false);
+            }
+        }
+        debounceStore.put(key, executorService.schedule(new DebounceTask(joinPoint, (Void) -> {
+            debounceCounter.put(key, System.currentTimeMillis());
+            return null;
+        }), debounce.delay(), TimeUnit.MILLISECONDS));
+
+    }
+
+}

src/main/java/com/izouma/nineth/aspect/debounce/DebounceTask.java

@@ -0,0 +1,33 @@
+package com.izouma.nineth.aspect.debounce;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+
+import java.util.concurrent.Callable;
+import java.util.function.Function;
+
+@Slf4j
+public class DebounceTask implements Callable<Void> {
+    private final ProceedingJoinPoint  joinPoint;
+    private final Function<Void, Void> callback;
+
+    public DebounceTask(ProceedingJoinPoint joinPoint, Function<Void, Void> callback) {
+        this.joinPoint = joinPoint;
+        this.callback = callback;
+    }
+
+    @Override
+    public Void call() throws Exception {
+        try {
+            this.joinPoint.proceed();
+            if (this.callback != null) {
+                this.callback.apply(null);
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
+        return null;
+
+    }
+}

src/main/java/com/izouma/nineth/config/AdapayProperties.java

@@ -6,6 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @Data
 @ConfigurationProperties(prefix = "adapay")
 public class AdapayProperties {
+    private String  merchant;
     private String  appId;
     private boolean debug;
     private boolean prod;

src/main/java/com/izouma/nineth/config/EventNames.java

@@ -0,0 +1,5 @@
+package com.izouma.nineth.config;
+
+public class EventNames {
+    public final static String SWITCH_ACCOUNT = "switchAccount";
+}

src/main/java/com/izouma/nineth/config/GeneralProperties.java

@@ -6,9 +6,26 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(prefix = "general")
 @Data
 public class GeneralProperties {
-    private String host;
-    private String contractName;
-    private String name;
-    private String org;
-    private String shortName;
+    private String  host;
+    private String  contractName;
+    private String  name;
+    private String  org;
+    private String  shortName;
+    private String  createOrderGroup;
+    private String  createOrderTopic;
+    private String  updateStockGroup;
+    private String  updateStockTopic;
+    private String  updateSaleGroup;
+    private String  updateSaleTopic;
+    private String  orderNotifyGroup;
+    private String  orderNotifyTopic;
+    private String  mintGroup;
+    private String  mintTopic;
+    private String  updateActivityStockGroup;
+    private String  updateActivityStockTopic;
+    private String  broadcastEventGroup;
+    private String  broadcastEventTopic;
+    private boolean notifyServer;
+    private int     dataCenterId;
+    private int     workerId;
 }

src/main/java/com/izouma/nineth/config/RedisKeys.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.config;
+
+public class RedisKeys {
+    public static final String COLLECTION = "collection::";
+
+    public static final String CREATE_ORDER = "createOrder::";
+
+    public static final String COLLECTION_STOCK = "collectionStock::";
+
+    public static final String COLLECTION_SALE = "collectionSale::";
+
+    public static final String PAY_RECORD = "payRecord::";
+
+    public static final String ORDER_LOCK = "orderLock::";
+
+    public static final String MINT_ACTIVITY_STOCK = "mintActivityStock::";
+
+    public static final String MINT_ORDER_LOCK = "mintOrderLock::";
+
+    public static final String ACTIVITY_PAY_RECORD = "activityPayRecord::";
+}

src/main/java/com/izouma/nineth/config/SnowflakeIdWorkerConfig.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.config;
+
+import com.izouma.nineth.utils.SnowflakeIdWorker;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Slf4j
+public class SnowflakeIdWorkerConfig {
+    @Bean
+    public SnowflakeIdWorker snowflakeIdWorker(GeneralProperties generalProperties) {
+        log.info("init snowflakeIdWorker worker={} dataCenter={}", generalProperties.getWorkerId(), generalProperties.getDataCenterId());
+        return new SnowflakeIdWorker(generalProperties.getWorkerId(), generalProperties.getDataCenterId());
+    }
+}

src/main/java/com/izouma/nineth/domain/ActivityCollection.java

@@ -0,0 +1,51 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.annotations.Searchable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel("活动收集")
+public class ActivityCollection extends BaseEntity {
+    @ApiModelProperty("活动名称")
+    @Searchable
+    private String name;
+
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty("图片")
+    private String pic;
+
+    @ApiModelProperty("藏品名称")
+    private String collectionName;
+
+    @ApiModelProperty("藏品ID")
+    private Long collectionId;
+
+    @ApiModelProperty("藏品数量")
+    private int num;
+
+    @ApiModelProperty("剩余数量")
+    private int stock;
+
+    @ApiModelProperty("发行数量")
+    private int total;
+
+    @ApiModelProperty("领取藏品ID")
+    private Long awardCollectionId;
+
+    @ApiModelProperty("领取藏品名称")
+    private String awardCollectionName;
+
+    private int projectId;
+}

src/main/java/com/izouma/nineth/domain/ActivityMaterial.java

@@ -0,0 +1,44 @@
+package com.izouma.nineth.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.izouma.nineth.converter.FileObjectListConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
+public class ActivityMaterial extends BaseEntity {
+    private Long orderId;
+
+    private Long assetId;
+
+    private Long collectionId;
+
+    private String name;
+
+    @ApiModelProperty("图片")
+    @Convert(converter = FileObjectListConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<FileObject> pic;
+
+    @ApiModelProperty("编号")
+    private Integer number;
+
+    @ApiModelProperty("分类")
+    private String category;
+
+}

src/main/java/com/izouma/nineth/domain/ActivityOrder.java

@@ -0,0 +1,33 @@
+package com.izouma.nineth.domain;
+
+
+import com.izouma.nineth.annotations.Searchable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+public class ActivityOrder extends BaseEntity {
+
+    private Long userId;
+
+    @Searchable
+    private String phone;
+
+    private Long activityCollectionId;
+
+    private String activityCollection;
+
+    @Transient
+    private List<ActivityMaterial> material;
+
+}

src/main/java/com/izouma/nineth/domain/AdapayMerchant.java

@@ -0,0 +1,40 @@
+package com.izouma.nineth.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class AdapayMerchant extends BaseEntity {
+
+    @Column(unique = true, length = 72)
+    private String name;
+
+    @Column(unique = true, length = 72)
+    private String appId;
+
+    private String apiKey;
+
+    private String mockKey;
+
+    @Column(columnDefinition = "TEXT")
+    private String publicKey;
+
+    @Column(columnDefinition = "TEXT")
+    private String privKey;
+
+    private String wxAppId;
+
+    private String status;
+
+    private boolean selected;
+
+}

src/main/java/com/izouma/nineth/domain/AirDrop.java

@@ -15,6 +15,9 @@ import java.util.List;
 
 @Data
 @Entity
+@Table(name = "air_drop", indexes = {
+        @Index(columnList = "name")
+})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

src/main/java/com/izouma/nineth/domain/BaseEntityNoID.java

@@ -0,0 +1,89 @@
+package com.izouma.nineth.domain;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.hibernate.envers.Audited;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@Audited
+@EntityListeners(AuditingEntityListener.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
+public abstract class BaseEntityNoID {
+    @ExcelIgnore
+    @JsonIgnore
+    @CreatedBy
+    private String createdBy;
+
+    @ExcelProperty("创建时间")
+    @JsonIgnore
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @ExcelIgnore
+    @JsonIgnore
+    @LastModifiedBy
+    private String modifiedBy;
+
+    @ExcelIgnore
+    @JsonIgnore
+    @LastModifiedDate
+    private LocalDateTime modifiedAt;
+
+    @ExcelIgnore
+    private boolean del;
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    @JsonProperty("createdAt")
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getModifiedBy() {
+        return modifiedBy;
+    }
+
+    public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public LocalDateTime getModifiedAt() {
+        return modifiedAt;
+    }
+
+    public void setModifiedAt(LocalDateTime modifiedAt) {
+        this.modifiedAt = modifiedAt;
+    }
+
+    public boolean isDel() {
+        return del;
+    }
+
+    public void setDel(boolean del) {
+        this.del = del;
+    }
+}

src/main/java/com/izouma/nineth/domain/Coupon.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.izouma.nineth.converter.LongArrayConverter;
+import com.izouma.nineth.dto.GeneralDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -41,4 +43,7 @@ public class Coupon extends BaseEntity {
     private LocalDateTime expiration;
 
     private int projectId;
+
+    @Transient
+    private List<GeneralDTO> collections;
 }

src/main/java/com/izouma/nineth/domain/ErrorOrder.java

@@ -0,0 +1,26 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.enums.PayMethod;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ErrorOrder extends BaseEntity {
+    private Long orderId;
+
+    private String errorMessage;
+
+    private String transactionId;
+
+    private PayMethod payMethod;
+
+    private String type;
+}

src/main/java/com/izouma/nineth/domain/Order.java

@@ -28,7 +28,10 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @ApiModel("订单")
-public class Order extends BaseEntity {
+public class Order extends BaseEntityNoID {
+
+    @Id
+    private Long id;
 
     @ApiModelProperty("用户ID")
     @Searchable

src/main/java/com/izouma/nineth/domain/User.java

@@ -124,4 +124,15 @@ public class User extends BaseEntity implements Serializable {
     private String inviteCode;
 
     private int minterProjectId;
+
+    @ApiModelProperty(value = "邀请得空投")
+    private Long invitor;
+
+    @Column(columnDefinition = "int(11) default 0")
+    @ApiModelProperty(value = "邀请数量")
+    private int inviteNum = 0;
+
+    @Column(columnDefinition = "int(11) default 0")
+    @ApiModelProperty(value = "获得得空投数量")
+    private int inviteAirDrop = 0;
 }

src/main/java/com/izouma/nineth/dto/GeneralDTO.java

@@ -0,0 +1,10 @@
+package com.izouma.nineth.dto;
+
+import lombok.Data;
+
+@Data
+public class GeneralDTO {
+    private Long id;
+
+    private String name;
+}

src/main/java/com/izouma/nineth/dto/UserBankCard.java

@@ -26,4 +26,10 @@ public class UserBankCard extends BaseEntity {
     private String cardTypeDesc;
 
     private String bankNo;
+
+    private String phone;
+
+    private String realName;
+
+    private String idNo;
 }

src/main/java/com/izouma/nineth/dto/UserRegister.java

@@ -46,4 +46,6 @@ public class UserRegister {
     private int minterProjectId;
 
     private String intro;
+
+    private Long invitor;
 }

src/main/java/com/izouma/nineth/dto/adapay/AccountInfo.java

@@ -0,0 +1,116 @@
+package com.izouma.nineth.dto.adapay;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+public class AccountInfo{
+
+	@JSONField(name="bank_code")
+	private String bankCode;
+
+	@JSONField(name="cert_type")
+	private String certType;
+
+	@JSONField(name="tel_no")
+	private String telNo;
+
+	@JSONField(name="area_code")
+	private String areaCode;
+
+	@JSONField(name="bank_name")
+	private String bankName;
+
+	@JSONField(name="card_name")
+	private String cardName;
+
+	@JSONField(name="cert_id")
+	private String certId;
+
+	@JSONField(name="bank_acct_type")
+	private String bankAcctType;
+
+	@JSONField(name="prov_code")
+	private String provCode;
+
+	@JSONField(name="card_id")
+	private String cardId;
+
+	public void setBankCode(String bankCode){
+		this.bankCode = bankCode;
+	}
+
+	public String getBankCode(){
+		return bankCode;
+	}
+
+	public void setCertType(String certType){
+		this.certType = certType;
+	}
+
+	public String getCertType(){
+		return certType;
+	}
+
+	public void setTelNo(String telNo){
+		this.telNo = telNo;
+	}
+
+	public String getTelNo(){
+		return telNo;
+	}
+
+	public void setAreaCode(String areaCode){
+		this.areaCode = areaCode;
+	}
+
+	public String getAreaCode(){
+		return areaCode;
+	}
+
+	public void setBankName(String bankName){
+		this.bankName = bankName;
+	}
+
+	public String getBankName(){
+		return bankName;
+	}
+
+	public void setCardName(String cardName){
+		this.cardName = cardName;
+	}
+
+	public String getCardName(){
+		return cardName;
+	}
+
+	public void setCertId(String certId){
+		this.certId = certId;
+	}
+
+	public String getCertId(){
+		return certId;
+	}
+
+	public void setBankAcctType(String bankAcctType){
+		this.bankAcctType = bankAcctType;
+	}
+
+	public String getBankAcctType(){
+		return bankAcctType;
+	}
+
+	public void setProvCode(String provCode){
+		this.provCode = provCode;
+	}
+
+	public String getProvCode(){
+		return provCode;
+	}
+
+	public void setCardId(String cardId){
+		this.cardId = cardId;
+	}
+
+	public String getCardId(){
+		return cardId;
+	}
+}

src/main/java/com/izouma/nineth/dto/adapay/DivMembersItem.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.dto.adapay;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class DivMembersItem {
+
+    @JSONField(name = "member_id")
+    private String memberId;
+
+    @JSONField(name = "amount")
+    private String amount;
+
+    @JSONField(name = "fee_flag")
+    private String feeFlag;
+}

src/main/java/com/izouma/nineth/dto/adapay/MemberInfo.java

@@ -0,0 +1,206 @@
+package com.izouma.nineth.dto.adapay;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.util.List;
+
+public class MemberInfo {
+
+    @JSONField(name = "member_id")
+    private String memberId;
+
+    @JSONField(name = "created_time")
+    private String createdTime;
+
+    @JSONField(name = "cert_type")
+    private String certType;
+
+    @JSONField(name = "gender")
+    private String gender;
+
+    @JSONField(name = "identified")
+    private String identified;
+
+    @JSONField(name = "tel_no")
+    private String telNo;
+
+    @JSONField(name = "prod_mode")
+    private String prodMode;
+
+    @JSONField(name = "nickname")
+    private String nickname;
+
+    @JSONField(name = "disabled")
+    private String disabled;
+
+    @JSONField(name = "location")
+    private String location;
+
+    @JSONField(name = "app_id")
+    private String appId;
+
+    @JSONField(name = "settle_accounts")
+    private List<SettleAccountsItem> settleAccounts;
+
+    @JSONField(name = "email")
+    private String email;
+
+    @JSONField(name = "object")
+    private String object;
+
+    @JSONField(name = "status")
+    private String status;
+
+    @JSONField(name = "error_type")
+    private String errorType;
+
+    @JSONField(name = "error_code")
+    private String errorCode;
+
+    @JSONField(name = "error_msg")
+    private String errorMsg;
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCertType(String certType) {
+        this.certType = certType;
+    }
+
+    public String getCertType() {
+        return certType;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setIdentified(String identified) {
+        this.identified = identified;
+    }
+
+    public String getIdentified() {
+        return identified;
+    }
+
+    public void setTelNo(String telNo) {
+        this.telNo = telNo;
+    }
+
+    public String getTelNo() {
+        return telNo;
+    }
+
+    public void setProdMode(String prodMode) {
+        this.prodMode = prodMode;
+    }
+
+    public String getProdMode() {
+        return prodMode;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setDisabled(String disabled) {
+        this.disabled = disabled;
+    }
+
+    public String getDisabled() {
+        return disabled;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setSettleAccounts(List<SettleAccountsItem> settleAccounts) {
+        this.settleAccounts = settleAccounts;
+    }
+
+    public List<SettleAccountsItem> getSettleAccounts() {
+        return settleAccounts;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getErrorType() {
+        return errorType;
+    }
+
+    public void setErrorType(String errorType) {
+        this.errorType = errorType;
+    }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+}

src/main/java/com/izouma/nineth/dto/adapay/PaymentItem.java

@@ -0,0 +1,88 @@
+package com.izouma.nineth.dto.adapay;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PaymentItem {
+
+    @JSONField(name = "order_no")
+    private String orderNo;
+
+    @JSONField(name = "created_time")
+    private String createdTime;
+
+    @JSONField(name = "pay_amt")
+    private String payAmt;
+
+    @JSONField(name = "open_id")
+    private String openId;
+
+    @JSONField(name = "confirmed_amt")
+    private String confirmedAmt;
+
+    @JSONField(name = "end_time")
+    private String endTime;
+
+    @JSONField(name = "fee_mode")
+    private String feeMode;
+
+    @JSONField(name = "coupon_infos")
+    private String couponInfos;
+
+    @JSONField(name = "discount_amt")
+    private String discountAmt;
+
+    @JSONField(name = "cash_pay_amt")
+    private String cashPayAmt;
+
+    @JSONField(name = "reserved_amt")
+    private String reservedAmt;
+
+    @JSONField(name = "out_trans_id")
+    private String outTransId;
+
+    @JSONField(name = "party_order_id")
+    private String partyOrderId;
+
+    @JSONField(name = "pay_mode")
+    private String payMode;
+
+    @JSONField(name = "div_members")
+    private List<DivMembersItem> divMembers;
+
+    @JSONField(name = "refunded_amt")
+    private String refundedAmt;
+
+    @JSONField(name = "prod_mode")
+    private String prodMode;
+
+    @JSONField(name = "pay_channel")
+    private String payChannel;
+
+    @JSONField(name = "has_more")
+    private boolean hasMore;
+
+    @JSONField(name = "id")
+    private String id;
+
+    @JSONField(name = "app_id")
+    private String appId;
+
+    @JSONField(name = "fee_amt")
+    private String feeAmt;
+
+    @JSONField(name = "object")
+    private String object;
+
+    @JSONField(name = "status")
+    private String status;
+
+    @JSONField(name = "error_msg")
+    private String errorMsg;
+
+    @JSONField(name = "error_code")
+    private String errorCode;
+}

src/main/java/com/izouma/nineth/dto/adapay/PaymentList.java

@@ -0,0 +1,28 @@
+package com.izouma.nineth.dto.adapay;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PaymentList {
+
+    @JSONField(name = "payments")
+    private List<PaymentItem> payments;
+
+    @JSONField(name = "prod_mode")
+    private String prodMode;
+
+    @JSONField(name = "has_more")
+    private boolean hasMore;
+
+    @JSONField(name = "app_id")
+    private String appId;
+
+    @JSONField(name = "object")
+    private String object;
+
+    @JSONField(name = "status")
+    private String status;
+}

src/main/java/com/izouma/nineth/dto/adapay/SettleAccountsItem.java

@@ -0,0 +1,94 @@
+package com.izouma.nineth.dto.adapay;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+public class SettleAccountsItem{
+
+	@JSONField(name="member_id")
+	private String memberId;
+
+	@JSONField(name="upd_ts")
+	private long updTs;
+
+	@JSONField(name="account_info")
+	private AccountInfo accountInfo;
+
+	@JSONField(name="channel")
+	private String channel;
+
+	@JSONField(name="id")
+	private String id;
+
+	@JSONField(name="type")
+	private String type;
+
+	@JSONField(name="app_id")
+	private String appId;
+
+	@JSONField(name="cre_ts")
+	private long creTs;
+
+	public void setMemberId(String memberId){
+		this.memberId = memberId;
+	}
+
+	public String getMemberId(){
+		return memberId;
+	}
+
+	public void setUpdTs(long updTs){
+		this.updTs = updTs;
+	}
+
+	public long getUpdTs(){
+		return updTs;
+	}
+
+	public void setAccountInfo(AccountInfo accountInfo){
+		this.accountInfo = accountInfo;
+	}
+
+	public AccountInfo getAccountInfo(){
+		return accountInfo;
+	}
+
+	public void setChannel(String channel){
+		this.channel = channel;
+	}
+
+	public String getChannel(){
+		return channel;
+	}
+
+	public void setId(String id){
+		this.id = id;
+	}
+
+	public String getId(){
+		return id;
+	}
+
+	public void setType(String type){
+		this.type = type;
+	}
+
+	public String getType(){
+		return type;
+	}
+
+	public void setAppId(String appId){
+		this.appId = appId;
+	}
+
+	public String getAppId(){
+		return appId;
+	}
+
+	public void setCreTs(long creTs){
+		this.creTs = creTs;
+	}
+
+	public long getCreTs(){
+		return creTs;
+	}
+}

src/main/java/com/izouma/nineth/event/CreateOrderEvent.java

@@ -0,0 +1,28 @@
+package com.izouma.nineth.event;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CreateOrderEvent implements Serializable {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    collectionId;
+    private int     qty;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    addressId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    userCouponId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    invitor;
+}

src/main/java/com/izouma/nineth/event/OrderNotifyEvent.java

@@ -0,0 +1,21 @@
+package com.izouma.nineth.event;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.izouma.nineth.enums.PayMethod;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderNotifyEvent implements Serializable {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long      orderId;
+    private PayMethod payMethod;
+    private String    transactionId;
+    private long      time;
+}

src/main/java/com/izouma/nineth/listener/BroadcastEventListener.java

@@ -0,0 +1,43 @@
+package com.izouma.nineth.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.izouma.nineth.config.EventNames;
+import com.izouma.nineth.service.AdapayMerchantService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.MessageModel;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        messageModel = MessageModel.BROADCASTING,
+        consumerGroup = "${general.broadcast-event-group}",
+        topic = "${general.broadcast-event-topic}",
+        consumeMode = ConsumeMode.CONCURRENTLY)
+public class BroadcastEventListener implements RocketMQListener<JSONObject> {
+    private AdapayMerchantService adapayMerchantService;
+
+    @Override
+    public void onMessage(JSONObject message) {
+        log.info("接收到广播事件 {}", JSONObject.toJSONString(message, SerializerFeature.PrettyFormat));
+        String name = message.getString("name");
+        if (name != null) {
+            switch (name) {
+                case EventNames.SWITCH_ACCOUNT:
+                    try {
+                        Long id = message.getLong("data");
+                        adapayMerchantService.select(id);
+                    } catch (Exception e) {
+                        log.error("event error", e);
+                    }
+                    break;
+            }
+        }
+    }
+}

src/main/java/com/izouma/nineth/listener/CreateOrderListener.java

@@ -0,0 +1,52 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.config.RedisKeys;
+import com.izouma.nineth.domain.Order;
+import com.izouma.nineth.event.CreateOrderEvent;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.service.OrderService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.create-order-group}",
+        topic = "${general.create-order-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+//@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
+    private OrderService                  orderService;
+    private RedisTemplate<String, Object> redisTemplate;
+
+    @Override
+    public void onMessage(CreateOrderEvent event) {
+        log.info("收到订单创建消息: {}", event.getId());
+        Map<String, Object> map = new HashMap<>();
+        try {
+            Order order = orderService.create(event.getUserId(), event.getCollectionId(), event.getQty(),
+                    event.getAddressId(), event.getUserCouponId(), event.getInvitor(), event.getId());
+            map.put("success", true);
+            map.put("data", order);
+        } catch (Exception e) {
+            if (e instanceof BusinessException) {
+                log.error("订单创建失败 {}", e.getMessage());
+            } else {
+                log.error("订单创建失败", e);
+            }
+            map.put("success", false);
+            map.put("data", e.getMessage());
+        }
+        redisTemplate.boundValueOps(RedisKeys.CREATE_ORDER + event.getId()).set(map, 1, TimeUnit.DAYS);
+    }
+}

src/main/java/com/izouma/nineth/listener/MintListener.java

@@ -0,0 +1,30 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.service.AssetMintService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.mint-group}",
+        topic = "${general.mint-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+//@ConditionalOnProperty(value = "general.notify-server", havingValue = "true")
+public class MintListener implements RocketMQListener<Long> {
+    private AssetMintService assetMintService;
+
+    @Override
+    public void onMessage(Long assetId) {
+        try {
+            assetMintService.mint(assetId);
+        } catch (Exception e) {
+            log.error("铸造失败 " + assetId, e);
+        }
+    }
+}

src/main/java/com/izouma/nineth/listener/OrderNotifyListener.java

@@ -0,0 +1,27 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.event.OrderNotifyEvent;
+import com.izouma.nineth.service.OrderService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.order-notify-group}",
+        topic = "${general.order-notify-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+//@ConditionalOnProperty(value = "general.notify-server", havingValue = "true")
+public class OrderNotifyListener implements RocketMQListener<OrderNotifyEvent> {
+    private OrderService orderService;
+
+    @Override
+    public void onMessage(OrderNotifyEvent e) {
+        orderService.notifyOrder(e.getOrderId(), e.getPayMethod(), e.getTransactionId());
+    }
+}

src/main/java/com/izouma/nineth/listener/UpdateActivityStockListener.java

@@ -0,0 +1,28 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.service.ActivityCollectionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.update-activity-stock-group}",
+        topic = "${general.update-activity-stock-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+public class UpdateActivityStockListener implements RocketMQListener<Long> {
+
+    private ActivityCollectionService activityCollectionService;
+
+    @Override
+    public void onMessage(Long id) {
+        activityCollectionService.syncStock(id);
+    }
+}

src/main/java/com/izouma/nineth/listener/UpdateSaleListener.java

@@ -0,0 +1,27 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.service.CollectionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.update-sale-group}",
+        topic = "${general.update-sale-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+//@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+public class UpdateSaleListener implements RocketMQListener<Long> {
+
+    private CollectionService collectionService;
+
+    @Override
+    public void onMessage(Long id) {
+        collectionService.syncSale(id);
+    }
+}

src/main/java/com/izouma/nineth/listener/UpdateStockListener.java

@@ -0,0 +1,27 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.service.CollectionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.update-stock-group}",
+        topic = "${general.update-stock-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+//@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+public class UpdateStockListener implements RocketMQListener<Long> {
+
+    private CollectionService collectionService;
+
+    @Override
+    public void onMessage(Long id) {
+        collectionService.syncStock(id);
+    }
+}

src/main/java/com/izouma/nineth/repo/ActivityCollectionRepo.java

@@ -0,0 +1,24 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityCollection;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityCollectionRepo extends JpaRepository<ActivityCollection, Long>, JpaSpecificationExecutor<ActivityCollection> {
+    @Query("update ActivityCollection t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    @Query("select c.stock from ActivityCollection c where c.id = ?1")
+    Integer getStock(Long id);
+
+    @Query("update ActivityCollection c set c.stock = ?2 where c.id = ?1")
+    @Transactional
+    @Modifying
+    int updateStock(Long id, int stock);
+}

src/main/java/com/izouma/nineth/repo/ActivityMaterialRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityMaterialRepo extends JpaRepository<ActivityMaterial, Long>, JpaSpecificationExecutor<ActivityMaterial> {
+    @Query("update ActivityMaterial t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/ActivityOrderRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityOrderRepo extends JpaRepository<ActivityOrder, Long>, JpaSpecificationExecutor<ActivityOrder> {
+    @Query("update ActivityOrder t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/AdapayMerchantRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.AdapayMerchant;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface AdapayMerchantRepo extends JpaRepository<AdapayMerchant, Long>, JpaSpecificationExecutor<AdapayMerchant> {
+    @Query("update AdapayMerchant t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/AirDropRepo.java

@@ -7,10 +7,14 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface AirDropRepo extends JpaRepository<AirDrop, Long>, JpaSpecificationExecutor<AirDrop> {
     @Query("update AirDrop t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    @Query(nativeQuery = true,value = "select * from air_drop where air_drop.user_ids like ?1 and name like ?2 ")
+    List<AirDrop> findAllByUserIdsAndName(String userIds, String name);
 }

src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -45,4 +45,6 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
     Asset findFirstByTokenIdAndCreatedAtAfterOrderByCreatedAt(String tokenId, LocalDateTime time);
 
     List<Asset> findByTxHashIsNullAndTokenIdNotNullAndCreatedAtBefore(LocalDateTime time);
+
+    List<Asset> findAllByCollectionIdAndUserIdAndStatus(Long collectionId, Long userId, AssetStatus status);
 }

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -36,8 +36,6 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     @Cacheable("collection")
     Optional<Collection> findById(Long id);
 
-    Optional<Collection> findByIdAndDelFalse(Long id);
-
     @Query("update Collection t set t.likes = t.likes + ?2 where t.id = ?1")
     @Modifying
     @Transactional
@@ -95,4 +93,28 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
 
     @Query("select c.currentNumber from Collection c where c.id = ?1")
     Optional<Integer> getCurrentNumber(Long id);
+
+    @Query("select c.stock from Collection c where c.id = ?1")
+    Integer getStock(Long id);
+    List<Collection> findAllByIdIn(java.util.Collection<Long> ids);
+
+    @Modifying
+    @Transactional
+    void deleteAllByIdIn(java.util.Collection<Long> id);
+
+    @Query("select c.id from Collection c where c.assetId = ?1 and c.source = 'TRANSFER'")
+    List<Long> findAllByAssetId(Long assetId);
+
+    @Query("update Collection c set c.sale = ?2 where c.id = ?1")
+    @Transactional
+    @Modifying
+    int updateSale(Long id, int sale);
+
+    @Query("update Collection c set c.stock = ?2 where c.id = ?1")
+    @Transactional
+    @Modifying
+    int updateStock(Long id, int stock);
+
+    @Query("select c.sale from Collection c where c.id = ?1")
+    Integer getSale(Long id);
 }

src/main/java/com/izouma/nineth/repo/ErrorOrderRepo.java

@@ -0,0 +1,7 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ErrorOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ErrorOrderRepo extends JpaRepository<ErrorOrder, Long> {
+}

src/main/java/com/izouma/nineth/repo/UserRepo.java

@@ -161,4 +161,6 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
     void setSales(Long userId, int sales);
 
     List<User> findByAuthoritiesContains(Authority authority);
+
+    List<User> findBySettleAccountIdIsNotNull();
 }

src/main/java/com/izouma/nineth/service/ActivityCollectionService.java

@@ -0,0 +1,57 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.annotations.Debounce;
+import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.config.RedisKeys;
+import com.izouma.nineth.domain.ActivityCollection;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.ActivityCollectionRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.data.domain.Page;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ActivityCollectionService {
+
+    private ActivityCollectionRepo        activityCollectionRepo;
+    private RedisTemplate<String, Object> redisTemplate;
+    private CacheService                  cacheService;
+    private RocketMQTemplate              rocketMQTemplate;
+    private GeneralProperties             generalProperties;
+
+    public Page<ActivityCollection> all(PageQuery pageQuery) {
+        return activityCollectionRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityCollection.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public synchronized Long increaseStock(Long id, int number) {
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.MINT_ACTIVITY_STOCK + id);
+        if (ops.get() == null) {
+            Boolean success = ops.setIfAbsent(Optional.ofNullable(activityCollectionRepo.getStock(id))
+                    .orElse(0), 7, TimeUnit.DAYS);
+            log.info("创建redis铸造活动库存：{}", success);
+        }
+        Long stock = ops.increment(number);
+        rocketMQTemplate.convertAndSend(generalProperties.getUpdateActivityStockTopic(), id);
+        return stock;
+    }
+
+    @Debounce(key = "#id", delay = 500)
+    public void syncStock(Long id) {
+        Integer stock = (Integer) redisTemplate.opsForValue().get(RedisKeys.MINT_ACTIVITY_STOCK + id);
+        if (stock != null) {
+            log.info("同步铸造活动库存信息{}", id);
+            activityCollectionRepo.updateStock(id, stock);
+            cacheService.clearActivityCollection(id);
+        }
+    }
+}

src/main/java/com/izouma/nineth/service/ActivityMaterialService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.ActivityMaterialRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ActivityMaterialService {
+
+    private ActivityMaterialRepo activityMaterialRepo;
+
+    public Page<ActivityMaterial> all(PageQuery pageQuery) {
+        return activityMaterialRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityMaterial.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/nineth/service/ActivityOrderService.java

@@ -0,0 +1,133 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.*;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.AssetStatus;
+import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.*;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ActivityOrderService {
+
+    private ActivityOrderRepo         activityOrderRepo;
+    private ActivityCollectionRepo    activityCollectionRepo;
+    private ActivityCollectionService activityCollectionService;
+    private AssetRepo                 assetRepo;
+    private OrderRepo                 orderRepo;
+    private CollectionRepo            collectionRepo;
+    private ActivityMaterialRepo      activityMaterialRepo;
+    private CollectionService         collectionService;
+    private AssetService              assetService;
+    private UserRepo                  userRepo;
+
+    public Page<ActivityOrder> all(PageQuery pageQuery) {
+        return activityOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityOrder.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+
+    public Asset create(User user, Long mintActivityId) {
+        try {
+            ActivityCollection activity = activityCollectionRepo.findById(mintActivityId)
+                    .orElseThrow(new BusinessException("活动不存在"));
+
+            //库存
+            int stock = Optional.ofNullable(activityCollectionService.increaseStock(mintActivityId, -1))
+                    .map(Math::toIntExact)
+                    .orElseThrow(new BusinessException("很遗憾，活动已无库存"));
+            if (stock < 0) {
+                throw new BusinessException("活动已无库存");
+            }
+
+            //数量
+            List<Asset> assets = assetRepo.findAllByCollectionIdAndUserIdAndStatus(activity.getCollectionId(), user.getId(),
+                    AssetStatus.NORMAL);
+            if (assets.size() < activity.getNum()) {
+                throw new BusinessException("数量不足，无法领取");
+            }
+
+            //兑换后的
+            Collection award = collectionRepo.findById(activity.getAwardCollectionId())
+                    .orElseThrow(new BusinessException("无藏品"));
+
+            int awardStock = Optional.ofNullable(collectionService.decreaseStock(activity.getAwardCollectionId(), 1))
+                    .map(Math::toIntExact)
+                    .orElseThrow(new BusinessException("兑换藏品无库存"));
+            if (awardStock < 0) {
+                throw new BusinessException("兑换藏品无库存");
+            }
+
+            //指定账户
+            User newOwner = userRepo.findByIdAndDelFalse(1590945L).orElseThrow(new BusinessException("无法兑换"));
+
+            List<Asset> consumption = assets.stream().limit(activity.getNum()).collect(Collectors.toList());
+            //消耗资产
+            consumption.forEach(asset -> {
+                if (asset.isPublicShow()) {
+
+                    if (asset.getPublicCollectionId() != null) {
+                        List<Order> orders = orderRepo.findByCollectionId(asset.getPublicCollectionId());
+                        if (orders.stream().anyMatch(o -> o.getStatus() != OrderStatus.CANCELLED)) {
+                            throw new BusinessException("已有订单不可兑换");
+                        }
+                        Collection collection = collectionRepo.findById(asset.getPublicCollectionId())
+                                .orElseThrow(new BusinessException("无展示记录"));
+                        List<Long> collectionIds = collectionRepo.findAllByAssetId(collection.getAssetId());
+                        if (CollectionUtils.isNotEmpty(collectionIds)) {
+                            log.info("删除collection {}", collectionIds);
+                            collectionRepo.deleteAllByIdIn(collectionIds);
+                        } else {
+                            log.info("删除collection {}", collection.getId());
+                            collectionRepo.delete(collection);
+                        }
+                    }
+                }
+            });
+
+            //收集记录
+            ActivityOrder order = activityOrderRepo.save(ActivityOrder.builder()
+                    .userId(user.getId())
+                    .phone(user.getPhone())
+                    .activityCollection(activity.getCollectionName())
+                    .activityCollectionId(mintActivityId)
+                    .build());
+
+            //兑换详情
+            consumption.forEach(asset -> {
+                activityMaterialRepo.save(
+                        ActivityMaterial.builder()
+                                .orderId(order.getId())
+                                .assetId(asset.getId())
+                                .category(asset.getCategory())
+                                .collectionId(asset.getCollectionId())
+                                .name(asset.getName())
+                                .number(asset.getNumber())
+                                .pic(asset.getPic())
+                                .build());
+                // 转赠
+                assetService.transfer(asset, asset.getPrice(), newOwner, "转赠", null);
+            });
+
+            //发放新的
+            return assetService.createAsset(award, user, order.getId(), null, "兑换",
+                    award.getTotal() > 1 ? collectionService.getNextNumber(award.getId()) : null);
+
+        } catch (Exception e) {
+            // 错了加库存
+            activityCollectionService.increaseStock(mintActivityId, 1);
+            throw e;
+        }
+    }
+}

src/main/java/com/izouma/nineth/service/AdapayMerchantService.java

@@ -0,0 +1,295 @@
+package com.izouma.nineth.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.huifu.adapay.Adapay;
+import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.huifu.adapay.model.*;
+import com.izouma.nineth.config.AdapayProperties;
+import com.izouma.nineth.config.EventNames;
+import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.domain.AdapayMerchant;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.dto.adapay.MemberInfo;
+import com.izouma.nineth.dto.adapay.PaymentItem;
+import com.izouma.nineth.dto.adapay.PaymentList;
+import com.izouma.nineth.dto.adapay.SettleAccountsItem;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AdapayMerchantRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SnowflakeIdWorker;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class AdapayMerchantService {
+
+    private final AdapayMerchantRepo adapayMerchantRepo;
+    private final AdapayProperties  adapayProperties;
+    private final RocketMQTemplate  rocketMQTemplate;
+    private final GeneralProperties generalProperties;
+
+    @PostConstruct
+    public void init() {
+        log.info("init AdapayMerchantService");
+        for (AdapayMerchant merchant : adapayMerchantRepo.findAll()) {
+            addMerchant(merchant);
+            if (merchant.isSelected()) {
+                try {
+                    select(merchant.getId());
+                    log.info("select merchant success={}", merchant.getName());
+                } catch (Exception e) {
+                    log.error("select merchant error", e);
+                }
+            }
+        }
+    }
+
+    public Page<AdapayMerchant> all(PageQuery pageQuery) {
+        return adapayMerchantRepo.findAll(JpaUtils.toSpecification(pageQuery, AdapayMerchant.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public AdapayMerchant save(AdapayMerchant record) {
+        record = adapayMerchantRepo.save(record);
+        addMerchant(record);
+        return record;
+    }
+
+    public AdapayMerchant update(AdapayMerchant record) {
+        if (record.getId() == null) {
+            throw new BusinessException("id不能为空");
+        }
+        AdapayMerchant orig = adapayMerchantRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+        ObjUtils.merge(orig, record);
+        record = adapayMerchantRepo.save(orig);
+        addMerchant(record);
+        return record;
+    }
+
+
+    public void sendSelectEvent(Long id) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("name", EventNames.SWITCH_ACCOUNT);
+        jsonObject.put("data", id);
+        rocketMQTemplate.convertAndSend(generalProperties.getBroadcastEventTopic(), jsonObject);
+
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void select(Long id) throws Exception {
+        AdapayMerchant merchant = adapayMerchantRepo.findById(id).orElseThrow(new BusinessException("商户不存在"));
+
+        MerConfig merConfig = new MerConfig();
+        merConfig.setApiKey(merchant.getApiKey());
+        merConfig.setApiMockKey(merchant.getMockKey());
+        merConfig.setRSAPrivateKey(merchant.getPrivKey());
+        merConfig.setRSAPublicKey(merchant.getPublicKey());
+        Adapay.initWithMerConfig(merConfig);
+
+        adapayProperties.setApiKey(merchant.getApiKey());
+        adapayProperties.setMockKey(merchant.getMockKey());
+        adapayProperties.setPrivKey(merchant.getPrivKey());
+        adapayProperties.setPublicKey(merchant.getPublicKey());
+        adapayProperties.setMerchant(merchant.getName());
+        adapayProperties.setAppId(merchant.getAppId());
+
+        List<AdapayMerchant> list = adapayMerchantRepo.findAll();
+        list.forEach(m -> m.setSelected(m.getId().equals(id)));
+        adapayMerchantRepo.saveAll(list);
+    }
+
+    public void addMerchant(AdapayMerchant merchant) {
+        try {
+            MerConfig merConfig = new MerConfig();
+            merConfig.setApiKey(merchant.getApiKey());
+            merConfig.setApiMockKey(merchant.getMockKey());
+            merConfig.setRSAPrivateKey(merchant.getPrivKey());
+            merConfig.setRSAPublicKey(merchant.getPublicKey());
+            Adapay.addMerConfig(merConfig, merchant.getName());
+        } catch (Exception e) {
+            log.error("add Merchant Error", e);
+        }
+    }
+
+    public void createMemberForAll(String memberId, String tel, String realName, String idno) throws BaseAdaPayException {
+        AtomicReference<BaseAdaPayException> ex = new AtomicReference<>();
+        adapayMerchantRepo.findAll().parallelStream().forEach(merchant -> {
+            try {
+                createMember(merchant.getName(), merchant.getAppId(), memberId, tel, realName, idno);
+            } catch (BaseAdaPayException e) {
+                log.error("createMemberForAll", e);
+                ex.set(e);
+            }
+        });
+        if (ex.get() != null) {
+            throw ex.get();
+        }
+    }
+
+    public void createMember(String merchant, String appId, String memberId, String tel, String realName, String idno) throws BaseAdaPayException {
+        Map<String, Object> memberParams = new HashMap<>();
+        memberParams.put("adapay_func_code", "members.realname");
+        memberParams.put("member_id", memberId);
+        memberParams.put("app_id", appId);
+        memberParams.put("tel_no", tel);
+        memberParams.put("user_name", realName);
+        memberParams.put("cert_type", "00");
+        memberParams.put("cert_id", idno);
+        Map<String, Object> res = AdapayCommon.requestAdapay(memberParams, merchant);
+        log.info("createMember merchant={} response={}", merchant, JSON.toJSONString(res, SerializerFeature.PrettyFormat));
+        if (!("succeeded".equals(MapUtils.getString(res, "status"))
+                || "member_id_exists".equals(MapUtils.getString(res, "error_code")))) {
+            String errMsg = MapUtils.getString(res, "error_msg");
+            String errCode = MapUtils.getString(res, "error_code");
+            log.error("createMember error merchant={} memberId={}", merchant, memberId);
+            throw new BusinessException(errMsg + "(" + errCode + ")");
+        }
+    }
+
+    public String createSettleAccountForAll(String memberId, String realName, String idNo, String phone, String bankNo) throws BaseAdaPayException {
+        String id = null;
+        for (AdapayMerchant merchant : adapayMerchantRepo.findAll()) {
+            id = createSettleAccount(merchant.getName(), merchant.getAppId(), memberId, realName, idNo, phone, bankNo);
+        }
+        return id;
+    }
+
+    public String createSettleAccount(String merchant, String appId, String memberId, String realName, String idNo, String phone, String bankNo) throws BaseAdaPayException {
+        Map<String, Object> settleCountParams = new HashMap<>();
+        Map<String, Object> accountInfo = new HashMap<>();
+        accountInfo.put("card_id", bankNo);
+        accountInfo.put("card_name", realName);
+        accountInfo.put("cert_id", idNo);
+        accountInfo.put("cert_type", "00");
+        accountInfo.put("tel_no", phone);
+        accountInfo.put("bank_acct_type", "2");
+        settleCountParams.put("member_id", memberId);
+        settleCountParams.put("app_id", appId);
+        settleCountParams.put("channel", "bank_account");
+        settleCountParams.put("account_info", accountInfo);
+        Map<String, Object> res = SettleAccount.create(settleCountParams, merchant);
+        log.info("createSettleAccount merchant={} response={}", merchant, JSON.toJSONString(res, SerializerFeature.PrettyFormat));
+        if (!("succeeded".equals(MapUtils.getString(res, "status"))
+                || "account_exists".equals(MapUtils.getString(res, "error_code")))) {
+            String errMsg = MapUtils.getString(res, "error_msg");
+            String errCode = MapUtils.getString(res, "error_code");
+            log.error("createSettleAccount error merchant={} memberId={}", merchant, memberId);
+            throw new BusinessException(errMsg + "(" + errCode + ")");
+        }
+        return MapUtils.getString(res, "id");
+    }
+
+    public void delSettleAccountForAll(String memberId) throws BaseAdaPayException {
+        for (AdapayMerchant merchant : adapayMerchantRepo.findAll()) {
+            delSettleAccount(merchant.getName(), merchant.getAppId(), memberId);
+        }
+    }
+
+    public void delSettleAccount(String merchant, String appId, String memberId) throws BaseAdaPayException {
+        Map<String, Object> memberParams = new HashMap<>();
+        memberParams.put("member_id", memberId);
+        memberParams.put("app_id", appId);
+        Map<String, Object> member = Member.query(memberParams, merchant);
+        log.info("query member, merchant={} member={} res={}",
+                merchant, memberId, JSON.toJSONString(member, SerializerFeature.PrettyFormat));
+        MemberInfo memberInfo = JSON.parseObject(JSON.toJSONString(member), MemberInfo.class);
+        if ("succeeded".equals(memberInfo.getStatus())) {
+            if (memberInfo.getSettleAccounts() != null && memberInfo.getSettleAccounts().size() > 0) {
+                SettleAccountsItem settleAccountsItem = memberInfo.getSettleAccounts().get(0);
+                Map<String, Object> settleCountParams = new HashMap<>();
+                settleCountParams.put("settle_account_id", settleAccountsItem.getId());
+                settleCountParams.put("member_id", memberId);
+                settleCountParams.put("app_id", appId);
+                Map<String, Object> settleCount = SettleAccount.delete(settleCountParams, merchant);
+                log.info("delSettleAccount, merchant={} member={} res={}",
+                        merchant, memberId, JSON.toJSONString(settleCount, SerializerFeature.PrettyFormat));
+                checkSuccess(settleCount);
+            }
+        } else if ("member_not_exists".equals(memberInfo.getErrorCode())) {
+            log.info("delSettleAccount member_not_exists, merchant={} member={}", merchant, memberId);
+        } else {
+            throw new BusinessException(memberInfo.getErrorMsg() + memberInfo.getErrorCode());
+        }
+    }
+
+    public void queryMembers(String merchant, String appId) {
+        boolean hasMore = true;
+        while (hasMore) {
+            try {
+                Map<String, Object> memberParams = new HashMap<>(2);
+                memberParams.put("page_index", "1");
+                memberParams.put("app_id", appId);
+                memberParams.put("page_size", "20");
+                memberParams.put("created_gte", String.valueOf(System.currentTimeMillis() - 5 * 60 * 1000));
+                memberParams.put("created_lte", String.valueOf(System.currentTimeMillis()));
+                Map<String, Object> member = Member.queryList(memberParams);
+                MapUtils.getBoolean(member, "has_more", false);
+            } catch (Exception e) {
+                log.error("queryMembers error", e);
+                hasMore = false;
+            }
+        }
+    }
+
+    public Object query(Long merchantId, String id) throws BaseAdaPayException {
+        AdapayMerchant merchant = adapayMerchantRepo.findById(merchantId).orElseThrow(new BusinessException("商户不存在"));
+        Map<String, Object> paymentParams = new HashMap<>();
+        paymentParams.put("app_id", merchant.getAppId());
+        paymentParams.put("payment_id", id);
+        Map<String, Object> paymentList = Payment.queryList(paymentParams, merchant.getName());
+        log.info(JSON.toJSONString(paymentList, SerializerFeature.PrettyFormat));
+        return paymentList;
+    }
+
+    public Object refund(Long merchantId, String id) throws BaseAdaPayException {
+        AdapayMerchant merchant = adapayMerchantRepo.findById(merchantId).orElseThrow(new BusinessException("商户不存在"));
+
+        Map<String, Object> paymentParams = new HashMap<>();
+        paymentParams.put("app_id", merchant.getAppId());
+        paymentParams.put("payment_id", id);
+        Map<String, Object> res = Payment.queryList(paymentParams, merchant.getName());
+        log.info(JSON.toJSONString(res, SerializerFeature.PrettyFormat));
+        PaymentList paymentList = JSON.parseObject(JSON.toJSONString(res), PaymentList.class);
+
+        if (paymentList.getPayments() != null && paymentList.getPayments().size() == 1) {
+            PaymentItem paymentItem = paymentList.getPayments().get(0);
+            Map<String, Object> refundParams = new HashMap<>();
+            refundParams.put("refund_amt", paymentItem.getPayAmt());
+            refundParams.put("refund_order_no", new SnowflakeIdWorker(0, 0).nextId() + "");
+            Map<String, Object> response = Refund.create(id, refundParams, merchant.getName());
+            log.info(JSON.toJSONString(response, SerializerFeature.PrettyFormat));
+            return response;
+        }
+        return res;
+    }
+
+    public static void checkSuccess(Map<String, Object> map) {
+        String status = MapUtils.getString(map, "status");
+        if (!("succeeded".equals(status))) {
+            String errMsg = MapUtils.getString(map, "error_msg");
+            String errCode = MapUtils.getString(map, "error_code");
+            if ("account_exists".equals(errCode)) {
+                return;
+            }
+            throw new BusinessException(errMsg + "(" + errCode + ")");
+        }
+    }
+}

src/main/java/com/izouma/nineth/service/AssetMintService.java

@@ -62,6 +62,37 @@ public class AssetMintService {
         }
     }
 
+    @Async
+    public void mint(Long assetId) {
+        Asset asset = assetRepo.findById(assetId).orElseThrow(new BusinessException("asset不存在"));
+        User user = userRepo.findById(asset.getUserId()).orElseThrow(new BusinessException("用户不存在"));
+        if (StringUtils.isEmpty(user.getPublicKey())) {
+            NFTAccount account = nftService.createAccount(user.getUsername() + "_");
+            user.setNftAccount(account.getAccountId());
+            user.setKmsId(account.getAccountKmsId());
+            user.setPublicKey(account.getPublicKey());
+            userRepo.save(user);
+        }
+        try {
+            NFT nft = nftService.createToken(user.getNftAccount(), asset.getTokenId());
+            if (nft != null) {
+                asset.setTokenId(nft.getTokenId());
+                asset.setBlockNumber(nft.getBlockNumber());
+                asset.setTxHash(nft.getTxHash());
+                asset.setGasUsed(nft.getGasUsed());
+                if (asset.getIpfsUrl() == null) {
+                    asset.setIpfsUrl(ipfsUpload(asset.getPic().get(0).getUrl()));
+                }
+                assetRepo.save(asset);
+                applicationContext.publishEvent(new CreateAssetEvent(this, true, asset));
+            } else {
+                log.error("铸造失败");
+            }
+        } catch (Exception e) {
+            log.error("铸造失败", e);
+        }
+    }
+
     @Async
     public void mint(Asset asset) {
         User user = userRepo.findById(asset.getUserId()).orElseThrow(new BusinessException("用户不存在"));

src/main/java/com/izouma/nineth/service/CacheService.java

@@ -20,4 +20,8 @@ public class CacheService {
     @CacheEvict(value = "user", key = "#username")
     public void clearUser(String username) {
     }
+
+    @CacheEvict(value = "activityCollection", key = "#id")
+    public void clearActivityCollection(Long id) {
+    }
 }

src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -1,6 +1,9 @@
 package com.izouma.nineth.service;
 
 import com.alibaba.fastjson.JSON;
+import com.izouma.nineth.annotations.Debounce;
+import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.config.RedisKeys;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.CollectionDTO;
@@ -13,16 +16,20 @@ import com.izouma.nineth.repo.*;
 import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SecurityUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.Range;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.stereotype.Service;
 
@@ -33,19 +40,25 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 @AllArgsConstructor
 public class CollectionService {
 
-    private CollectionRepo   collectionRepo;
-    private LikeRepo         likeRepo;
-    private BlindBoxItemRepo blindBoxItemRepo;
-    private AppointmentRepo  appointmentRepo;
-    private UserRepo         userRepo;
-    private TaskScheduler    taskScheduler;
-    private CacheService     cacheService;
+    private CollectionRepo                collectionRepo;
+    private LikeRepo                      likeRepo;
+    private BlindBoxItemRepo              blindBoxItemRepo;
+    private AppointmentRepo               appointmentRepo;
+    private UserRepo                      userRepo;
+    private TaskScheduler                 taskScheduler;
+    private CacheService                  cacheService;
+    private RedisTemplate<String, Object> redisTemplate;
+    private RocketMQTemplate              rocketMQTemplate;
+    private GeneralProperties             generalProperties;
+
 
     private final Map<Long, ScheduledFuture<?>> tasks = new HashMap<>();
 
@@ -335,4 +348,52 @@ public class CollectionService {
         collection.setStock(collection.getStock() + number);
         collection.setTotal(collection.getTotal() + number);
     }
+
+    public synchronized Long increaseSale(Long id, int number) {
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.COLLECTION_SALE + id);
+        if (ops.get() == null) {
+            Boolean success = ops.setIfAbsent(Optional.ofNullable(collectionRepo.getSale(id))
+                    .orElse(0), 7, TimeUnit.DAYS);
+            log.info("创建redis销量：{}", success);
+        }
+        Long sale = ops.increment(number);
+        rocketMQTemplate.convertAndSend(generalProperties.getUpdateSaleTopic(), id);
+        return sale;
+    }
+
+    public synchronized Long increaseStock(Long id, int number) {
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.COLLECTION_STOCK + id);
+        if (ops.get() == null) {
+            Boolean success = ops.setIfAbsent(Optional.ofNullable(collectionRepo.getStock(id))
+                    .orElse(0), 7, TimeUnit.DAYS);
+            log.info("创建redis库存：{}", success);
+        }
+        Long stock = ops.increment(number);
+        rocketMQTemplate.convertAndSend(generalProperties.getUpdateStockTopic(), id);
+        return stock;
+    }
+
+    public synchronized Long decreaseStock(Long id, int number) {
+        return increaseStock(id, -number);
+    }
+
+    @Debounce(key = "#id", delay = 500)
+    public void syncSale(Long id) {
+        Integer sale = (Integer) redisTemplate.opsForValue().get(RedisKeys.COLLECTION_SALE + id);
+        if (sale != null) {
+            log.info("同步销量信息{}", id);
+            collectionRepo.updateSale(id, sale);
+            cacheService.clearCollection(id);
+        }
+    }
+
+    @Debounce(key = "#id", delay = 500)
+    public void syncStock(Long id) {
+        Integer stock = (Integer) redisTemplate.opsForValue().get(RedisKeys.COLLECTION_STOCK + id);
+        if (stock != null) {
+            log.info("同步库存信息{}", id);
+            collectionRepo.updateStock(id, stock);
+            cacheService.clearCollection(id);
+        }
+    }
 }

src/main/java/com/izouma/nineth/service/IdentityAuthService.java

@@ -1,14 +1,20 @@
 package com.izouma.nineth.service;
 
+import com.izouma.nineth.domain.AirDrop;
+import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.IdentityAuth;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.AirDropType;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AirDropRepo;
+import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.IdentityAuthRepo;
 import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +27,10 @@ public class IdentityAuthService {
     private IdentityAuthRepo identityAuthRepo;
     private UserRepo         userRepo;
     private AdapayService    adapayService;
+    private CollectionRepo   collectionRepo;
+    private AirDropRepo      airDropRepo;
+    private AirDropService   airDropService;
+    private SysConfigService sysConfigService;
 
     public Page<IdentityAuth> all(PageQuery pageQuery) {
         return identityAuthRepo.findAll(JpaUtils.toSpecification(pageQuery, IdentityAuth.class), JpaUtils.toPageRequest(pageQuery));
@@ -52,10 +62,42 @@ public class IdentityAuthService {
         User user = userRepo.findByIdAndDelFalse(auth.getUserId()).orElseThrow(new BusinessException("用户不存在"));
         if (status == AuthStatus.SUCCESS) {
             user.setAuthId(auth.getId());
+            if (user.getInvitor() != null) {
+                userRepo.findByIdAndDelFalse(user.getInvitor()).ifPresent(user1 -> {
+                    user1.setInviteNum(user1.getInviteNum() + 1);
+                    int inviteNum = sysConfigService.getInt("invite_num");
+
+                    if (user1.getInviteNum() >= inviteNum) {
+                        int inviteCollection = sysConfigService.getInt("invite_collection");
+                        // 藏品数量
+                        Collection collection = collectionRepo.findById(1187810L)
+                                .orElseThrow(new BusinessException("无藏品"));
+                        if (collection.getStock() > 0) {
+                            List<Long> userIds = List.of(user.getInvitor());
+                            String name = "邀请新人得空投奖励";
+                            List<AirDrop> airDrops = airDropRepo.findAllByUserIdsAndName(String.valueOf(user.getInvitor()), name);
+                            if (CollectionUtils.isEmpty(airDrops)) {
+                                airDropService.create(AirDrop.builder()
+                                        .name(name)
+                                        .type(AirDropType.asset)
+                                        .collectionId((long) inviteCollection)
+                                        .phone(List.of(user1.getPhone()))
+                                        .userIds(userIds)
+                                        .projectId(1)
+                                        .build());
+                                user1.setInviteAirDrop(user1.getInviteAirDrop() + 1);
+                            }
+                        }
+                    }
+
+                    userRepo.save(user1);
+                });
+            }
+
         }
-        auth.setStatus(status);
-        identityAuthRepo.save(auth);
         user.setAuthStatus(status);
         userRepo.save(user);
+        auth.setStatus(status);
+        identityAuthRepo.save(auth);
     }
 }

src/main/java/com/izouma/nineth/service/OrderService.java

@@ -15,30 +15,35 @@ import com.github.binarywang.wxpay.service.WxPayService;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.huifu.adapay.model.AdapayCommon;
 import com.huifu.adapay.model.Payment;
-import com.izouma.nineth.config.AdapayProperties;
-import com.izouma.nineth.config.AlipayProperties;
-import com.izouma.nineth.config.GeneralProperties;
-import com.izouma.nineth.config.WxPayProperties;
+import com.huifu.adapay.model.Refund;
+import com.izouma.nineth.config.*;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.*;
 import com.izouma.nineth.event.CreateAssetEvent;
+import com.izouma.nineth.event.CreateOrderEvent;
+import com.izouma.nineth.event.OrderNotifyEvent;
 import com.izouma.nineth.event.TransferAssetEvent;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
 import com.izouma.nineth.security.Authority;
 import com.izouma.nineth.utils.JpaUtils;
+import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.net.URLCodec;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
+import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -50,6 +55,7 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @AllArgsConstructor
@@ -67,21 +73,32 @@ public class OrderService {
     private WxPayProperties               wxPayProperties;
     private AssetService                  assetService;
     private SysConfigService              sysConfigService;
-    private BlindBoxItemRepo              blindBoxItemRepo;
     private AssetRepo                     assetRepo;
     private UserCouponRepo                userCouponRepo;
     private CollectionService             collectionService;
-    private RedisTemplate<String, Object> redisTemplate;
     private CommissionRecordRepo          commissionRecordRepo;
     private AdapayProperties              adapayProperties;
     private GeneralProperties             generalProperties;
+    private SnowflakeIdWorker             snowflakeIdWorker;
+    private RocketMQTemplate              rocketMQTemplate;
+    private RedisTemplate<String, Object> redisTemplate;
+    private ErrorOrderRepo                errorOrderRepo;
 
     public Page<Order> all(PageQuery pageQuery) {
         return orderRepo.findAll(JpaUtils.toSpecification(pageQuery, Order.class), JpaUtils.toPageRequest(pageQuery));
     }
 
+    public String mqCreate(Long userId, Long collectionId, int qty, Long addressId, Long userCouponId, Long invitor) {
+
+        Long id = snowflakeIdWorker.nextId();
+        SendResult result = rocketMQTemplate.syncSend(generalProperties.getCreateOrderTopic(),
+                new CreateOrderEvent(id, userId, collectionId, qty, addressId, userCouponId, invitor), 100000);
+        log.info("发送订单到队列: {}, result={}", id, result);
+        return String.valueOf(id);
+    }
+
     @Transactional
-    public Order create(Long userId, Long collectionId, int qty, Long addressId, Long userCouponId, Long invitor) {
+    public Order create(Long userId, Long collectionId, int qty, Long addressId, Long userCouponId, Long invitor, Long id) {
         if (qty <= 0) throw new BusinessException("数量必须大于0");
         User user = userRepo.findByIdAndDelFalse(userId).orElseThrow(new BusinessException("用户不存在"));
         Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("藏品不存在"));
@@ -126,6 +143,7 @@ public class OrderService {
 
         BigDecimal gasFee = sysConfigService.getBigDecimal("gas_fee");
         Order order = Order.builder()
+                .id(Optional.ofNullable(id).orElse(snowflakeIdWorker.nextId()))
                 .userId(userId)
                 .collectionId(collectionId)
                 .name(collection.getName())
@@ -191,7 +209,7 @@ public class OrderService {
             JSONObject bizContent = new JSONObject();
             bizContent.put("notifyUrl", alipayProperties.getNotifyUrl());
             bizContent.put("returnUrl", alipayProperties.getReturnUrl());
-            bizContent.put("out_trade_no", String.valueOf(new SnowflakeIdWorker(0, 0).nextId()));
+            bizContent.put("out_trade_no", String.valueOf(snowflakeIdWorker.nextId()));
             bizContent.put("total_amount", order.getTotalPrice().stripTrailingZeros().toPlainString());
             bizContent.put("disable_pay_channels", "pcredit,creditCard");
             if (Arrays.stream(env.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
@@ -228,7 +246,7 @@ public class OrderService {
 
         WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
         request.setBody(order.getName());
-        request.setOutTradeNo(String.valueOf(new SnowflakeIdWorker(1, 1).nextId()));
+        request.setOutTradeNo(String.valueOf(snowflakeIdWorker.nextId()));
         request.setTotalFee(order.getTotalPrice().multiply(BigDecimal.valueOf(100)).intValue());
         if (Arrays.stream(env.getActiveProfiles()).noneMatch(s -> s.equals("prod"))) {
             // 测试环境设为1分
@@ -272,7 +290,7 @@ public class OrderService {
         }
 
         Map<String, Object> paymentParams = new HashMap<>();
-        paymentParams.put("order_no", String.valueOf(new SnowflakeIdWorker(0, 0).nextId()));
+        paymentParams.put("order_no", String.valueOf(snowflakeIdWorker.nextId()));
         paymentParams.put("pay_amt", order.getTotalPrice().setScale(2, RoundingMode.HALF_UP).toPlainString());
         paymentParams.put("app_id", adapayProperties.getAppId());
         paymentParams.put("pay_channel", payChannel);
@@ -377,39 +395,99 @@ public class OrderService {
         return restAmount.subtract(divAmount);
     }
 
-    @Transactional
     public void notifyOrder(Long orderId, PayMethod payMethod, String transactionId) {
-        Order order = orderRepo.findById(orderId).orElseThrow(new BusinessException("订单不存在"));
-        Collection collection = collectionRepo.findById(order.getCollectionId())
-                .orElseThrow(new BusinessException("藏品不存在"));
-        User user = userRepo.findById(order.getUserId()).orElseThrow(new BusinessException("用户不存在"));
-        if (order.getStatus() == OrderStatus.NOT_PAID) {
-            order.setStatus(OrderStatus.PROCESSING);
-            order.setPayTime(LocalDateTime.now());
-            order.setTransactionId(transactionId);
-            order.setPayMethod(payMethod);
-            if (order.getType() == CollectionType.BLIND_BOX) {
-                BlindBoxItem winItem = collectionService.draw(collection.getId());
-                order.setWinCollectionId(winItem.getCollectionId());
-                orderRepo.save(order);
-                assetService.createAsset(winItem, user, order.getId(), order.getPrice(), "出售",
-                        collectionService.getNextNumber(winItem.getCollectionId()));
-                addSales(winItem.getMinterId());
-            } else {
-                if (collection.getSource() == CollectionSource.TRANSFER) {
-                    Asset asset = assetRepo.findById(collection.getAssetId()).orElse(null);
-                    assetService.transfer(asset, order.getPrice(), user, "转让", order.getId());
-                    collectionRepo.delete(collection);
-                } else {
+        log.info("订单回调 orderId: {}, payMethod: {}, transactionId: {}", orderId, payMethod, transactionId);
+
+        // 取消订单与订单回调不能同时进行，需要抢锁
+        if (!getOrderLock(orderId)) {
+            log.info("订单回调失败 orderId: {} redis锁定, 重新发送到队列", orderId);
+            rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),
+                    new OrderNotifyEvent(orderId, payMethod, transactionId, System.currentTimeMillis()));
+            return;
+        }
+
+        try {
+            Order order = orderRepo.findById(orderId).orElseThrow(new BusinessException("订单不存在"));
+            Collection collection = collectionRepo.findById(order.getCollectionId())
+                    .orElseThrow(new BusinessException("藏品不存在"));
+            User user = userRepo.findById(order.getUserId()).orElseThrow(new BusinessException("用户不存在"));
+            if (order.getStatus() == OrderStatus.NOT_PAID) {
+                order.setStatus(OrderStatus.PROCESSING);
+                order.setPayTime(LocalDateTime.now());
+                order.setTransactionId(transactionId);
+                order.setPayMethod(payMethod);
+                if (order.getType() == CollectionType.BLIND_BOX) {
+                    log.info("开始盲盒抽卡 orderId: {}, collectionId: {}", orderId, collection.getId());
+                    BlindBoxItem winItem = null;
+                    try {
+                        winItem = collectionService.draw(collection.getId());
+                    } catch (BusinessException ignored) {
+                    }
+                    if (winItem == null) {
+                        log.info("抽卡失败退款 orderId: {}", orderId);
+                        order.setStatus(OrderStatus.CANCELLED);
+                        order.setCancelTime(LocalDateTime.now());
+
+                        Map<String, Object> refundParams = new HashMap<>();
+                        refundParams.put("refund_amt", order.getTotalPrice().setScale(2, RoundingMode.HALF_UP)
+                                .toPlainString());
+                        refundParams.put("refund_order_no", String.valueOf(snowflakeIdWorker.nextId()));
+                        try {
+                            Map<String, Object> response = Refund.create(transactionId, refundParams);
+                        } catch (BaseAdaPayException e) {
+                            e.printStackTrace();
+                        }
+                        orderRepo.save(order);
+                        throw new BusinessException("抽卡失败, 已退款 " + orderId);
+                    }
+                    log.info("抽卡成功 orderId: {}, collectionId: {}, winCollectionId: {}", orderId, collection.getId(), winItem.getCollectionId());
+                    order.setWinCollectionId(winItem.getCollectionId());
                     orderRepo.save(order);
-                    assetService.createAsset(collection, user, order.getId(), order.getPrice(), "出售",
-                            collectionService.getNextNumber(order.getCollectionId()));
+                    assetService.createAsset(winItem, user, order.getId(), order.getPrice(), "出售",
+                            winItem.getTotal() > 1 ? collectionService.getNextNumber(winItem.getCollectionId()) : null);
+                } else {
+                    if (collection.getSource() == CollectionSource.TRANSFER) {
+                        orderRepo.save(order);
+                        Asset asset = assetRepo.findById(collection.getAssetId()).orElse(null);
+                        assetService.transfer(asset, order.getPrice(), user, "转让", order.getId());
+                        List<Long> collectionIds = collectionRepo.findAllByAssetId(collection.getAssetId());
+                        if (CollectionUtils.isNotEmpty(collectionIds)) {
+                            log.info("删除collection {}", collectionIds);
+                            collectionRepo.deleteAllByIdIn(collectionIds);
+                        } else {
+                            log.info("删除collection {}", collection.getId());
+                            collectionRepo.delete(collection);
+                        }
+
+                    } else {
+                        orderRepo.save(order);
+                        assetService.createAsset(collection, user, order.getId(), order.getPrice(), "出售",
+                                collection.getTotal() > 1 ? collectionService.getNextNumber(order.getCollectionId()) : null);
+                    }
+                }
+                commission(order);
+                if (collection.getAssetId() == null) {
+                    collectionService.increaseSale(order.getCollectionId(), order.getQty());
                 }
-                addSales(collection.getMinterId());
+            } else {
+                throw new BusinessException("状态错误 " + order.getStatus());
+            }
+        } catch (Exception e) {
+            ErrorOrder errorOrder = ErrorOrder.builder()
+                    .orderId(orderId)
+                    .transactionId(transactionId)
+                    .payMethod(payMethod)
+                    .build();
+            if (e instanceof BusinessException) {
+                log.error("订单回调出错 orderId: {} {}", orderId, e.getMessage());
+            } else {
+                log.error("订单回调出错 orderId: " + orderId, e);
             }
-            commission(order);
-        } else if (order.getStatus() == OrderStatus.CANCELLED) {
+            errorOrder.setErrorMessage(e.getMessage());
+            errorOrderRepo.save(errorOrder);
+
         }
+        releaseOrderLock(orderId);
     }
 
     @EventListener
@@ -561,7 +639,37 @@ public class OrderService {
         request.setTransactionId(order.getTransactionId());
         request.setTotalFee(order.getTotalPrice().multiply(BigDecimal.valueOf(100)).intValue());
         request.setRefundFee(order.getTotalPrice().multiply(BigDecimal.valueOf(100)).intValue());
-        request.setOutRefundNo(String.valueOf(new SnowflakeIdWorker(0, 0).nextId()));
+        request.setOutRefundNo(String.valueOf(snowflakeIdWorker.nextId()));
         wxPayService.refund(request);
     }
+
+    // 获取订单锁，有效时间1小时
+    public boolean getOrderLock(Long orderId) {
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.ORDER_LOCK + orderId);
+        Boolean flag = ops.setIfAbsent(1, 1, TimeUnit.HOURS);
+        return Boolean.TRUE.equals(flag);
+    }
+
+    // 释放订单锁
+    public void releaseOrderLock(Long orderId) {
+        redisTemplate.delete(RedisKeys.ORDER_LOCK + orderId);
+    }
+
+    public Object queryCreateOrder(String id) {
+        Object res = redisTemplate.opsForValue().get(RedisKeys.CREATE_ORDER + id);
+        if (res != null) {
+            if (res instanceof Map) {
+                if (MapUtils.getBooleanValue((Map) res, "success", false)) {
+                    Order order = (Order) MapUtils.getObject((Map) res, "data");
+                    if (!SecurityUtils.getAuthenticatedUser().getId().equals(order.getUserId())) {
+                        log.error("queryCreateOrder userId错误 requestUserId={} orderUserId={}",
+                                SecurityUtils.getAuthenticatedUser().getId(), order.getUserId());
+                        return null;
+                    }
+                }
+            }
+        }
+        return res;
+    }
+
 }

src/main/java/com/izouma/nineth/service/UserService.java

@@ -3,7 +3,12 @@ package com.izouma.nineth.service;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.huifu.adapay.model.AdapayCommon;
+import com.huifu.adapay.model.SettleAccount;
+import com.izouma.nineth.config.AdapayProperties;
 import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.domain.Follow;
 import com.izouma.nineth.domain.IdentityAuth;
@@ -29,6 +34,7 @@ import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -36,12 +42,14 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -49,22 +57,22 @@ import java.util.stream.Collectors;
 @Slf4j
 @AllArgsConstructor
 public class UserService {
-    private UserRepo          userRepo;
-    private WxMaService       wxMaService;
-    private WxMpService       wxMpService;
-    private SmsService        smsService;
-    private StorageService    storageService;
-    private JwtTokenUtil      jwtTokenUtil;
-    private CaptchaService    captchaService;
-    private FollowService     followService;
-    private FollowRepo        followRepo;
-    private IdentityAuthRepo  identityAuthRepo;
-    private SysConfigService  sysConfigService;
-    private CollectionService collectionService;
-    private AdapayService     adapayService;
-    private UserBankCardRepo  userBankCardRepo;
-    private CacheService      cacheService;
-    private InviteRepo        inviteRepo;
+    private UserRepo              userRepo;
+    private WxMaService           wxMaService;
+    private WxMpService           wxMpService;
+    private SmsService            smsService;
+    private StorageService        storageService;
+    private JwtTokenUtil          jwtTokenUtil;
+    private FollowService         followService;
+    private FollowRepo            followRepo;
+    private IdentityAuthRepo      identityAuthRepo;
+    private SysConfigService      sysConfigService;
+    private AdapayService         adapayService;
+    private UserBankCardRepo      userBankCardRepo;
+    private CacheService          cacheService;
+    private InviteRepo            inviteRepo;
+    private AdapayProperties      adapayProperties;
+    private AdapayMerchantService adapayMerchantService;
 
     @CacheEvict(value = "user", key = "#user.username")
     public User update(User user) {
@@ -98,7 +106,8 @@ public class UserService {
 
             if (pageQuery.getQuery().containsKey("hasRole")) {
                 String roleName = (String) pageQuery.getQuery().get("hasRole");
-                and.add(criteriaBuilder.isMember(Authority.get(AuthorityName.valueOf(roleName)), root.get("authorities")));
+                and.add(criteriaBuilder
+                        .isMember(Authority.get(AuthorityName.valueOf(roleName)), root.get("authorities")));
             }
             return criteriaBuilder.and(and.toArray(new Predicate[0]));
         });
@@ -133,7 +142,7 @@ public class UserService {
         return user;
     }
 
-    public User phoneRegister(String phone, String code, String password, String inviteCode) {
+    public User phoneRegister(String phone, String code, String password, String inviteCode, Long invitor) {
         String name = "9th_" + RandomStringUtils.randomAlphabetic(8);
         Invite invite = null;
         if (StringUtils.isNotBlank(inviteCode)) {
@@ -150,6 +159,7 @@ public class UserService {
                 .invitorPhone(Optional.ofNullable(invite).map(Invite::getPhone).orElse(null))
                 .invitorName(Optional.ofNullable(invite).map(Invite::getName).orElse(null))
                 .inviteCode(Optional.ofNullable(invite).map(Invite::getCode).orElse(null))
+                .invitor(invitor)
                 .build());
         if (invite != null) {
             inviteRepo.increaseNum(invite.getId());
@@ -447,15 +457,16 @@ public class UserService {
         if (!bankValidate.isValidated()) {
             throw new BusinessException("暂不支持此卡");
         }
-        if (StringUtils.isEmpty(user.getMemberId())) {
-            user.setMemberId(adapayService.createMember(userId, user.getPhone(), identityAuth.getRealName(),
-                    identityAuth.getIdNo()));
-            userRepo.save(user);
-        }
         smsService.verify(phone, code);
-        String accountId = adapayService.createSettleAccount(user.getMemberId(), identityAuth.getRealName(),
-                identityAuth.getIdNo(), phone, bankNo);
-        user.setSettleAccountId(accountId);
+
+        adapayMerchantService.createMemberForAll(userId.toString(), user.getPhone(), identityAuth.getRealName(), identityAuth.getIdNo());
+        user.setMemberId(user.getId().toString());
+        userRepo.save(user);
+
+        String accountId = adapayMerchantService.createSettleAccountForAll
+                (user.getMemberId(), identityAuth.getRealName(),
+                        identityAuth.getIdNo(), phone, bankNo);
+        user.setSettleAccountId(Optional.ofNullable(accountId).orElse("1"));
         userRepo.save(user);
 
         userBankCardRepo.save(UserBankCard.builder()
@@ -465,13 +476,16 @@ public class UserService {
                 .cardType(bankValidate.getCardType())
                 .cardTypeDesc(bankValidate.getCardTypeDesc())
                 .userId(userId)
+                .phone(phone)
+                .realName(identityAuth.getRealName())
+                .idNo(identityAuth.getIdNo())
                 .build());
     }
 
     public void removeBankCard(Long userId) throws BaseAdaPayException {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
         if (StringUtils.isNotBlank(user.getSettleAccountId()) && StringUtils.isNotBlank(user.getMemberId())) {
-            adapayService.delSettleAccount(user.getMemberId(), user.getSettleAccountId());
+            adapayMerchantService.delSettleAccountForAll(user.getMemberId());
             user.setSettleAccountId(null);
             userRepo.save(user);
             userBankCardRepo.deleteByUserId(userId);
@@ -520,4 +534,113 @@ public class UserService {
         map.put("success", success);
         return map;
     }
+
+
+    public void switchAccount() {
+        switchAccount(adapayProperties.getAppId());
+    }
+
+    public void switchAccount(String appId) {
+        userRepo.findBySettleAccountIdIsNotNull().parallelStream().forEach(user -> {
+            try {
+                IdentityAuth identityAuth = identityAuthRepo.findFirstByUserIdAndStatusAndDelFalseOrderByCreatedAtDesc(user.getId(), AuthStatus.SUCCESS)
+                        .orElseThrow(new BusinessException("用户未认证"));
+                UserBankCard userBankCard = userBankCardRepo.findByUserId(user.getId()).stream().findAny()
+                        .orElseThrow(new BusinessException("未绑卡"));
+                createMember(appId, user.getId().toString(), Optional.ofNullable(userBankCard.getPhone())
+                        .orElse(user.getPhone()), identityAuth.getRealName(), identityAuth.getIdNo());
+                createSettleAccount(appId, user.getId()
+                        .toString(), identityAuth.getRealName(), identityAuth.getIdNo(), Optional.ofNullable(userBankCard.getPhone())
+                        .orElse(user.getPhone()), userBankCard.getBankNo());
+                userBankCard.setPhone(Optional.ofNullable(userBankCard.getPhone()).orElse(user.getPhone()));
+                userBankCardRepo.save(userBankCard);
+            } catch (Exception e) {
+                try {
+                    adapayService.delSettleAccount(user.getMemberId(), user.getSettleAccountId());
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+                user.setSettleAccountId(null);
+                userRepo.save(user);
+                userBankCardRepo.deleteByUserId(user.getId());
+            }
+        });
+    }
+
+    public void createMember(String appId, String memberId, String tel, String realName, String idno) throws BaseAdaPayException {
+        Map<String, Object> memberParams = new HashMap<>();
+        memberParams.put("adapay_func_code", "members.realname");
+        memberParams.put("member_id", memberId);
+        memberParams.put("app_id", appId);
+        memberParams.put("tel_no", tel);
+        memberParams.put("user_name", realName);
+        memberParams.put("cert_type", "00");
+        memberParams.put("cert_id", idno);
+        Map<String, Object> res = AdapayCommon.requestAdapay(memberParams);
+        log.info("createMember\n{}", JSON.toJSONString(res, SerializerFeature.PrettyFormat));
+        if (!("succeeded".equals(MapUtils.getString(res, "status"))
+                || "member_id_exists".equals(MapUtils.getString(res, "error_code")))) {
+            String errMsg = MapUtils.getString(res, "error_msg");
+            String errCode = MapUtils.getString(res, "error_code");
+            throw new BusinessException(errMsg + "(" + errCode + ")");
+        }
+    }
+
+    public String createSettleAccount(String appId, String memberId, String realName, String idNo, String phone, String bankNo) throws BaseAdaPayException {
+        Map<String, Object> settleCountParams = new HashMap<>();
+        Map<String, Object> accountInfo = new HashMap<>();
+        accountInfo.put("card_id", bankNo);
+        accountInfo.put("card_name", realName);
+        accountInfo.put("cert_id", idNo);
+        accountInfo.put("cert_type", "00");
+        accountInfo.put("tel_no", phone);
+        accountInfo.put("bank_acct_type", "2");
+        settleCountParams.put("member_id", memberId);
+        settleCountParams.put("app_id", appId);
+        settleCountParams.put("channel", "bank_account");
+        settleCountParams.put("account_info", accountInfo);
+        Map<String, Object> res = SettleAccount.create(settleCountParams);
+        log.info("createSettleAccount\n{}", JSON.toJSONString(res, SerializerFeature.PrettyFormat));
+        if (!("succeeded".equals(MapUtils.getString(res, "status"))
+                || "account_exists".equals(MapUtils.getString(res, "error_code")))) {
+            String errMsg = MapUtils.getString(res, "error_msg");
+            String errCode = MapUtils.getString(res, "error_code");
+            throw new BusinessException(errMsg + "(" + errCode + ")");
+        }
+        return MapUtils.getString(res, "id");
+    }
+
+    @Async
+    public void checkSettleAccountAsync() {
+        checkSettleAccount();
+    }
+
+    public void checkSettleAccount() {
+        List<User> list = userRepo.findBySettleAccountIdIsNotNull();
+        AtomicInteger count = new AtomicInteger();
+        list.forEach(user -> {
+            try {
+                Thread.sleep(500);
+                IdentityAuth identityAuth = identityAuthRepo.findFirstByUserIdAndStatusAndDelFalseOrderByCreatedAtDesc(user.getId(), AuthStatus.SUCCESS)
+                        .orElseThrow(new BusinessException("用户未认证"));
+                UserBankCard userBankCard = userBankCardRepo.findByUserId(user.getId()).stream().findAny()
+                        .orElseThrow(new BusinessException("未绑卡"));
+                adapayMerchantService.createMemberForAll(
+                        user.getId().toString(), Optional.ofNullable(userBankCard.getPhone()).orElse(user.getPhone()),
+                        identityAuth.getRealName(), identityAuth.getIdNo());
+                adapayMerchantService.createSettleAccountForAll(
+                        user.getId().toString(), identityAuth.getRealName(),
+                        identityAuth.getIdNo(), Optional.ofNullable(userBankCard.getPhone()).orElse(user.getPhone()),
+                        userBankCard.getBankNo());
+                userBankCard.setPhone(Optional.ofNullable(userBankCard.getPhone()).orElse(user.getPhone()));
+                userBankCardRepo.save(userBankCard);
+            } catch (Exception e) {
+                user.setSettleAccountId(null);
+                userRepo.save(user);
+                userBankCardRepo.deleteByUserId(user.getId());
+            }
+            count.getAndIncrement();
+            log.info("checkSettleAccount {}/{}", count.get(), list.size());
+        });
+    }
 }

src/main/java/com/izouma/nineth/utils/AdapayUtils.java

@@ -0,0 +1,28 @@
+package com.izouma.nineth.utils;
+
+import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.huifu.adapay.core.exception.FailureCode;
+import com.izouma.nineth.exception.BusinessException;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
+
+public class AdapayUtils {
+    public static String packageRequestUrl(Map<String, Object> requestParams) throws BaseAdaPayException {
+        String adapayFuncCode = (String) requestParams.get("adapay_func_code");
+        if (StringUtils.isBlank(adapayFuncCode)) {
+            throw new BaseAdaPayException(FailureCode.ADAPAY_FUNC_CODE_NOT_BLANK.getFailureCode());
+        }
+        String adapayApiVersion = (String) requestParams.getOrDefault("adapay_api_version", "v1");
+        return "/" + adapayApiVersion + "/" + StringUtils.replace(adapayFuncCode, ".", "/");
+    }
+
+    public static void checkSuccess(Map<String, Object> map) {
+        if (!"succeeded".equals(MapUtils.getString(map, "status"))) {
+            String errMsg = MapUtils.getString(map, "error_msg");
+            String errCode = MapUtils.getString(map, "error_code");
+            throw new BusinessException(errMsg + "(" + errCode + ")");
+        }
+    }
+}

src/main/java/com/izouma/nineth/web/ActivityCollectionController.java

@@ -0,0 +1,66 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.ActivityCollection;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityCollectionRepo;
+import com.izouma.nineth.service.ActivityCollectionService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityCollection")
+@AllArgsConstructor
+public class ActivityCollectionController extends BaseController {
+    private ActivityCollectionService activityCollectionService;
+    private ActivityCollectionRepo    activityCollectionRepo;
+
+    @PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityCollection save(@RequestBody ActivityCollection record) {
+        if (record.getCollectionId().equals(record.getAwardCollectionId())) {
+            throw new BusinessException("兑换的藏品不能和领取的藏品相同");
+        }
+        if (record.getId() != null) {
+            ActivityCollection orig = activityCollectionRepo.findById(record.getId())
+                    .orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityCollectionRepo.save(orig);
+        }
+        record.setStock(record.getTotal());
+        return activityCollectionRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityCollection> all(@RequestBody PageQuery pageQuery) {
+        return activityCollectionService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityCollection get(@PathVariable Long id) {
+        return activityCollectionRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityCollectionRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityCollection> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/nineth/web/ActivityMaterialController.java

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityMaterialRepo;
+import com.izouma.nineth.service.ActivityMaterialService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityMaterial")
+@AllArgsConstructor
+public class ActivityMaterialController extends BaseController {
+    private ActivityMaterialService activityMaterialService;
+    private ActivityMaterialRepo activityMaterialRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityMaterial save(@RequestBody ActivityMaterial record) {
+        if (record.getId() != null) {
+            ActivityMaterial orig = activityMaterialRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityMaterialRepo.save(orig);
+        }
+        return activityMaterialRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityMaterial> all(@RequestBody PageQuery pageQuery) {
+        return activityMaterialService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityMaterial get(@PathVariable Long id) {
+        return activityMaterialRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityMaterialRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityMaterial> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/nineth/web/ActivityOrderController.java

@@ -0,0 +1,67 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.ActivityOrder;
+import com.izouma.nineth.domain.Asset;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityOrderRepo;
+import com.izouma.nineth.service.ActivityOrderService;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SecurityUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityOrder")
+@AllArgsConstructor
+public class ActivityOrderController extends BaseController {
+    private ActivityOrderService activityOrderService;
+    private ActivityOrderRepo    activityOrderRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityOrder save(@RequestBody ActivityOrder record) {
+        if (record.getId() != null) {
+            ActivityOrder orig = activityOrderRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityOrderRepo.save(orig);
+        }
+        return activityOrderRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityOrder> all(@RequestBody PageQuery pageQuery) {
+        return activityOrderService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityOrder get(@PathVariable Long id) {
+        return activityOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityOrderRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityOrder> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/create")
+    public Asset create(@RequestParam Long mintActivityId) {
+        return activityOrderService.create(SecurityUtils.getAuthenticatedUser(), mintActivityId);
+    }
+}
+

src/main/java/com/izouma/nineth/web/AssetController.java

@@ -9,7 +9,6 @@ import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.UserHistory;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
-import com.izouma.nineth.repo.TokenHistoryRepo;
 import com.izouma.nineth.service.AssetMintService;
 import com.izouma.nineth.service.AssetService;
 import com.izouma.nineth.service.GiftOrderService;
@@ -36,7 +35,6 @@ public class AssetController extends BaseController {
     private AssetService     assetService;
     private AssetRepo        assetRepo;
     private GiftOrderService giftOrderService;
-    private TokenHistoryRepo tokenHistoryRepo;
     private AssetMintService assetMintService;
 
     //@PreAuthorize("hasRole('ADMIN')")
@@ -107,7 +105,8 @@ public class AssetController extends BaseController {
     @PostMapping("/gift")
     @ApiOperation("转赠")
     public GiftOrder gift(@RequestParam Long assetId, @RequestParam Long toUserId) {
-        return giftOrderService.gift(SecurityUtils.getAuthenticatedUser().getId(), assetId, toUserId);
+        throw new BusinessException("无转赠");
+//        return giftOrderService.gift(SecurityUtils.getAuthenticatedUser().getId(), assetId, toUserId);
     }
 
     @GetMapping("/tokenHistory")

src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -65,8 +65,8 @@ public class AuthenticationController {
 
     @PostMapping("/phoneRegister")
     @ApiOperation(value = "手机号密码注册")
-    public String phonePwdLogin(String phone, String code, String password, String inviteCode) {
-        User user = userService.phoneRegister(phone, code, password, inviteCode);
+    public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor) {
+        User user = userService.phoneRegister(phone, code, password, inviteCode, invitor);
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
 

src/main/java/com/izouma/nineth/web/CouponController.java

@@ -1,5 +1,8 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.Coupon;
+import com.izouma.nineth.dto.GeneralDTO;
+import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.service.CouponService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -7,6 +10,7 @@ import com.izouma.nineth.repo.CouponRepo;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -14,13 +18,15 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/coupon")
 @AllArgsConstructor
 public class CouponController extends BaseController {
-    private CouponService couponService;
-    private CouponRepo couponRepo;
+    private CouponService  couponService;
+    private CouponRepo     couponRepo;
+    private CollectionRepo collectionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -42,7 +48,20 @@ public class CouponController extends BaseController {
 
     @GetMapping("/get/{id}")
     public Coupon get(@PathVariable Long id) {
-        return couponRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        Coupon coupon = couponRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        if (CollectionUtils.isNotEmpty(coupon.getCollectionIds())) {
+            List<GeneralDTO> dtos = collectionRepo.findAllByIdIn(coupon.getCollectionIds())
+                    .stream()
+                    .map(collection -> {
+                        GeneralDTO dto = new GeneralDTO();
+                        dto.setId(collection.getId());
+                        dto.setName(collection.getName());
+                        return dto;
+                    })
+                    .collect(Collectors.toList());
+            coupon.setCollections(dtos);
+        }
+        return coupon;
     }
 
     @PostMapping("/del/{id}")

src/main/java/com/izouma/nineth/web/OrderController.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
 
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.izouma.nineth.domain.Order;
+import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.OrderDTO;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.CollectionType;
@@ -74,13 +75,25 @@ public class OrderController extends BaseController {
         }).collect(Collectors.toList()));
     }
 
+    @PostMapping("/mqCreate")
+    public HashMap<String, String> mqCreate(@RequestParam Long collectionId, @RequestParam int qty,
+                                            @RequestParam(required = false) Long addressId,
+                                            @RequestParam(required = false) Long couponId,
+                                            @RequestParam(required = false) Long invitor) {
+        final User user = SecurityUtils.getAuthenticatedUser();
+        return new HashMap<>() {{
+            put("id", orderService.mqCreate(user.getId(), collectionId, qty, addressId, couponId, invitor));
+        }};
+    }
+
     @PostMapping("/create")
     public Order create(@RequestParam Long collectionId, @RequestParam int qty,
                         @RequestParam(required = false) Long addressId,
                         @RequestParam(required = false) Long couponId,
                         @RequestParam(required = false) Long invitor) {
-        return orderService.create(SecurityUtils.getAuthenticatedUser().getId(),
-                collectionId, qty, addressId, couponId, invitor);
+//        return orderService.create(SecurityUtils.getAuthenticatedUser().getId(),
+//                collectionId, qty, addressId, couponId, invitor);
+        throw new BusinessException("接口暂不可用，请刷新后重试");
     }
 
     @PostMapping("/hide")
@@ -111,5 +124,10 @@ public class OrderController extends BaseController {
             orderRepo.save(order);
         });
     }
+
+    @GetMapping("/createResult")
+    public Object createResult(@RequestParam String id) {
+        return orderService.queryCreateOrder(id);
+    }
 }
 

src/main/java/com/izouma/nineth/web/UserController.java

@@ -238,6 +238,13 @@ public class UserController extends BaseController {
                 .getContent();
         ExcelUtils.export(response, data);
     }
+
+    @PreAuthorize("hasAnyRole('ADMIN')")
+    @GetMapping("/checkSettleAccount")
+    public String checkSettleAccount() {
+        userService.checkSettleAccountAsync();
+        return "ok";
+    }
 }
 
 

src/main/modern-point/src/router/index.js

@@ -435,6 +435,14 @@ const routes = [
             title: 'Cosmos Art'
         }
     },
+    {
+        path: '/activityList1',
+        name: 'activityList1',
+        component: () => import('../views/activity/List1.vue'),
+        meta: {
+            title: 'Cosmos Art'
+        }
+    },
     {
         path: '/activityDetail',
         name: 'activityDetail',
@@ -523,7 +531,15 @@ const routes = [
         meta: {
             title: 'Cosmos Art'
         }
-    }
+    },
+    {
+        path: '/share',
+        name: 'share',
+        component: () => import('../views/user/Share.vue'),
+        meta: {
+            title: 'Cosmos Art'
+        }
+    },
 ];
 
 const router = createRouter({

src/main/modern-point/src/views/Discover.vue

@@ -43,6 +43,11 @@
                     <img class="grid-img" src="@assets/info_icon_xiliehuodong.png" />
                 </template>
             </van-grid-item>
+            <van-grid-item text="活动收集" :to="{ path: '/activityList1' }">
+                <template v-slot:icon>
+                    <img class="grid-img" src="@assets/bangdan.png" />
+                </template>
+            </van-grid-item>
             <van-grid-item
                 text="衍生品"
                 :to="{

src/main/modern-point/src/views/Mine.vue

@@ -155,6 +155,11 @@
                     <van-icon :name="require('@assets/icon-anquan.png')" class="search-icon" />
                 </template>
             </van-grid-item>
+            <van-grid-item text="邀请有礼" :to="{ path: '/share' }">
+                <template #icon>
+                    <van-icon :name="require('@assets/gift.png')" class="search-icon" />
+                </template>
+            </van-grid-item>
         </van-grid>
 
         <div class="tabbar-placeholder"></div>

src/main/modern-point/src/views/Submit.vue

@@ -250,32 +250,55 @@ export default {
                     });
                 });
         },
-        submit() {
+        createOrder() {
             if (!this.payType) {
                 this.$toast('请选择支付方式');
                 return;
             }
-            this.$toast.loading('加载中');
-            let url = '/order/create?collectionId=' + this.$route.query.id + '&qty=1';
-            if (this.couponInfo) {
-                url += '&couponId=' + this.couponInfo.id;
-            }
-            let invitor = sessionStorage.getItem('invitor');
-            if (invitor) {
-                url += '&invitor=' + invitor;
-            }
-            this.$http
-                .post(url)
+            this.$toast.loading('请不要离开当前页面');
+
+            let params = {
+                collectionId: this.$route.query.id,
+                qty: 1,
+                couponId: (this.couponInfo || {}).id || '',
+                invitor: sessionStorage.getItem('invitor')
+            };
+            return this.$http.post('/order/mqCreate', params).then(res => {
+                return new Promise((resolve, reject) => {
+                    let checkOrder = () => {
+                        this.$http
+                            .get('/order/createResult', { id: res.id })
+                            .then(res => {
+                                if (res) {
+                                    clearInterval(this.createOrderTimer);
+                                    this.createOrderTimer = null;
+                                    if (res.success) {
+                                        resolve(res.data);
+                                    } else {
+                                        reject({ error: res.data });
+                                    }
+                                }
+                            })
+                            .catch(e => {
+                                clearInterval(this.createOrderTimer);
+                                this.createOrderTimer = null;
+                                reject(e);
+                            });
+                    };
+                    setTimeout(checkOrder, 500);
+                    this.createOrderTimer = setInterval(checkOrder, 2000);
+                });
+            });
+        },
+        submit() {
+            this.createOrder()
                 .then(res => {
                     if (this.money) {
                         this.$toast.clear();
                         this.orderId = res.id;
-                        this.$router.replace({ query: { ...this.$route.query, orderId: res.id } });
+                        this.$router.replace('/submit?orderId=' + res.id);
                         this.$nextTick(() => {
-                            if (this.$store.state.review) {
-                                window.store.order('358');
-                                this.getOrder(true);
-                            } else if (this.payType === 'ALIPAY') {
+                            if (this.payType === 'ALIPAY') {
                                 if (this.inWeixin) {
                                     document.location.replace(
                                         resolveUrl(this.$baseUrl, '/payOrder/alipay_wx?id=' + res.id)
@@ -293,12 +316,9 @@ export default {
                                             this.$nextTick(() => {
                                                 document.getElementById('pay').click();
                                             });
-
-                                            this.$toast.loading({
-                                                message: '加载中...',
-                                                forbidClick: true
-                                            });
-                                            this.getOrder(true);
+                                            if (!this.inApp) {
+                                                this.getOrder(true);
+                                            }
                                         })
                                         .catch(e => {
                                             if (e.error) {
@@ -317,17 +337,18 @@ export default {
                                     .then(res => {
                                         if ('wx_pub' === this.payChannel) {
                                             console.log('wxPayParams', res);
+                                            let _this = this;
                                             wx.chooseWXPay({
                                                 ...res,
                                                 success(res) {
-                                                    this.$toast.success('支付成功');
+                                                    _this.$toast.success('支付成功');
                                                     setTimeout(() => {
-                                                        this.$router.replace('/orders');
+                                                        _this.$router.replace('/orderDetail?id=' + _this.orderId);
                                                     }, 1000);
                                                 },
                                                 fail(e) {
                                                     console.log(e);
-                                                    this.$toast('支付失败，请稍后再试');
+                                                    _this.$toast('支付失败，请稍后再试');
                                                 }
                                             });
                                         } else {
@@ -336,11 +357,6 @@ export default {
                                             this.$nextTick(() => {
                                                 document.getElementById('pay').click();
                                             });
-
-                                            this.$toast.loading({
-                                                message: '加载中...',
-                                                forbidClick: true
-                                            });
                                             this.getOrder(true);
                                         }
                                         // console.log({

src/main/modern-point/src/views/activity/List1.vue

@@ -0,0 +1,206 @@
+<template>
+    <div class="search">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+            <template v-for="(item, index) in list" :key="index">
+                <div class="activity">
+                    <van-image
+                        width="calc(50vw - 20px)"
+                        height="calc(50vw - 20px)"
+                        :src="getImg(item.pic)"
+                        fit="cover"
+                    />
+                    <div class="stock">剩余数量:{{ item.stock }}张</div>
+                    <div class="content">
+                        <div class="text1">{{ item.name }}</div>
+                        <div class="text2">
+                            集齐{{ item.num }}张{{ item.collectionName }}徽章, 可换取一张<span>{{
+                                item.awardCollectionName
+                            }}</span
+                            >藏品
+                        </div>
+                        <van-button
+                            size="small"
+                            @click="getActivity(item, index)"
+                            :disabled="!canGet(item) || item.stock === 0"
+                            type="primary"
+                            round
+                            block
+                            >{{ item.stock ? '领取' : '无库存' }}</van-button
+                        >
+                    </div>
+
+                    <div class="status" :class="{ used: !canGet(item) }">{{ canGet(item) ? '已集齐' : '未集齐' }}</div>
+                </div>
+            </template>
+
+            <van-empty v-if="empty" description="暂无活动哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+        </van-list>
+
+        <order-open ref="box" :imgSrc="getImg(changeImgs(orderInfo.pic))"></order-open>
+    </div>
+</template>
+
+<script>
+import OrderOpen from '../../components/order/OrderOpen.vue';
+import list from '../../mixins/list';
+import product from '../../mixins/product';
+export default {
+    components: { OrderOpen },
+    name: 'Search',
+    mixins: [list, product],
+    data() {
+        return {
+            list: [],
+            empty: false,
+            url: '/activityCollection/all',
+            orderInfo: {}
+        };
+    },
+    methods: {
+        beforeData() {
+            return {
+                query: {
+                    del: false
+                }
+            };
+        },
+        canGet(info) {
+            return info.collections && info.collections.length >= info.num;
+        },
+        afterData() {
+            if (this.isLogin) {
+                [...this.list].forEach((item, index) => {
+                    console.log(item);
+                    this.getCollect(item.collectionId).then(res => {
+                        this.list[index] = { ...item, collections: res };
+                    });
+                });
+            }
+        },
+        getCollect(id) {
+            return this.$http
+                .post(
+                    '/asset/all',
+                    {
+                        query: {
+                            userId: this.$store.state.userInfo.id,
+                            collectionId: Number(id),
+                            projectId: this.$store.state.projectId,
+                            status: 'NORMAL,TRADING,GIFTING'
+                        }
+                    },
+                    { body: 'json' }
+                )
+                .then(res => {
+                    return Promise.resolve(res.content);
+                });
+        },
+        getActivity(info, index) {
+            this.$dialog
+                .confirm({
+                    title: '提示',
+                    message: `确认要使用${info.num}张${info.collectionName}兑换一张${info.awardCollectionName}吗?`,
+                    confirmButtonText: '立即兑换'
+                })
+                .then(res => {
+                    return this.$http.post('/activityOrder/create?mintActivityId=' + info.id);
+                })
+                .then(res => {
+                    this.getData(true);
+                    this.orderInfo = res;
+                    this.show();
+                })
+                .catch(e => {
+                    if (e && e.error) {
+                        this.$toast(e.error);
+                    }
+                });
+        },
+        show() {
+            this.$refs.box.show = true;
+            this.$nextTick(() => {
+                this.$refs.box.open();
+            });
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.search {
+    padding-bottom: 50px;
+    background-color: @bg3;
+}
+.van-list {
+    padding: 10px;
+}
+.activity {
+    display: inline-block;
+    vertical-align: top;
+    width: calc(50vw - 20px);
+    box-sizing: border-box;
+    margin: 5px;
+    border-radius: 8px;
+    overflow: hidden;
+    position: relative;
+
+    .status {
+        font-size: 12px;
+        background-color: #f7931a;
+        color: @bg;
+        position: absolute;
+        top: 0;
+        right: 0;
+        border-radius: 0 8px 0 8px;
+        padding: 0 6px;
+        line-height: 18px;
+
+        &.used {
+            background-color: #939599;
+        }
+    }
+    .van-image {
+        display: block;
+    }
+    .text1 {
+        font-size: 16px;
+        color: @text0;
+        line-height: 24px;
+        text-align: center;
+    }
+
+    .content {
+        padding: 7px;
+        background-color: @bg;
+    }
+
+    .text2 {
+        text-align: center;
+        font-size: 14px;
+        line-height: 16px;
+        margin-top: 5px;
+        color: @text0;
+        span {
+            color: @prim;
+        }
+    }
+
+    .van-button {
+        margin-top: 10px;
+    }
+}
+.stock {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: calc(50vw - 40px);
+    line-height: 20px;
+    background-color: rgba(0, 0, 0, 0.6);
+    color: #fff;
+    text-align: center;
+}
+.van-button--disabled {
+    background-color: #939599;
+    opacity: 1;
+}
+</style>

src/main/modern-point/src/views/asset/Detail.vue

@@ -117,7 +117,7 @@
                         <div v-else class="text5">艺术家未设置</div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item name="4" class="goods-info init">
+                <!-- <van-collapse-item name="4" class="goods-info init">
                     <template #title>
                         <div class="page-title">
                             <img src="@assets/qiaoqiaohua-icon-weidakai.png" alt="" /> 悄悄话<span
@@ -135,7 +135,7 @@
                         </div>
                         <div class="text5" v-else>艺术家未设置</div>
                     </div>
-                </van-collapse-item>
+                </van-collapse-item> -->
                 <van-collapse-item name="5" class="goods-info">
                     <template #title>
                         <div class="titleIcon page-title">
@@ -205,10 +205,10 @@
         </div> -->
         <div class="btn van-safe-area-bottom" ref="btn" v-if="info.status === 'NORMAL'">
             <div class="btns1">
-                <div class="add" @click="Add">
+                <!-- <div class="add" @click="Add">
                     <img class="img" src="@assets/icon-dianzan.png" alt="" />
                     <div class="text2">赠送</div>
-                </div>
+                </div> -->
                 <van-button class="btn1" type="primary" block round @click="Exhibition">{{
                     info.publicShow ? '取消展示' : '公开展示'
                 }}</van-button>

src/main/modern-point/src/views/product/Detail.vue

@@ -130,7 +130,7 @@
                         <div v-else class="tips">艺术家未设置</div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item name="4" class="goods-info">
+                <!-- <van-collapse-item name="4" class="goods-info">
                     <template #title>
                         <div class="page-title">
                             <img src="@assets/qiaoqiaohua-icon-weidakai.png" alt="" /> 悄悄话<span
@@ -145,7 +145,7 @@
                         </div>
                     </div>
                     <div class="tips" v-else>艺术家未设置</div>
-                </van-collapse-item>
+                </van-collapse-item> -->
                 <van-collapse-item name="5" class="goods-info">
                     <template #title>
                         <div class="titleIcon page-title">

src/main/modern-point/src/views/user/Share.vue

@@ -0,0 +1,285 @@
+<template>
+    <div class="page">
+        <div class="share-img">
+            <img src="../../assets/share1.png" alt="" />
+        </div>
+        <div class="share-btn">
+            <van-button type="primary" @click="share" round block>立即邀请</van-button>
+        </div>
+        <!-- <div class="code">
+            <div class="code-top">
+                <div class="text1">我的邀请码</div>
+                <div class="text2">7474448585955505057578578</div>
+                <van-button round plain> 复制</van-button>
+            </div>
+            <div class="code-btn">
+                <van-button type="primary" round block>领取奖励</van-button>
+            </div>
+        </div> -->
+
+        <div class="panel">
+            <div class="panel-title">我的邀请</div>
+            <div class="panel-box">
+                <div class="panel-item">
+                    <div class="text1">
+                        <span>{{ userInfo.inviteAirDrop || 0 }}</span>
+                        <small>个</small>
+                    </div>
+                    <div class="text2">已获得藏品</div>
+                </div>
+                <div class="panel-item">
+                    <div class="text1">
+                        <span>{{ userInfo.inviteNum || 0 }}</span>
+                        <small>人</small>
+                    </div>
+                    <div class="text2">邀请好友</div>
+                </div>
+            </div>
+        </div>
+
+        <div class="tips">
+            活动规则：<br />
+            1、活动期间内，成功邀请10名注册Cosmos
+            Art平台并且完成实名认证即有机会获得《30w就这？纪念徽章-铜卡》数字藏品卡1张，限量1921份，送完即止；<br />
+            2、活动期间内，累计邀请20名新用户注册并且完成实名认证将有机会获得“莫斯马克米奇”数字藏品空投一张（奖励于“莫斯马克米奇”首次发售后5个小时内空投至用户藏品室），限量500份，送完即止；<br />
+            3、活动期间累计邀请注册且完成实名认证的用户数量排名前十的收藏师将额外获得惊喜奖励。<br />
+        </div>
+
+        <van-overlay :show="show" @click="show = false">
+            <div class="wrapper">
+                <img :src="img" class="wrapper-img" v-if="img" alt="" />
+                <div class="wrapper-box" v-else ref="post" @click.stop>
+                    <img class="share2" :src="shareBg" alt="" />
+                    <vue-qrcode :value="url" :options="{ width: 70, margin: 3 }" class="share-code"></vue-qrcode>
+                </div>
+
+                <img src="../../assets/close.png" alt="" class="close" />
+            </div>
+        </van-overlay>
+    </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import resolveUrl from 'resolve-url';
+import vueQrcode from '@chenfengyuan/vue-qrcode';
+import html2canvas from 'html2canvas';
+export default {
+    computed: {
+        ...mapState(['userInfo']),
+        url() {
+            return resolveUrl(this.$baseUrl, 'cosmos/register?invitor=' + this.userInfo.id);
+        }
+    },
+    components: {
+        vueQrcode
+    },
+    data() {
+        return {
+            show: false,
+            img: '',
+            shareBg: ''
+        };
+    },
+    mounted() {
+        this.getImgBase64(require('../../assets/share2.png'), 'shareBg');
+    },
+    methods: {
+        share() {
+            this.show = true;
+            if (!this.img) {
+                this.$toast.loading({
+                    message: '加载中...',
+                    forbidClick: true
+                });
+                setTimeout(() => {
+                    this.loadImg();
+                }, 500);
+            }
+        },
+        loadImg() {
+            html2canvas(this.$refs.post, {
+                useCORS: true,
+                allowTaint: true,
+                backgroundColor: null,
+                scale: 3
+            }).then(canvas => {
+                this.$toast.clear();
+                this.img = canvas.toDataURL('image/png');
+            });
+        },
+        getImgBase64(img2, key) {
+            let img = new Image();
+            img.crossOrigin = 'anonymous';
+            let _this = this;
+            img.onload = function () {
+                let src = _this.image2Base64(img);
+                _this[key] = src;
+            };
+            img.src = img2;
+        },
+        image2Base64(img) {
+            let canvas = document.createElement('canvas');
+            canvas.width = img.width;
+            canvas.height = img.height;
+            let ctx = canvas.getContext('2d');
+            ctx.drawImage(img, 0, 0, img.width, img.height);
+            let dataURL = canvas.toDataURL('image/png');
+            return dataURL;
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.page {
+    background-color: #f3f4f5;
+}
+.share-btn {
+    padding: 16px 70px;
+}
+
+.code {
+    padding: 0 7px;
+    .code-top {
+        .flex();
+        height: 56px;
+        border-bottom: 1px dotted #ebeff1;
+
+        .text1 {
+            font-size: 12px;
+            color: #939599;
+        }
+        .text2 {
+            font-size: 12px;
+            color: #26273c;
+            margin-left: 4px;
+            flex-grow: 1;
+        }
+        .van-button {
+            border: 1px solid #ebeff1;
+            min-width: 70px;
+        }
+    }
+    background-color: #fff;
+    margin: 0 16px;
+    border-radius: 12px;
+
+    .code-btn {
+        padding: 12px 80px 16px;
+    }
+}
+
+.panel {
+    margin: 20px 16px 0;
+    background: #ffffff;
+    border-radius: 12px;
+
+    .panel-title {
+        font-size: 18px;
+        font-weight: bold;
+        line-height: 24px;
+        color: #26273c;
+        padding-top: 22px;
+        text-align: center;
+    }
+
+    .panel-box {
+        .flex();
+        .panel-item {
+            width: 50%;
+            .flex-col();
+            align-items: center;
+            justify-content: center;
+            padding: 28px 0;
+
+            .text1 {
+                font-size: 26px;
+                font-weight: bold;
+                line-height: 35px;
+                color: #ff6464;
+                .flex();
+                span {
+                    display: inline-block;
+                }
+                small {
+                    font-size: 12px;
+                    font-weight: normal;
+                    line-height: 17px;
+                    color: #939599;
+                    margin-top: 6px;
+                    display: inline-block;
+                }
+            }
+
+            .text2 {
+                font-size: 12px;
+                line-height: 17px;
+                color: #939599;
+                margin-top: 2px;
+            }
+        }
+    }
+}
+
+.tips {
+    font-size: 14px;
+    line-height: 24px;
+    color: #939599;
+    margin: 25px 16px;
+}
+
+.share-img {
+    padding: 19px 16px 0;
+    img {
+        width: 100%;
+    }
+}
+.wrapper {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    .flex-col();
+    align-items: center;
+    justify-content: center;
+}
+.share2 {
+    width: 300px;
+    height: auto;
+    display: block;
+}
+.share-code {
+    position: absolute;
+    bottom: 8px;
+    right: 7px;
+    border-radius: 6px;
+}
+
+.wrapper-box {
+    border-radius: 10px;
+    overflow: hidden;
+    position: relative;
+    .title {
+        font-size: 16px;
+        line-height: 24px;
+        color: #26273c;
+        opacity: 1;
+        text-align: center;
+        padding: 9px;
+        background-color: #fff;
+    }
+}
+
+.wrapper-img {
+    width: 300px;
+    display: block;
+}
+
+.close {
+    width: 40px;
+    height: 40px;
+    display: block;
+    margin-top: 12px;
+}
+</style>

src/main/resources/application.yaml

@@ -84,6 +84,7 @@ spring:
     open-in-view: true
   redis:
     host: 120.78.235.238
+    database: 4
     port: 6379
     password: 98dwT6ghgoRVxwcRrDDy
     lettuce:
@@ -141,6 +142,20 @@ general:
   name: 第九空间
   org: 广州麦塔沃司信息技术有限公司
   short-name: 麦塔沃司
+  create-order-group: create-order-group-dev
+  create-order-topic: create-order-topic-dev
+  update-stock-group: update-stock-group-dev
+  update-stock-topic: update-stock-topic-dev
+  update-sale-group: update-sale-group-dev
+  update-sale-topic: update-sale-topic-dev
+  order-notify-group: order-notify-group-dev
+  order-notify-topic: order-notify-topic-dev
+  mint-group: mint-group-dev
+  mint-topic: mint-topic-dev
+  update-activity-stock-group: update-activity-stock-group-dev
+  update-activity-stock-topic: update-activity-stock-topic-dev
+  broadcast-event-group: broadcast-event-group-dev
+  broadcast-event-topic: broadcast-event-topic-dev
 mychain:
   rest:
     bizid: a00e36c5
@@ -198,6 +213,12 @@ adapay:
   app-public-key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwN6xgd6Ad8v2hIIsQVnbt8a3JituR8o4Tc3B5WlcFR55bz4OMqrG/356Ur3cPbc2Fe8ArNd/0gZbC9q56Eb16JTkVNA/fye4SXznWxdyBPR7+guuJZHc/VW2fKH2lfZ2P3Tt0QkKZZoawYOGSMdIvO+WqK44updyax0ikK6JlNQIDAQAB
   wx-app-id:
   notify-url: https://moderntest.9space.vip/notify/adapay
+
+rocketmq:
+  name-server: 112.74.34.84:9876
+  producer:
+    group: my-producer-dev
+    send-message-timeout: 30000
 ---
 
 spring:
@@ -213,9 +234,24 @@ spring:
     password: glV1BJCzcNB9ughR
   redis:
     host: 127.0.0.1
-    database: 1
+    database: 5
 general:
   host: https://modern.9space.vip
+  create-order-group: create-order-group
+  create-order-topic: create-order-topic
+  update-stock-group: update-stock-group
+  update-stock-topic: update-stock-topic
+  update-sale-group: update-sale-group
+  update-sale-topic: update-sale-topic
+  order-notify-group: order-notify-group
+  order-notify-topic: order-notify-topic
+  mint-group: mint-group
+  mint-topic: mint-topic
+  update-activity-stock-group: update-activity-stock-group
+  update-activity-stock-topic: update-activity-stock-topic
+  broadcast-event-group: broadcast-event-group
+  broadcast-event-topic: broadcast-event-topic
+  notify-server: true
 wx:
   pay:
     notify-url: https://modern.9space.vip/notify/order/weixin
@@ -226,3 +262,7 @@ alipay:
   return-url: https://modern.9space.vip/9th/home
 adapay:
   notify-url: https://modern.9space.vip/notify/adapay
+rocketmq:
+  name-server: 172.31.167.5:9876
+  producer:
+    group: my-producer

src/main/vue/src/router.js

@@ -470,7 +470,55 @@ const router = new Router({
                     meta: {
                         title: '藏品管理'
                     }
-                }
+                },
+                {
+                    path: '/adapayMerchantEdit',
+                    name: 'AdapayMerchantEdit',
+                    component: () => import(/* webpackChunkName: "adapayMerchantEdit" */ '@/views/AdapayMerchantEdit.vue'),
+                    meta: {
+                       title: 'ada编辑',
+                    },
+                },
+                {
+                    path: '/adapayMerchantList',
+                    name: 'AdapayMerchantList',
+                    component: () => import(/* webpackChunkName: "adapayMerchantList" */ '@/views/AdapayMerchantList.vue'),
+                    meta: {
+                       title: 'ada',
+                    },
+               },
+                {
+                    path: '/activityCollectionEdit',
+                    name: 'ActivityCollectionEdit',
+                    component: () => import(/* webpackChunkName: "activityCollectionEdit" */ '@/views/ActivityCollectionEdit.vue'),
+                    meta: {
+                       title: '活动收集编辑',
+                    },
+                },
+                {
+                    path: '/activityCollectionList',
+                    name: 'ActivityCollectionList',
+                    component: () => import(/* webpackChunkName: "activityCollectionList" */ '@/views/ActivityCollectionList.vue'),
+                    meta: {
+                       title: '活动收集',
+                    },
+               },
+                {
+                    path: '/activityOrderEdit',
+                    name: 'ActivityOrderEdit',
+                    component: () => import(/* webpackChunkName: "activityOrderEdit" */ '@/views/ActivityOrderEdit.vue'),
+                    meta: {
+                       title: '收集记录编辑',
+                    },
+                },
+                {
+                    path: '/activityOrderList',
+                    name: 'ActivityOrderList',
+                    component: () => import(/* webpackChunkName: "activityOrderList" */ '@/views/ActivityOrderList.vue'),
+                    meta: {
+                       title: '收集记录',
+                    },
+               }
                 /**INSERT_LOCATION**/
             ]
         },
@@ -530,4 +578,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/ActivityCollectionEdit.vue

@@ -0,0 +1,249 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="108px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="name" label="活动名称">
+                        <el-input v-model="formData.name" :disabled="!canEdit"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="collectionId" label="兑换藏品">
+                        <el-select
+                            v-model="formData.collectionId"
+                            filterable
+                            :filter-method="filterCollection"
+                            style="width: 100%"
+                            @change="changCollection"
+                            :disabled="!canEdit"
+                        >
+                            <el-option v-for="item in filterOptions" :label="item.name" :value="item.id" :key="item.id">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">#{{ item.id }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="num" label="兑换数量">
+                        <el-input-number type="number" v-model="formData.num" :disabled="!canEdit"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="total" label="发行数量">
+                        <el-input-number type="number" v-model="formData.total" :disabled="!canEdit"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="awardCollectionId" label="获得藏品">
+                        <el-select
+                            v-model="formData.awardCollectionId"
+                            filterable
+                            :filter-method="filterCollection1"
+                            style="width: 100%"
+                            @change="changAwardCollection"
+                            :disabled="!canEdit"
+                        >
+                            <el-option
+                                v-for="item in filterOptions1"
+                                :label="item.name"
+                                :value="item.id"
+                                :key="item.id"
+                            >
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">#{{ item.id }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ActivityCollectionEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('activityCollection/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post(
+                '/collection/all',
+                {
+                    size: 10000,
+                    sort: 'sort,desc;createdAt,desc',
+                    query: { del: false, source: 'OFFICIAL', type: 'DEFAULT' }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                this.options = res.content;
+                this.filterOptions = this.options.filter(i => i.projectId == this.$store.state.projectId);
+                this.filterOptions1 = this.options.filter(i => i.projectId == this.$store.state.projectId);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                projectId: this.$store.state.projectId
+            },
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: 'blur'
+                    }
+                ],
+                pic: [
+                    {
+                        required: true,
+                        message: '请上传图片',
+                        trigger: 'blur'
+                    }
+                ],
+                collectionId: [
+                    {
+                        required: true,
+                        message: '请选择兑换藏品',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入兑换数量',
+                        trigger: 'blur'
+                    }
+                ],
+                total: [
+                    {
+                        required: true,
+                        message: '请输入发行数量',
+                        trigger: 'blur'
+                    }
+                ],
+                awardCollectionId: [
+                    {
+                        required: true,
+                        message: '请选择获得藏品',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            options: [],
+            filterOptions: [],
+            filterOptions1: []
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    methods: {
+        filterCollection(val) {
+            this.filterOptions = this.options.filter(
+               (i => i.name.includes(val) || i.id == val)
+            );
+        },
+        filterCollection1(val) {
+            this.filterOptions1 = this.options.filter(
+                i => (i.name.includes(val) || i.id == val)
+            );
+        },
+        changeProject(val) {
+            this.filterOptions = this.options.filter(i => i.projectId == val);
+            this.filterOptions1 = this.options.filter(i => i.projectId == val);
+        },
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/activityCollection/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/activityCollection/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        changAwardCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.awardCollectionName = data.name;
+            console.log(this.formData.awardCollectionName);
+        },
+        changCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.collectionName = data.name;
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
+</style>

src/main/vue/src/views/ActivityCollectionList.vue

@@ -0,0 +1,193 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button>
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="活动名称"> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
+            <el-table-column prop="collectionId" label="藏品ID"> </el-table-column>
+            <el-table-column prop="num" label="藏品数量"> </el-table-column>
+            <el-table-column prop="stock" label="剩余数量"> </el-table-column>
+            <el-table-column prop="total" label="发行数量"> </el-table-column>
+            <el-table-column prop="awardCollectionId" label="领取藏品ID"> </el-table-column>
+            <el-table-column prop="awardCollectionName" label="领取藏品名称"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ActivityCollectionList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/activityCollection/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false, projectId: this.$store.state.projectId } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/activityCollectionEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/activityCollectionEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/activityCollection/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/activityCollection/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/ActivityOrderEdit.vue

@@ -0,0 +1,112 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="userId" label="用户ID">
+                                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="phone" label="手机号">
+                                    <el-input v-model="formData.phone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="activityCollectionId" label="活动ID">
+                                    <el-input-number type="number" v-model="formData.activityCollectionId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="activityCollection" label="活动名称">
+                                    <el-input v-model="formData.activityCollection"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="material" label="material">
+                                    <el-input v-model="formData.material"></el-input>
+                        </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ActivityOrderEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('activityOrder/get/' + this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/activityOrder/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/ActivityOrderList.vue

@@ -0,0 +1,175 @@
+<template>
+    <div  class="list-view">
+        <page-title>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+                新增
+            </el-button>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                    placeholder="搜索..."
+                    v-model="search"
+                    clearable
+                    class="filter-item search"
+                    @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight" v-loading="fetchingData">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollectionId" label="活动ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollection" label="活动名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="material" label="material"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'ActivityOrderList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/activityOrder/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                return { search: this.search, query: { del: false } };
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/activityOrder/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/AdapayMerchantEdit.vue

@@ -0,0 +1,133 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="89px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="name" label="name">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="appId" label="appId">
+                        <el-input v-model="formData.appId"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="apiKey" label="apiKey">
+                        <el-input v-model="formData.apiKey"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="mockKey" label="mockKey">
+                        <el-input v-model="formData.mockKey"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="publicKey" label="publicKey">
+                        <el-input v-model="formData.publicKey" type="textarea"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="privKey" label="privKey">
+                        <el-input v-model="formData.privKey" type="textarea"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="wxAppId" label="wxAppId">
+                        <el-input v-model="formData.wxAppId"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="status" label="status">
+                        <el-input v-model="formData.status"></el-input>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'AdapayMerchantEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('adapayMerchant/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name: [
+                    {
+                        pattern: /^[a-z0-9-]+$/,
+                        message: '只能包含小写字母和数字-',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            data.name = data.name.toLowerCase();
+
+            this.saving = true;
+            this.$http
+                .post('/adapayMerchant/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/adapayMerchant/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/AdapayMerchantList.vue

@@ -0,0 +1,298 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button>
+            <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-button class="filter-item" @click="showQueryDialog = true">查询</el-button>
+            <el-button class="filter-item" @click="showRefundDialog = true">退款</el-button>
+            <el-input
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="name"> </el-table-column>
+            <el-table-column prop="appId" label="appId" width="330"> </el-table-column>
+            <el-table-column prop="status" label="status"> </el-table-column>
+            <el-table-column prop="selected" label="selected" align="center">
+                <template v-slot="{ row }">
+                    <el-tag :type="row.selected ? 'success' : 'info'">{{ row.selected ? '是' : '否' }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="right" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="select(row)" type="primary" size="mini" plain v-if="!row.selected"
+                        >切换</el-button
+                    >
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+        <el-dialog title="查询订单" :visible.sync="showQueryDialog" width="650px">
+            <el-form label-position="right" label-width="100px">
+                <el-form-item label="商户">
+                    <el-select v-model="merchantId">
+                        <el-option
+                            v-for="item in tableData"
+                            :label="item.name"
+                            :value="item.id"
+                            :key="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单流水号">
+                    <el-input v-model="orderId"></el-input>
+                </el-form-item>
+                <el-form-item v-if="queryResult" label="结果">
+                    <pre v-html="queryResult" style="line-height: 1.5"></pre>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="query" :loading="querying">查询</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog title="订单退款" :visible.sync="showRefundDialog" width="650px">
+            <el-form label-position="right" label-width="100px">
+                <el-form-item label="商户">
+                    <el-select v-model="merchantId">
+                        <el-option
+                            v-for="item in tableData"
+                            :label="item.name"
+                            :value="item.id"
+                            :key="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单流水号">
+                    <el-input v-model="orderId"></el-input>
+                </el-form-item>
+                <el-form-item v-if="refundResult" label="结果">
+                    <pre v-html="refundResult" style="line-height: 1.5"></pre>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="refund" :loading="querying">退款</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'AdapayMerchantList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/adapayMerchant/all',
+            downloading: false,
+            merchantId: null,
+            orderId: null,
+            showQueryDialog: false,
+            showRefundDialog: false,
+            querying: false,
+            queryResult: null,
+            refundResult: null
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/adapayMerchantEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/adapayMerchantEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/adapayMerchant/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/adapayMerchant/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        select(row) {
+            this.$alert('确认切换？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/adapayMerchant/select`, { id: row.id });
+                })
+                .then(() => {
+                    this.$message.success('切换成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        query() {
+            this.querying = true;
+            this.$http
+                .post('/adapayMerchant/query', {
+                    id: this.merchantId,
+                    orderId: this.orderId
+                })
+                .then(res => {
+                    this.querying = false;
+                    console.log(res);
+                    this.queryResult = JSON.stringify(res, null, 4);
+                })
+                .catch(e => {
+                    this.querying = false;
+                    this.$message.error(e.error || '失败');
+                });
+        },
+        refund() {
+            this.$alert('确认退款？', '警告', { type: 'error' })
+                .then(() => {
+                    this.querying = true;
+                    this.$http
+                        .post('/adapayMerchant/refund', {
+                            id: this.merchantId,
+                            orderId: this.orderId
+                        })
+                        .then(res => {
+                            this.querying = false;
+                            console.log(res);
+                            this.refundResult = JSON.stringify(res, null, 4);
+                        })
+                        .catch(e => {
+                            this.querying = false;
+                            this.$message.error(e.error || '失败');
+                        });
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/CouponEdit.vue

@@ -16,13 +16,6 @@
                     size="small"
                     style="max-width: 500px"
                 >
-                    <!-- <el-form-item label="项目" prop="projectId">
-                        <el-select v-model="formData.projectId">
-                            <el-option :value="0" label="第九空间"></el-option>
-                            <el-option :value="1" label="cosmos art"></el-option>
-                            <el-option :value="2" label="modern point"></el-option>
-                        </el-select>
-                    </el-form-item> -->
                     <el-form-item prop="name" label="名称">
                         <el-input v-model="formData.name"></el-input>
                     </el-form-item>
@@ -91,6 +84,9 @@ export default {
                 .get('coupon/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
+                    if (res.collectionIds) {
+                        this.collections = res.collections;
+                    }
                 })
                 .catch(e => {
                     console.log(e);
@@ -166,6 +162,7 @@ export default {
         },
         submit() {
             let data = { ...this.formData };
+            data.collections = null;
 
             this.saving = true;
             this.$http

src/test/java/com/izouma/nineth/service/OrderServiceTest.java

@@ -51,7 +51,7 @@ public class OrderServiceTest extends ApplicationTests {
 
     @Test
     public void create() throws EncoderException, WxPayException {
-        Order order = orderService.create(1110L, 1777L, 1, null, 1896L, null);
+        Order order = orderService.create(1110L, 1777L, 1, null, 1896L, null, 1L);
         assert order.getStatus() == OrderStatus.FINISH;
     }