Merge branch 'milestone-20251104-现金二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251104-现金二期

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -1116,7 +1116,7 @@ const submitEditForm = async () => {
             url: '/cashCollection/complete',
             data: {
                 orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge * 100 || null, // 转为分单位
+                handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
                 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -1116,7 +1116,7 @@ const submitEditForm = async () => {
             url: '/cashCollection/complete',
             data: {
                 orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge * 100 || null, // 转为分单位
+                handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
                 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -542,7 +542,7 @@ const handlePagination = (type, val) => {
 
 // ===================== 客服新增/编辑收款弹窗 =====================
 const addFormisible = ref(false) // 弹窗显隐
-const addFormData = ref({ name: '', market: '', permanentGold: 0, freeGold: 0, goodsName: '' }) // 表单数据
+const addFormData = ref({ name: '', market: '', goodsName: '' }) // 表单数据
 const addFormRef = ref(null) // 表单引用
 const addOrEdit = ref(0) // 1=新增，2=编辑
 const isGold = ref(false) // 是否为金币充值产品
@@ -559,7 +559,9 @@ const ifGold = () => {
         numUnitList.value = ['个', '年', '月']
         const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机构活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", 'HC信息费', 'HC信息费', 'AI机构探测神器', '超级机构探测神器']
         if (selectItems.includes(addFormData.value.goodsName)) {
+            if (addOrEdit.value == 1) {
                 addFormData.value.numUnit = ''
+            }
             numUnitList.value = ['年', '月']
         } else if (addFormData.value.goodsName == '静态信息费') {
             addFormData.value.numUnit = '年'
@@ -693,8 +695,8 @@ const handleAddForm = async () => {
             data: {
                 ...addFormData.value,
                 submitterId: adminData.value.id,
-                permanentGold: (addFormData.value.permanentGold || 0) * 100,
-                freeGold: (addFormData.value.freeGold || 0) * 100,
+                permanentGold: (addFormData.value.permanentGold) * 100,
+                freeGold: (addFormData.value.freeGold) * 100,
                 goodNum: addFormData.value.goodNum || 0,
                 paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
                 receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
@@ -723,6 +725,11 @@ const handleEditForm = async () => {
             ElMessage.error(testGold().message);
             return;
         }
+        if(typeof addFormData.value.activity == 'string'){
+            console.log('转换前：', addFormData.value.activity);
+            
+            addFormData.value.activity = activityList.value.find(item => item.activityName === addFormData.value.activity).id
+        }
         //单独校验产品数量
         if (!isGold.value) {
             if (!addFormData.value.goodNum) {

src/views/moneyManage/receiveDetail/utils/staticData.js

@@ -229,7 +229,7 @@ export const CurrencyForId = (name) => {
     return 6
   } else if (name == '越南盾(VDN)') {
     return 7
-  } else if (name == '越南盾(VDN)') {
+  } else if (name == '韩元(KRW)') {
     return 8
   } else {
     return name