|
@@ -76,12 +76,33 @@ func CreateMerchantCard(c *gin.Context) {
|
|
|
sqlData.UseRule = inData.UseRule
|
|
|
sqlData.MerchantCardName = inData.MerchantCardName
|
|
|
|
|
|
- sqlData.CancelNumber, err = strconv.Atoi(inData.CancelNumber)
|
|
|
- if err != nil {
|
|
|
- app.Error(c, 400, err, err.Error())
|
|
|
- return
|
|
|
+ if inData.CancelType == shanghu.CancelTypeOne {
|
|
|
+ var cancelNumber int
|
|
|
+ for _, v := range inData.CardProjectData {
|
|
|
+ var merchantCardProject shanghu.MerchantCardProject
|
|
|
+ merchantCardProject.ID = v
|
|
|
+ projectData, err := merchantCardProject.GetMerchantCardProject()
|
|
|
+ if err != nil {
|
|
|
+ app.Error(c, 400, err, err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if projectData.CancelNumber <= 0 {
|
|
|
+ app.Error(c, 400, errors.New("商品配置核销数量不能为0"), "商品配置核销数量不能为0")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ cancelNumber = cancelNumber + projectData.CancelNumber
|
|
|
+ }
|
|
|
+ sqlData.CancelNumber = cancelNumber
|
|
|
+ } else {
|
|
|
+ sqlData.CancelNumber, err = strconv.Atoi(inData.CancelNumber)
|
|
|
+ if err != nil {
|
|
|
+ app.Error(c, 400, err, err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
sqlData.BackgroundImage = inData.BackgroundImage
|
|
|
+ sqlData.CancelType = inData.CancelType
|
|
|
|
|
|
_, err = sqlData.Create()
|
|
|
if err != nil {
|
|
@@ -776,6 +797,11 @@ func CancelNumberV2(c *gin.Context) {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+ if merchantInfo.CancelType == shanghu.CancelTypeOne {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
for i := 0; i < inData.Number; i++ {
|
|
|
log.MerchantID = qrMessage.MerchantId
|
|
|
log.ClientOpenID = qrMessage.ClientOpenId
|