订单

yujian

2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.PayInfo;

import com.yeshi.fanli.entity.bus.user.PreviewInfo;

import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum;

import com.yeshi.fanli.entity.bus.user.UserInfo;

@@ -35,6 +36,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.service.inter.user.PayInfoService;

import com.yeshi.fanli.service.inter.user.PreviewInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

@@ -76,6 +78,9 @@


   @Resource

   private PushService pushService;

	
   @Resource

   private PayInfoService payInfoService;



   /**

    * 保存资金信息

@@ -403,8 +408,12 @@
    */

   @RequestMapping(value = "saveMoneyArrival")

   public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String dayTime,

         String orderNo, PrintWriter out) {

         PrintWriter out) {

      try {

         // 查询最新一条支付宝订单号

         PayInfo payInfo = payInfoService.getNearInfo();

         String orderNo = getAlipayNo(payInfo.getOrderId());

			
         String link = previewInfoService.saveMoneyArrival(uid, money, dayTime, orderNo, acceptData.getPlatform());

         JSONObject object = new JSONObject();

         object.put("link", link);

@@ -417,6 +426,16 @@
      }

   }



   private String getAlipayNo(String payNo) {

      // 替换前8位

      String newNo = payNo.substring(9, payNo.length());

      newNo = TimeUtil.getyyyyMMdd(java.lang.System.currentTimeMillis()) + newNo;

      // 随机生成替换后6位

      newNo = newNo.substring(0, payNo.length() - 6);

      newNo += (long) ((Math.random() * 9 + 1) * 100000);

      return newNo;

   }

	
   @RequestMapping(value = "getMoneyArrivalImg")

   public void getMoneyArrivalImg(String callback, AcceptData acceptData, Long uid, PrintWriter out) {

      PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo);