Merge branch 'fund_list_new' into 'master'

fund_list

See merge request !6

src/main/java/com/quantgroup/asset/distribution/constant/BizAssetOrderStatus.java

+package com.quantgroup.asset.distribution.constant;
+
+/**
+ * @author : Hyuk
+ * @description : BizAssetOrderStatus
+ * @date : 2020/6/9 3:03 下午
+ */
+public class BizAssetOrderStatus {
+
+    /**
+     * 分配中
+     */
+    public static final int DISTRIBUTING = 1;
+
+    /**
+     * 分配完成
+     */
+    public static final int DISTRIBUTE_FINISH = 2;
+}

src/main/java/com/quantgroup/asset/distribution/controller/AssetController.java

@@ -4,6 +4,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.quantgroup.asset.distribution.service.asset.IBizAssetOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,6 +34,8 @@ public class AssetController {
 	private IAssetService assetService;
 	@Autowired
 	private IAlarmService alarmService;
+	@Autowired
+	private IBizAssetOrderService bizAssetOrderService;
 	
 	@RequestMapping("/asset_in")
 	public GlobalResponse assetsIn(AssetForm assetForm, HttpServletRequest request) {
@@ -49,6 +52,9 @@ public class AssetController {
 				+ " , code : " + response.getCode() + " , errorMsg : " + response.getMsg());
 			return response; 
 		}
+		// 保存资产分发订单
+		bizAssetOrderService.saveAssetOrder(assetForm);
+
 		assetService.assetsIn(assetForm);
 		log.info("资产入库分发结束, assetForm : {}, authKey : {}, response : {}, 耗时 : {}", JSON.toJSONString(assetForm), authKey, JSON.toJSONString(response), stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
 		return GlobalResponse.create(AssetResponse.SUCCESS);

src/main/java/com/quantgroup/asset/distribution/controller/FundModuleController.java

@@ -37,7 +37,7 @@ public class FundModuleController {
 	@RequestMapping("/get_all_funds")
 	public GlobalResponse getAllFunds() {
 		Stopwatch stopwatch = Stopwatch.createStarted();
-		GlobalResponse response = fundModuleService.getAllFundsInfo();
+		GlobalResponse response = fundModuleService.getMiddleOfficeAllFundsInfo();
 		log.info("资方模块接口, 获取所有资方信息完成, 耗时 : {}, response : {}", stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
 		return response;
 	}

src/main/java/com/quantgroup/asset/distribution/model/entity/fund/FundInfo.java

 package com.quantgroup.asset.distribution.model.entity.fund;
 
 import java.io.Serializable;
+import java.util.List;
 
 import lombok.Data;
 
@@ -19,6 +20,8 @@ public class FundInfo implements Serializable{
 	
 	// 资方Id
 	private Long fundId;
+
+	private List<FundProductInfo> fundProductList;
 	
 	// 资方名称
 	private String fundName;
@@ -28,4 +31,12 @@ public class FundInfo implements Serializable{
 	
 	// 注意事项
 	private String remarks;
+
+	@Data
+	public static class FundProductInfo {
+
+		private Long fundProductId;
+
+		private String fundProductRemark;
+	}
 }

src/main/java/com/quantgroup/asset/distribution/service/asset/IBizAssetOrderService.java

+package com.quantgroup.asset.distribution.service.asset;
+
+import com.quantgroup.asset.distribution.model.form.AssetForm;
+
+/**
+ * @author : Hyuk
+ * @description : IAssetOrderService
+ * @date : 2020/6/9 2:51 下午
+ */
+public interface IBizAssetOrderService {
+
+    /**
+     * 保存资产分发订单
+     * @param assetForm
+     */
+    public void saveAssetOrder(AssetForm assetForm);
+
+    /**
+     * 资产订单分发完成
+     * @param assetForm
+     */
+    public void finishAssetOrder(AssetForm assetForm);
+}

src/main/java/com/quantgroup/asset/distribution/service/asset/impl/BizAssetOrderServiceImpl.java

+package com.quantgroup.asset.distribution.service.asset.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.quantgroup.asset.distribution.constant.BizAssetOrderStatus;
+import com.quantgroup.asset.distribution.model.form.AssetForm;
+import com.quantgroup.asset.distribution.service.alarm.IAlarmService;
+import com.quantgroup.asset.distribution.service.asset.IBizAssetOrderService;
+import com.quantgroup.asset.distribution.service.jpa.entity.BizAssetOrder;
+import com.quantgroup.asset.distribution.service.jpa.repository.IBizAssetOrderRepository;
+import com.quantgroup.asset.distribution.service.redis.IRedisService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author : Hyuk
+ * @description : BizAssetOrderServiceImpl
+ * @date : 2020/6/9 2:55 下午
+ */
+@Slf4j
+@Service
+public class BizAssetOrderServiceImpl implements IBizAssetOrderService {
+
+    @Autowired
+    private IBizAssetOrderRepository bizAssetOrderRepository;
+    @Autowired
+    private IRedisService<BizAssetOrder> redisService;
+    @Autowired
+    private IAlarmService alarmService;
+
+    private static final String BIZ_ASSET_ORDER_KEY_PREFIX = "ASSET_DISTRIBUTION:BIZ_ASSET_ORDER:KASMN9:";
+
+    @Override
+    public void saveAssetOrder(AssetForm assetForm) {
+        BizAssetOrder bizAssetOrder = new BizAssetOrder();
+        bizAssetOrder.setBizChannel(assetForm.getBizChannel());
+        bizAssetOrder.setBizNo(assetForm.getBizNo());
+        bizAssetOrder.setBizType(Integer.parseInt(assetForm.getBizType()));
+        bizAssetOrder.setUuid(assetForm.getUuid());
+        bizAssetOrder.setContext(JSON.toJSONString(assetForm));
+        bizAssetOrder.setStatus(BizAssetOrderStatus.DISTRIBUTING);
+        bizAssetOrder.setEnable(true);
+
+        BizAssetOrder dbBizAssetOrder = bizAssetOrderRepository.save(bizAssetOrder);
+        String redisKey = getBizAssetOrderKey(assetForm.getUuid(), assetForm.getBizNo(), assetForm.getBizType());
+        redisService.setEntityEx(redisKey, dbBizAssetOrder, 30, TimeUnit.MINUTES);
+    }
+
+    @Override
+    public void finishAssetOrder(AssetForm assetForm) {
+        BizAssetOrder bizAssetOrder = redisService.getEntity(getBizAssetOrderKey(assetForm.getUuid(),
+                assetForm.getBizNo(), assetForm.getBizType()));
+
+        if (bizAssetOrder == null) {
+            List<BizAssetOrder> bizAssetOrders = bizAssetOrderRepository
+                    .findByUuidAndBizNoAndBizTypeAndStatusAndEnableIsTrue(assetForm.getUuid(), assetForm.getBizNo(),
+                            Integer.parseInt(assetForm.getBizType()), BizAssetOrderStatus.DISTRIBUTING);
+            if (CollectionUtils.isEmpty(bizAssetOrders)) {
+                log.info("资产分发订单缺失, uuid : {}, bizNo : {}, bizType : {}", assetForm.getUuid(), assetForm.getBizNo(), assetForm.getBizType());
+                alarmService.dingtalkAlarm("Warn", "未找到资产分发中的订单", "uuid : " + assetForm.getUuid() +
+                        " , bizNo : " + assetForm.getBizNo() + " , bizType : " + assetForm.getBizType());
+                return;
+            }
+
+            bizAssetOrder = bizAssetOrders.get(0);
+        }
+
+        bizAssetOrder.setStatus(BizAssetOrderStatus.DISTRIBUTE_FINISH);
+        bizAssetOrderRepository.save(bizAssetOrder);
+    }
+
+    /**
+     * 获取资产订单缓存redisKey
+     * @param uuid
+     * @param bizNo
+     * @param bizType
+     * @return
+     */
+    private String getBizAssetOrderKey(String uuid, String bizNo, String bizType) {
+        StringBuilder sb = new StringBuilder(BIZ_ASSET_ORDER_KEY_PREFIX);
+        sb.append(uuid).append(":").append(bizNo).append(":").append(bizType);
+        return sb.toString();
+    }
+}

src/main/java/com/quantgroup/asset/distribution/service/funding/IFundModuleService.java

@@ -14,10 +14,18 @@ import java.util.List;
 public interface IFundModuleService {
 	
 	/**
+	 * 2020-6-8切换到中台新接口，C库，包含所有的资方列表
 	 * 获取所有资方信息
 	 * @return
 	 */
+	@Deprecated
 	public GlobalResponse getAllFundsInfo();
+
+	/**
+	 * 中台新接口，获取资方列表相关信息
+	 * @return
+	 */
+	public GlobalResponse getMiddleOfficeAllFundsInfo();
 	
 	/**
 	 * 获取资方配置所有条件类型， 以及对应的code

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/FundModuleServiceImpl.java

@@ -75,6 +75,8 @@ public class FundModuleServiceImpl implements IFundModuleService{
 	private IRuleService ruleService;
 	@Value("${clotho.url}")  
 	private String clothoURL;
+	@Value("${mo-config.url}")
+	private String moConfigURL;
 
 	@HandleException
 	@Override
@@ -99,6 +101,44 @@ public class FundModuleServiceImpl implements IFundModuleService{
 		return GlobalResponse.create(FundModuleResponse.SUCCESS, fundInfoList);
 	}
 
+	@HandleException
+	@Override
+	public GlobalResponse getMiddleOfficeAllFundsInfo() {
+		Stopwatch stopwatch = Stopwatch.createStarted();
+		String text = httpService.get(moConfigURL + "/finance/fund_product");
+		log.info("拉取xyqb所有资方信息完成, 耗时 : {}, 结果 : {}", stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), text);
+
+		QGPreconditions.checkArgument(StringUtils.isNotEmpty(text), QGExceptionType.GET_ALL_FUNDS_INFO_ERROR, text);
+		JSONObject data = JSONObject.parseObject(text);
+		QGPreconditions.checkArgument(data != null && "0".equals(data.getString("code")), QGExceptionType.GET_ALL_FUNDS_INFO_ERROR, text);
+
+		List<FundInfo> fundInfoList = new ArrayList<>();
+		JSONArray fundsArray = data.getJSONArray("data");
+		for (int i = 0, len = fundsArray.size(); i < len; ++i) {
+			JSONObject fundInfoJSON = fundsArray.getJSONObject(i);
+			FundInfo fundInfo = new FundInfo();
+			fundInfo.setFundId(fundInfoJSON.getLong("fundCorpId"));
+			fundInfo.setFundName(fundInfoJSON.getString("fundCorpName"));
+			fundInfo.setStrategyName(fundInfoJSON.getString("fundCorpStrategyName"));
+
+			// 该资方产品id
+			List<FundInfo.FundProductInfo> fundProductInfoList = new ArrayList<>();
+			JSONArray fundProductArray = fundInfoJSON.getJSONArray("fundProductList");
+			if (fundProductArray != null && fundProductArray.size() != 0) {
+				for (int j = 0, lenP = fundProductArray.size(); j < lenP; ++j) {
+					JSONObject fundProductJSON = fundProductArray.getJSONObject(j);
+					FundInfo.FundProductInfo fundProductInfo = new FundInfo.FundProductInfo();
+					fundProductInfo.setFundProductId(fundProductJSON.getLong("fundProductId"));
+					fundProductInfo.setFundProductRemark(fundProductJSON.getString("fundProductRemark"));
+					fundProductInfoList.add(fundProductInfo);
+				}
+			}
+			fundInfo.setFundProductList(fundProductInfoList);
+			fundInfoList.add(fundInfo);
+		}
+		return GlobalResponse.create(FundModuleResponse.SUCCESS, fundInfoList);
+	}
+
 	@HandleException
 	@Override
 	public GlobalResponse getAllLimitType() {

src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/BizAssetOrder.java

+package com.quantgroup.asset.distribution.service.jpa.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * @author : Hyuk
+ * @description : BizAssetOrder
+ * @date : 2020/6/9 11:32 上午
+ */
+@Data
+@Entity
+@Table(name = "biz_asset_order")
+public class BizAssetOrder implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "biz_channel")
+    private String bizChannel;
+
+    @Column(name = "biz_no")
+    private String bizNo;
+
+    @Column(name = "biz_type")
+    private Integer bizType;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "context")
+    private String context;
+
+    @Column(name = "status")
+    private Integer status;
+
+    @Column(name = "enable")
+    private Boolean enable;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
+
+    @PrePersist
+    public void prePersist() {
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        createdAt = timestamp;
+        updatedAt = timestamp;
+    }
+
+    @PreUpdate
+    public void preUpdate() {
+        updatedAt = new Timestamp(System.currentTimeMillis());
+    }
+}

src/main/java/com/quantgroup/asset/distribution/service/jpa/repository/IBizAssetOrderRepository.java

+package com.quantgroup.asset.distribution.service.jpa.repository;
+
+import com.quantgroup.asset.distribution.service.jpa.entity.BizAssetOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/**
+ * @author : Hyuk
+ * @description : IBizAssetOrderRepository
+ * @date : 2020/6/9 2:49 下午
+ */
+public interface IBizAssetOrderRepository extends JpaRepository<BizAssetOrder, Long> {
+
+    List<BizAssetOrder> findByUuidAndBizNoAndBizTypeAndStatusAndEnableIsTrue(String uuid, String bizNo, Integer bizType,
+                                                                             Integer status);
+}

src/main/java/com/quantgroup/asset/distribution/service/notify/impl/NotifyServiceImpl.java

@@ -3,6 +3,7 @@ package com.quantgroup.asset.distribution.service.notify.impl;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.quantgroup.asset.distribution.service.asset.IBizAssetOrderService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -33,6 +34,8 @@ public class NotifyServiceImpl implements INotifyService{
 	private IHttpService httpService;
 	@Autowired
 	private IAlarmService alarmService;
+	@Autowired
+	private IBizAssetOrderService bizAssetOrderService;
 	
 	@Override
 	public void notifyFundServer(AssetForm assetForm, Map<String, Object> data) {
@@ -48,6 +51,8 @@ public class NotifyServiceImpl implements INotifyService{
 		log.info("通知资金系统结果结束, uuid : {}, bizNo : {}, assetNo : {}, callbackUrl : {}, notifyForm : {}, response : {}", assetForm.getUuid(), assetForm.getBizNo(), assetForm.getAssetNo(), assetForm.getCallbackUrl(), JSON.toJSONString(notifyMap), JSON.toJSONString(response));
 		if(response==null || response.size()==0 || !"200".equals(response.get("statusCode")) || (!"success".equals(response.get("response")) && (!JSONObject.isValidObject(response.get("response")) || 0 != JSONObject.parseObject(response.get("response")).getInteger("code").intValue()))) {
 			throw new QGException(QGExceptionType.NOTIFY_FUND_SERVER_ERROR, assetForm.getUuid(), assetForm.getBizNo(), assetForm.getAssetNo());
+		} else {
+			bizAssetOrderService.finishAssetOrder(assetForm);
 		}
 	}