FIX: 分佣

deploy.sh

@@ -61,7 +61,7 @@ deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 #deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 
 # 部署 fs-user-app
-#deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
+deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
 #deploy_jar "$LOCAL_FS_API_APP_JAR" "fs-api"
 
 #deploy_jar "$LOCAL_FS_SYNC_APP_JAR" "fs-sync"

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -315,7 +315,7 @@ public class CompanyServiceImpl implements ICompanyService
                 StoreConfig config= JSONUtil.toBean(json,StoreConfig.class);
                 //支付金额-（订单金额*rate%）
                 Double rate=config.getTuiMoneyRate()/100d;
-                BigDecimal tuiMoney=order.getPayPrice().subtract(order.getTotalPrice().multiply(new BigDecimal(rate)));
+                BigDecimal tuiMoney=order.getPayMoney().subtract(order.getTotalPrice().multiply(new BigDecimal(rate)));
                 company.setMoney(company.getMoney().add(tuiMoney));
                 companyMapper.updateCompany(company);
                 //companyMapper.updateCompanyMoney(company.getCompanyId(),tuiMoney);

fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -6,6 +6,7 @@ import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -80,9 +81,9 @@ public class LiveOrder extends BaseEntity {
     private String cancelReason;
 
     /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date payTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payTime;
 
     /** 支付方式 1微信 */
     @Excel(name = "支付方式 1微信")

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -561,7 +561,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             userService.incPayCount(Long.valueOf(order.getUserId()));
 
             order.setStatus(2);
-            order.setPayTime(new Date());
+            order.setPayTime(LocalDateTime.now());
             baseMapper.updateLiveOrder(order);
             return "SUCCESS";
         }catch (Exception e){