minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复零售订单编辑添加新增商品时没有订单id的缺陷；

Browse Source 
2.添加迪为的商户信息文件；
This commit is contained in:
chenlin 2024-07-15 10:34:13 +08:00
parent 6b747385a5
commit 87c55b0cda
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/admin/models/erp_order.go
View File

@ -5162,6 +5162,9 @@ func updateCommodityData(gdb *gorm.DB, orderId uint32, req *ErpOrderCreateReq) e
for i, _ := range req.ErpOrderCommodities { for i, _ := range req.ErpOrderCommodities {
req.ErpOrderCommodities[i].ID = 0 req.ErpOrderCommodities[i].ID = 0
if req.ErpOrderCommodities[i].ErpOrderId == 0 { //发现前端有时会没传，后端打补丁
req.ErpOrderCommodities[i].ErpOrderId = orderId
}
} }
// 2-更新商品订单信息-新增 // 2-更新商品订单信息-新增
@ -5196,6 +5199,9 @@ func updateSalesData(gdb *gorm.DB, orderId uint32, req *ErpOrderCreateReq) error
var newOrderSales []ErpOrderSales var newOrderSales []ErpOrderSales
for _, reqSales := range req.Salesman { for _, reqSales := range req.Salesman {
reqSales.ID = 0 reqSales.ID = 0
if reqSales.ErpOrderId == 0 {
reqSales.ErpOrderId = orderId
}
newOrderSales = append(newOrderSales, reqSales) newOrderSales = append(newOrderSales, reqSales)
} }
@ -5238,6 +5244,9 @@ func updatePayWayData(gdb *gorm.DB, orderId uint32, req *ErpOrderCreateReq) erro
Name: reqPayWay.Name, Name: reqPayWay.Name,
Amount: reqPayWay.Amount, Amount: reqPayWay.Amount,
} }
if payWay.ErpOrderId == 0 {
payWay.ErpOrderId = orderId
}
newOrderPayWay = append(newOrderPayWay, payWay) newOrderPayWay = append(newOrderPayWay, payWay)
} }

3
config/hm_pay/deovo_private_key.pem Normal file
View File

@ -0,0 +1,3 @@
-----BEGIN RSA PUBLIC KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDR19P9/7pIrtzsctlnFo9J5Yn1uucbMi+xRvaoM0tx2dwKBYS7AqdcibCHHlioqOV+xl6bU2T2LfyRcXr+cZJIl4U6UpCUfyPbBdaizlimPZwnWNEZVWQVszy2MPmGsV4f6anDakKHz80f6RZNGY1a9YEpeMea/XFQ/colQeb9mIfsfGx/sz14mL8zBwJSapngvCe0qsJf+xxtpftFUnMOKtMTF66fs8DuWQUeL3zZ0SRkNw3G/Sw1J8JUQm4Y92vMHWqDYSZnM1ExlQsf66vlRSh/BAoKZ3ezXAEppWI61Gerx6NxrONpzRyRUbtTUJIHdWbk6py9Soa8iETn6e5zAgMBAAECggEAEzvcI4DoGzdj6oxQXwGTWquebJaYDkcYVgByJVKmTKYyY/zDgLyqiHHaa1gduj/Y4TjffQ80xtfKOa6UHnRceyjgPktJE0NgDvhHBx8wwvQMtxKN/+tyxAZsvypYBL+HKBerxsybkoU6gP1FXQXFjhvInfuDGDK4yzqn56hVutKwxwbOtHzCCJQnfbV+NXKFHYA6OBIZ5LvplgeUlN0luN/b9wARSpdJSiNG9+GP8L2n7QIgFcPtLrQlhZYEnN1+USjqG4km1jdYIzSMYXuym3LCDlD4CFZgRxP8/2U2rq2kXiJRlH2l+ydNAL8dysvtgvQBLpFJJ1O+oOKWe3MyYQKBgQDv+GPvpDXwpk6alHbYRqOZVCH+XB1CBWWOsV5r84OaSRBWbgr2QE2I3V11dg8dOzd7izHpFjzItzXqjT0nTceOVDevvCco2LnDWtkC6M6o0j8NNpI4WukbzLWzOOLssAxNMVBFTqKYOJJnN6wx/s6x0RTlglCMW+d2FSOcErU1gwKBgQDf3D9zeBZF0WL8WinjF2F28C7y/yD1IZ0VTWz+fP2SlDJxyIxYdNqGl19Sqkb9+J/abPD7RXvys19Q8uSfnMXIpLh1gaokczwgwjTeaB6VwXB/5f+XPqBiO0aKe5i73VwGX2r6dsXUrtohuRp/O80qtj+ZcHmaDLYgm7/jANwAUQKBgE1jTl9HFrof9/Nz84u15CabckcET88tzF2jJ68qngNQkrs8y740aIy9ztkFlMQ5h6AI+LSRnlKgevvERrd5JuTolfjPddV/ZxDwKFH+4D6jZwAM3ETeVJTJhMNikhQAhkcSoy9mt5rdi6FL2/VXljLUGagWSYGqVc/H6272vYefAoGBAIFIuNhd/Tb7M1icVd6SDTbchbDOyWDotcisu4rJ8sQplGyELxGTAvWCDIo4TuG0KdXC3vWu7mN/VkfwzzqjFtLG1sT+Sp3cc1hT8KaVqTxByFAFK7RUddnlc9rcgJvWvqPrjWPzHlOzW8ToGzZp+hZ1xItAGupt9u0kJhDa2TPRAoGBAM2e+cEMYJc0KCHOJ/vptt7Dum/duAXrsnucREehNyZ5z3U0xaU7vFEMz5H9SI8e18kM4bgBDFkxB+enEZ6r0q9paSeZgz3hT5EtggSRa8u4MgpbVGcIQk9dbg1sT6SVUPROoL9giGL9WoRY1gDU6brHbs+EClDJUN56j28QT5xO
-----END RSA PUBLIC KEY-----

3
config/hm_pay/deovo_public_key.pem Normal file
View File

@ -0,0 +1,3 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfT/f+6SK7c7HLZZxaPSeWJ9brnGzIvsUb2qDNLcdncCgWEuwKnXImwhx5YqKjlfsZem1Nk9i38kXF6/nGSSJeFOlKQlH8j2wXWos5Ypj2cJ1jRGVVkFbM8tjD5hrFeH+mpw2pCh8/NH+kWTRmNWvWBKXjHmv1xUP3KJUHm/ZiH7Hxsf7M9eJi/MwcCUmqZ4LwntKrCX/scbaX7RVJzDirTExeun7PA7lkFHi982dEkZDcNxv0sNSfCVEJuGPdrzB1qg2EmZzNRMZULH+ur5UUofwQKCmd3s1wBKaViOtRnq8ejcazjac0ckVG7U1CSB3Vm5OqcvUqGvIhE5+nucwIDAQAB
-----END RSA PUBLIC KEY-----