Merge branch 'feature/v4.10.11' of qmx/jy into feature/v4.10.14

src/jfw/modules/subscribepay/src/entity/equityCode.go

@@ -145,6 +145,7 @@ func (e *EquityCode) Exchange() (msg string, b bool) {
 						}
 						if orderCode != "" {
 							util.Mysql.UpdateOrDeleteBySql(`DELETE FROM dataexport_order WHERE order_code = ?`, orderCode)
+							util.Mysql.UpdateOrDeleteBySql(`DELETE FROM order_sale_record WHERE ordercode = ?`, orderCode)
 						}
 					}(e.OrderCode)
 				}
@@ -188,6 +189,7 @@ func (e *EquityCode) H5Exchange() (status int, isMemberProduct bool) {
 				}
 				if orderCode != "" {
 					util.Mysql.UpdateOrDeleteBySql(`DELETE FROM dataexport_order WHERE order_code = ?`, orderCode)
+					util.Mysql.UpdateOrDeleteBySql(`DELETE FROM order_sale_record WHERE ordercode = ?`, orderCode)
 				}
 			}(e.OrderCode)
 		}
@@ -1124,7 +1126,7 @@ func (e *EquityCode) Submit(codes []string, disChannel, productName, industryCod
 			return false
 		}
 		// 销售记录表
-		if util.Mysql.InsertByTx(tx, "jianyu.order_sale_record", map[string]interface{}{
+		if util.ActivityMysql.InsertByTx(tx, "jianyu.order_sale_record", map[string]interface{}{
 			"state":                1,
 			"ordercode":            orderCode,
 			"saler_dept":           "运营部",