1.库存详情表增加"会员优惠"字段；
2.零售订单商品表增加"商品实收金额"字段； 3.河马付请求ip改动移动云服务器的ip； 4.配置文件数据库改成移动云数据库地址；
This commit is contained in:
parent
c160f02a41
commit
c0156ed2bc
|
|
@ -84,7 +84,7 @@ const (
|
|||
HmPubKey = `MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDzGVH0Fxpb2M48U1BWr6lpNs2W3VHqtjO8X5RqWjtTwpQVKo8dqaiAGxVbsdnefPpsbI5l9rKquRAOJhWFU07hxSUgXZOk55QQmll03MBgRDXLgxyKfycLLQwhsCJAzDIWC7IWgok/RHV9m9AV2GbQxWBl+7iDE4prcbpgG8Z0HwIDAQAB`
|
||||
HmPayMerchantId = "664403000030115"
|
||||
TimeFormat = "2006-01-02 15:04:05"
|
||||
clientIp = "39.108.188.218"
|
||||
clientIp = "112.33.14.191"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func TestHmJsPayBToCOrder(t *testing.T) {
|
|||
|
||||
fmt.Println("orderId:", orderId)
|
||||
totalFee := 0.01
|
||||
authCode := "281830160266615739"
|
||||
authCode := "6264900646139788518"
|
||||
notifyUrl := "https://dev.switch.deovo.com:8004/api/v1/wxpay/notice"
|
||||
|
||||
order, err := HmJsPayBToCOrder(orderId, totalFee, authCode, notifyUrl)
|
||||
|
|
@ -41,7 +41,7 @@ func TestHmJsPayBToCOrder(t *testing.T) {
|
|||
|
||||
// 查询
|
||||
func TestHmQueryOrder(t *testing.T) {
|
||||
orderId := "sale2023122119561908"
|
||||
orderId := "sale2023122225067733"
|
||||
|
||||
order, err := HmQueryOrder(orderId)
|
||||
if err != nil {
|
||||
|
|
@ -53,7 +53,7 @@ func TestHmQueryOrder(t *testing.T) {
|
|||
|
||||
// 撤销
|
||||
func TestHmCancelOrder(t *testing.T) {
|
||||
orderId := "test20231220439"
|
||||
orderId := "sale2023122225067733"
|
||||
|
||||
order, err := HmCancelOrder(orderId)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ type ErpStockCommodity struct {
|
|||
MinRetailPrice uint32 `json:"min_retail_price"` // 最低零售价
|
||||
StaffCostPrice uint32 `json:"staff_cost_price"` // 员工成本价加价
|
||||
WholesalePrice uint32 `json:"wholesale_price"` // 指导采购价
|
||||
MemberDiscount float64 `json:"member_discount"` // 会员优惠
|
||||
State uint32 `json:"state"` // 状态:1-在库 2-已售 3-采购退货 4-调拨中
|
||||
Count uint32 `json:"count"` // 数量
|
||||
StorageType uint32 `json:"storage_type"` // 入库方式：1-系统入库 2-采购入库
|
||||
|
|
@ -658,6 +659,7 @@ func (m *StockImporter) ImportStockData(colsMap []map[string]interface{}) error
|
|||
IMEIType: v2.IMEIType,
|
||||
IMEI: "",
|
||||
Remark: "",
|
||||
MemberDiscount: v2.MemberDiscount,
|
||||
}
|
||||
|
||||
if list[i].StockTime != "" { //导入时间不为空
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ type ErpOrderCommodity struct {
|
|||
MemberDiscount float64 `json:"member_discount"` // 会员优惠
|
||||
VmDiscount float64 `json:"vm_discount"` // 会员积分抵扣
|
||||
Amount float64 `json:"amount"` // 实际零售价
|
||||
TotalAmount float64 `json:"total_amount"` // 商品实收金额
|
||||
Remark string `json:"remark"` // 备注
|
||||
Tel string `json:"tel" gorm:"index"` // 手机号
|
||||
RejectedPrice float64 `json:"rejected_price"` // 退货单价
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ settings:
|
|||
# 数据库类型 mysql，sqlite3， postgres
|
||||
driver: mysql
|
||||
# 数据库连接字符串 mysql 缺省信息 charset=utf8&parseTime=True&loc=Local&timeout=1000ms
|
||||
source: mh_dev:d9qy46ONI0ZTF9eH@tcp(39.108.188.218:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
|
||||
source: mh_dev:d9qy46ONI0ZTF9eH@tcp(112.33.14.191:3306)/mh_dev?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
|
||||
# source: mh_pro:c5JBW3X6EEVQluYM@tcp(39.108.188.218:3306)/mh_pro?charset=utf8&parseTime=True&loc=Local&timeout=1000ms
|
||||
|
||||
gen:
|
||||
|
|
|
|||
|
|
@ -5311,6 +5311,10 @@ const docTemplate = `{
|
|||
"description": "手机号",
|
||||
"type": "string"
|
||||
},
|
||||
"total_amount": {
|
||||
"description": "商品实收金额",
|
||||
"type": "number"
|
||||
},
|
||||
"vm_discount": {
|
||||
"description": "会员积分抵扣",
|
||||
"type": "number"
|
||||
|
|
@ -5655,6 +5659,10 @@ const docTemplate = `{
|
|||
"description": "是否串码：1-无串码 2-串码（系统生成） 3-串码（手动添加）",
|
||||
"type": "integer"
|
||||
},
|
||||
"member_discount": {
|
||||
"description": "会员优惠",
|
||||
"type": "number"
|
||||
},
|
||||
"min_retail_price": {
|
||||
"description": "最低零售价",
|
||||
"type": "integer"
|
||||
|
|
|
|||
|
|
@ -5300,6 +5300,10 @@
|
|||
"description": "手机号",
|
||||
"type": "string"
|
||||
},
|
||||
"total_amount": {
|
||||
"description": "商品实收金额",
|
||||
"type": "number"
|
||||
},
|
||||
"vm_discount": {
|
||||
"description": "会员积分抵扣",
|
||||
"type": "number"
|
||||
|
|
@ -5644,6 +5648,10 @@
|
|||
"description": "是否串码：1-无串码 2-串码（系统生成） 3-串码（手动添加）",
|
||||
"type": "integer"
|
||||
},
|
||||
"member_discount": {
|
||||
"description": "会员优惠",
|
||||
"type": "number"
|
||||
},
|
||||
"min_retail_price": {
|
||||
"description": "最低零售价",
|
||||
"type": "integer"
|
||||
|
|
|
|||
|
|
@ -1078,6 +1078,9 @@ definitions:
|
|||
tel:
|
||||
description: 手机号
|
||||
type: string
|
||||
total_amount:
|
||||
description: 商品实收金额
|
||||
type: number
|
||||
vm_discount:
|
||||
description: 会员积分抵扣
|
||||
type: number
|
||||
|
|
@ -1329,6 +1332,9 @@ definitions:
|
|||
imei_type:
|
||||
description: 是否串码：1-无串码 2-串码（系统生成） 3-串码（手动添加）
|
||||
type: integer
|
||||
member_discount:
|
||||
description: 会员优惠
|
||||
type: number
|
||||
min_retail_price:
|
||||
description: 最低零售价
|
||||
type: integer
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user