imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -143,7 +143,7 @@ public class AndroidApi {
         preOrder.setOrderSpecs(speId);
         preOrder.setOrderStatus("0");
         preOrder.setOrderGoodsAmount(1);
-        preOrder.setOrderSum(spe.getSpecSPrice());
+        preOrder.setOrderAmount(spe.getSpecSPrice());
         preOrder.setOrderUnitPrice(spe.getSpecSPrice());
         preOrder.setOrderGoodsId(spe.getGoodsId());
         preOrder.setOrderEquId(equId);
@@ -372,7 +372,7 @@ public class AndroidApi {
 //                DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 String success_time = cipherDto.getSuccess_time();
                 int payerTotal = cipherDto.getAmount().getPayer_total();
-                BigDecimal payDecimal = BigDecimal.valueOf((long) payerTotal);
+                BigDecimal payDecimal = BigDecimal.valueOf((long) payerTotal).movePointLeft(2);
 
 
                 String trade_state = cipherDto.getTrade_state();
@@ -390,7 +390,7 @@ public class AndroidApi {
                 localOrder.setOrderPayTime(localDateTime);
                 localOrder.setOrderWxorderId(cipherDto.getTransaction_id());
 //                实付金额
-                localOrder.setOrderAmount(payDecimal);
+                localOrder.setPayerTotal(payDecimal);
                 orderService.updateById(localOrder);
                 returnMap.put("code", "SUCCESS");
                 returnMap.put("message", "成功");
@@ -441,6 +441,7 @@ public class AndroidApi {
 
         if (orderStatus.equals("4")) {
             //调用微信支付api,发起退款
+            System.out.println("进入申请退款流程");
             RefundsDto refundsDto = new RefundsDto();
             refundsDto.setOut_trade_no(orderId);
             refundsDto.setReason("生产异常");

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/MiniApp.java

@@ -181,7 +181,7 @@ public class MiniApp {
         Order localOrder = orderService.getById(orderId);
         localOrder.setOrderMemberId(member.getId());
 
-        BigDecimal orderAmount = localOrder.getOrderSum();
+        BigDecimal orderAmount = localOrder.getOrderAmount();
 
         int fenAmount = orderAmount.movePointRight(2).intValue();
 

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/order/entity/Order.java

@@ -120,13 +120,24 @@ public class Order extends Entity<Long> {
     private Long orderEquId;
 
     /**
-     * 实付金额。精确到2位小数;单位:元。如:200.07，表示:200元7分
+     * 订单总额。精确到2位小数;单位:元。如:200.07，表示:200元7分
      */
     @ApiModelProperty(value = "实付金额。精确到2位小数;单位:元。如:200.07，表示:200元7分")
     @TableField("order_amount")
     @Excel(name = "实付金额。精确到2位小数;单位:元。如:200.07，表示:200元7分")
     private BigDecimal orderAmount;
 
+
+    /**
+     * 用户实付金额。精确到2位小数;单位:元。如:200.07，表示:200元7分
+     */
+    @ApiModelProperty(value = "实付金额。精确到2位小数;单位:元。如:200.07，表示:200元7分")
+    @TableField("order_payer_total")
+    @Excel(name = "实付金额。精确到2位小数;单位:元。如:200.07，表示:200元7分")
+    private BigDecimal payerTotal;
+
+
+
     /**
      * 单价
      */

imcs-bt-fe/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebPackConfiguration">
+    <option name="mode" value="DISABLED" />
+  </component>
+</project>

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/lang/zh/btOrder.js

@@ -34,6 +34,7 @@ export default {
       scwc: '生产完成',
       yc: '异常',
       zrtk: '转入退款',
+      qbwc: '取杯完成',
     }
   }
 }

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/order/allOrders.vue

@@ -132,6 +132,7 @@
           {{ scope.row.orderStatus === '3' ? $t("btOrder.status.scwc") : '' }}
           {{ scope.row.orderStatus === '4' ? $t("btOrder.status.yc") : '' }}
           {{ scope.row.orderStatus === '5' ? $t("btOrder.status.zrtk") : '' }}
+          {{ scope.row.orderStatus === '6' ? $t("btOrder.status.qbwc") : '' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -175,8 +176,12 @@ export default {
   filters: {},
   data() {
     return {
-      statusFilter: [{text: '未支付', value: '0'}, {text: '已支付', value: '1'},{text: '已取消', value: '2'}, {text: '生产完成', value: '3'}, {
-        text: '异常', value: '4'}, {text: '转入退款', value: '5'}],
+      statusFilter: [{text: '未支付', value: '0'}, {text: '已支付', value: '1'}, {text: '已取消', value: '2'}, {
+        text: '生产完成',
+        value: '3'
+      }, {
+        text: '异常', value: '4'
+      }, {text: '转入退款', value: '5'}],
       // :filters="[{ text: $t('common.status.valid'), value: '1' },{ text: $t('common.status.invalid'), value: '0' }]"
 
 
@@ -192,7 +197,7 @@ export default {
       statusOptions: [{
         value: '0',
         label: '未支付'
-      },{
+      }, {
         value: '1',
         label: '已支付'
       }, {

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/order/orderDetail.vue

@@ -68,7 +68,6 @@
     <el-descriptions title="付款信息" border>
       <el-descriptions-item label="交易单号">{{ detail.orderId }}</el-descriptions-item>
       <el-descriptions-item label="付款状态">
-        <!--        {{ detail.orderStatus }}-->
 
         {{ detail.orderStatus == '0' ? $t("btOrder.status.wzf") : '' }}
         {{ detail.orderStatus == '1' ? $t("btOrder.status.yzf") : '' }}
@@ -76,6 +75,7 @@
         {{ detail.orderStatus == '3' ? $t("btOrder.status.ywc") : '' }}
         {{ detail.orderStatus == '4' ? $t("btOrder.status.yc") : '' }}
         {{ detail.orderStatus == '5' ? $t("btOrder.status.zrtk") : '' }}
+        {{ detail.orderStatus == '6' ? $t("btOrder.status.qbwc") : '' }}
 
 
       </el-descriptions-item>