金额单位修改

alien-entity/src/main/java/shop/alien/entity/store/StoreCashOutRecord.java

@@ -62,7 +62,7 @@ public class StoreCashOutRecord extends Model<StoreCashOutRecord> {
     @TableField("payment_date")
     private Date paymentDate;
 
-    @ApiModelProperty(value = "提现状态, 0:进行中, 1:成功, 2:失败")
+    @ApiModelProperty(value = "提现状态, 0:进行中, 1:成功, 2:失败，3待审核，4已拒绝，5审核通过")
     @TableField("payment_status")
     private Integer paymentStatus;
 

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -10,16 +10,16 @@
             store.store_name,
             IFNULL(meal.coupon_count, 0)  AS meal_coupon_count,
             IFNULL(meal.order_count, 0) AS meal_order_count,
-            ROUND(IFNULL(meal.order_amount, 0) / 1000000,2) AS meal_order_amount,
+            ROUND(IFNULL(meal.order_amount, 0) / 100,2) AS meal_order_amount,
             IFNULL(meal.income_count, 0) AS meal_income_count,
-            ROUND(IFNULL(meal.income_money, 0) / 1000000,2) AS meal_income_money,
+            ROUND(IFNULL(meal.income_money, 0) / 100,2) AS meal_income_money,
             IFNULL(coupon.coupon_count, 0) AS coupon_coupon_count,
             IFNULL(coupon.order_count, 0) AS coupon_order_count,
-            ROUND(IFNULL(coupon.order_amount, 0) / 1000000,2) AS coupon_order_amount,
+            ROUND(IFNULL(coupon.order_amount, 0) / 100,2) AS coupon_order_amount,
             IFNULL(coupon.income_count, 0) AS coupon_income_count,
-            ROUND(IFNULL(coupon.income_money, 0) / 1000000,2) AS coupon_income_money,
-            ROUND(IFNULL(allInfo.cash_out_money, 0) / 1000000,2) AS cashout_money,
-            ROUND(IFNULL(allInfo.account_frozen, 0) / 1000000,2) AS account_frozen
+            ROUND(IFNULL(coupon.income_money, 0) / 100,2) AS coupon_income_money,
+            ROUND(IFNULL(allInfo.cash_out_money, 0) / 100,2) AS cashout_money,
+            ROUND(IFNULL(allInfo.account_frozen, 0) / 100,2) AS account_frozen
         FROM
             store_info store
                 LEFT JOIN merchant_reconciliation_coupon coupon ON store.id = coupon.store_id
@@ -34,7 +34,7 @@
         SELECT
             store.id,
             store.store_name,
-            ROUND(IFNULL( sum( money ), 0 ) / 1000000,2) AS income_money
+            ROUND(IFNULL( sum( money ), 0 ) / 100,2) AS income_money
         FROM
             store_info store
                 LEFT JOIN ( SELECT * FROM store_income_details_record WHERE created_time > #{startDate} AND created_time < #{endDate} ) income ON store.id = income.store_id

alien-store/src/main/java/shop/alien/store/service/impl/ManagementInfoServiceImpl.java

@@ -81,7 +81,7 @@ public class ManagementInfoServiceImpl implements ManagementInfoService {
             for (StoreIncomeDetailsRecord storeIncomeDetailsRecord : storeIncomeDetailsRecords) {
                 storeIncomeDetailsCount += storeIncomeDetailsRecord.getMoney();
             }
-            storeIncomeDetailsCount = Math.floor(storeIncomeDetailsCount/1000000*100)/100;
+            storeIncomeDetailsCount = Math.floor(storeIncomeDetailsCount/100*100)/100;
             managementInfo.setAccountFrozen(storeIncomeDetailsCount);
         }
         return allManagementInfo;

alien-store/src/main/java/shop/alien/store/service/impl/StoreIncomeDetailsRecordServiceImpl.java

@@ -141,7 +141,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
                 storeCashOutRecord.setCashOutType(0);
 //                storeCashOutRecord.setAliOrderNo(pay.getOrderId());
                 storeCashOutRecord.setPaymentDate(new Date());
-                storeCashOutRecord.setPaymentStatus(0);
+                storeCashOutRecord.setPaymentStatus(3);
                 storeCashOutRecord.setDeleteFlag(0);
 //                storeCashOutRecord.setIncomeStartTime(startDate);
 //                storeCashOutRecord.setIncomeEndTime(endDate);