Merge remote-tracking branch 'origin/main'

fuintAdmin/src/components/map/mapComponent.vue

@@ -83,6 +83,7 @@ export default {
       })
     },
     initAMap() {
+      console.log("86",this.pform)
       let _this = this;
       AMapLoader.load({
         key: "b5abec514cab7c71cb0572765131e6fc", // 申请好的Web端开发者Key，首次调用 load 时必填
@@ -102,6 +103,8 @@ export default {
         });
         // 搜索提示插件
         this.AutoComplete = new AMap.AutoComplete({ city: "全国" });
+        // 标记点
+        this.setMapMarker();
         //点击获取经纬度;
         this.map.on("click", (e) => {
           // 获取经纬度
@@ -113,6 +116,7 @@ export default {
           this.setMapMarker();
         });
       }).catch(() => {});
+
     },
     // 标记点
     setMapMarker() {

fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue

@@ -51,7 +51,7 @@
             <img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
+          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店管理'">
             <img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/car_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>

fuintAdmin/src/views/EventMarketing/newCertificate/index.vue

@@ -46,13 +46,22 @@
               <span v-if="scope.row.putType==3">积分兑换</span>
             </template>
           </el-table-column>
-          <el-table-column prop="createTime" label="优惠内容"></el-table-column>
+          <el-table-column prop="createTime" label="优惠内容">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark }}</span>
+            </template>
+
+          </el-table-column>
           <el-table-column prop="createTime" label="有效期">
             <template slot-scope="scope">
               <span>{{ scope.row.effectiveDateStart }}~{{ scope.row.effectiveDateEnd }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="createTime" label="已领/投放数量"></el-table-column>
+          <el-table-column prop="tfGetNum" label="已领/投放数量">
+            <template slot-scope="scope">
+              <span>{{ scope.row.tfGetNum || 0 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" label="已核销"></el-table-column>
           <el-table-column prop="status" label="状态">
             <template slot-scope="scope">

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue

@@ -21,7 +21,7 @@
 
         </div>
         <div class="nbox" :class="pointerClass"  @click="updateRedio('积分商城订单')">
-          <div class="fount-box" :style="{ color: radio1 === '积分商城订单' ? '#FF770F' : '#999999' }">积分兑换订单</div>
+          <div class="fount-box" :style="{ color: radio1 === '积分商城订单' ? '#FF770F' : '#999999' }">积分商城订单</div>
           <div class="heng-box" v-if="radio1 == '积分商城订单'"></div>
           <div class="heng-box" style="background-color: #FFFFFF" v-else></div>
         </div>

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/dto/IntegralOrdersDTO.java

@@ -19,4 +19,8 @@ public class IntegralOrdersDTO extends IntegralOrders {
     private String coverImage;
     private Long deptId;
     private List<Long> storeIds;
+    /**
+     * 支付类型
+     */
+    private String paymentType;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java

@@ -181,6 +181,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
             }
 
             List<allorderVOo> fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo);
+            record.setPayMoney(convertPayMoneyToWanYuan(record.getPayMoney()));
+
             record.setFenxiByDaili2(fenxiByDaili2);
         }
         return fenxiByDaili;
@@ -1693,4 +1695,17 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
         sysDept.setDailyAmount(meanAmountStr);
         sysDept.setStrokesPerDay(meanStrokeCountStr);
     }
+
+    /**
+     * 将支付金额转换为万圆
+     * @param payMoney
+     */
+    public Double convertPayMoneyToWanYuan(Double payMoney) {
+        if (payMoney != null) {
+            BigDecimal payMoneyInYuan = BigDecimal.valueOf(payMoney);
+            BigDecimal payMoneyInWanYuan = payMoneyInYuan.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
+            return payMoneyInWanYuan.doubleValue();
+        }
+        return null;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,8 +146,8 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
             leiJiInfo.put("tongjMoney","0");
 
         }
-        dataByZt.put("tongjMoney",ObjectUtil.isNotEmpty(leiJiInfo.get("tongjMoney"))?leiJiInfo.get("tongjMoney"):"0");
+        dataByZt.put("tongjMoney",ObjectUtil.isNotEmpty(leiJiInfo.get("tongjMoney"))?convertYuanToWanYuan((BigDecimal) leiJiInfo.get("tongjMoney")):"0");
-        dataByZt.put("tongjXfMoney",ObjectUtil.isNotEmpty(leiJiInfo.get("tongjXfMoney"))?leiJiInfo.get("tongjXfMoney"):"0");
+        dataByZt.put("tongjXfMoney",ObjectUtil.isNotEmpty(leiJiInfo.get("tongjXfMoney"))?convertYuanToWanYuan((BigDecimal) leiJiInfo.get("tongjXfMoney")):"0");
         return dataByZt;
     }
 
@@ -361,4 +362,16 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
         // 新增会员余额信息
         return insertUserBalance(userBalanceAdd);
     }
+
+    /**
+     * 将金额从元转换为万元
+     *
+     * @param amountInYuan 以元为单位的金额
+     * @return 以万元为单位的金额
+     */
+    public static BigDecimal convertYuanToWanYuan(BigDecimal amountInYuan) {
+        // 将元转换为万元，使用 BigDecimal 进行精确的数学运算
+        BigDecimal divisor = new BigDecimal("10000");
+        return amountInYuan.divide(divisor, 2, RoundingMode.HALF_UP);
+    }
 }