作者 唐旭辉

bug 修复

@@ -19,6 +19,7 @@ func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusServic @@ -19,6 +19,7 @@ func NewBusinessBonusService(option map[string]interface{}) *BusinessBonusServic
19 return newService 19 return newService
20 } 20 }
21 21
  22 +// ListBusinessBonus 列表
22 func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusinessBonusQuery) (int, interface{}, error) { 23 func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusinessBonusQuery) (int, interface{}, error) {
23 var ( 24 var (
24 transactionContext, _ = factory.CreateTransactionContext(nil) 25 transactionContext, _ = factory.CreateTransactionContext(nil)
@@ -61,7 +62,10 @@ func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusiness @@ -61,7 +62,10 @@ func (srv BusinessBonusService) ListBusinessBonus(queryOption query.ListBusiness
61 "stateOfPayment": v.BonusStatus, 62 "stateOfPayment": v.BonusStatus,
62 "stateOfPaymentName": domain.DescribeBusinessBonusStatus(v.BonusStatus), 63 "stateOfPaymentName": domain.DescribeBusinessBonusStatus(v.BonusStatus),
63 "partner": v.PartnerName, 64 "partner": v.PartnerName,
64 - "updateTime": v.UpdateAt.Format("2006-01-02 15:04:05"), 65 + "updateTime": "",
  66 + }
  67 + if !v.UpdateAt.IsZero() {
  68 + m["updateTime"] = v.UpdateAt.Format("2006-01-02 15:04:05")
65 } 69 }
66 returnData = append(returnData, m) 70 returnData = append(returnData, m)
67 } 71 }
@@ -113,6 +117,7 @@ func (srv BusinessBonusService) UpdateBusinessBonus(cmd command.UpdateBusinessBo @@ -113,6 +117,7 @@ func (srv BusinessBonusService) UpdateBusinessBonus(cmd command.UpdateBusinessBo
113 return nil 117 return nil
114 } 118 }
115 119
  120 +//GetBusinessBonus 获取详情
116 func (srv BusinessBonusService) GetBusinessBonus(queryOption query.GetBusinessBonusQuery) (map[string]interface{}, error) { 121 func (srv BusinessBonusService) GetBusinessBonus(queryOption query.GetBusinessBonusQuery) (map[string]interface{}, error) {
117 122
118 var ( 123 var (
@@ -77,7 +77,7 @@ func (reponsitory CompanyRepository) Edit(m *domain.Company) error { @@ -77,7 +77,7 @@ func (reponsitory CompanyRepository) Edit(m *domain.Company) error {
77 DeleteAt: m.DeleteAt, 77 DeleteAt: m.DeleteAt,
78 UpdateAt: m.UpdateAt, 78 UpdateAt: m.UpdateAt,
79 } 79 }
80 - _, err = tx.Model(&companyModel).Update() 80 + _, err = tx.Model(&companyModel).WherePK().Update()
81 return err 81 return err
82 } 82 }
83 83