1

controllers/jx_order.go

@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
 	"strings"
 	"time"
 
@@ -1496,3 +1497,49 @@ func (c *OrderController) UpdateTiktokSettlement() {
 		return retVal, errCode, err
 	})
 }
+
+// @Title 获取门店的发票申请
+// @Description 获取门店的发票申请
+// @Param	token			header		string	true	"认证token"
+// @Param	storeId			formData	int		false	"门店id"
+// @Param	startTime		formData	string	true	"开始时间"
+// @Param	endTime			formData	string	true	"结束时间"
+// @Param	status			formData	string	false	"发票回复状态[1未回复/2回复]"
+// @Param	offset			query		int		false	"结果起始序号（以0开始，缺省为0）"
+// @Param	pageSize		query		int		false	"结果页大小（缺省为50，-1表示全部）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetInvoiceRecord [post]
+func (c *OrderController) GetInvoiceRecord() {
+	c.callGetInvoiceRecord(func(params *tOrderGetInvoiceRecordParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = dao.GetStoreInvoiceList(params.StoreId, utils.Str2Time(params.StartTime), utils.Str2Time(params.EndTime), params.Status, params.Offset, params.PageSize)
+		return retVal, errCode, err
+	})
+}
+
+// @Title 上传订单发票
+// @Description 上传订单发票
+// @Param	token			header		string	true	"认证token"
+// @Param	orderId			formData	string	true	"订单ID"
+// @Param	invoiceUrl		formData	string	true	"发票地址[10M内pdf/png/jpeg/jpg]"
+// @Param	invoiceId		formData	string	true	"发票号码"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UploadOrderInvoice [post]
+func (c *OrderController) UploadOrderInvoice() {
+	c.callUploadOrderInvoice(func(params *tOrderUploadOrderInvoiceParams) (retVal interface{}, errCode string, err error) {
+		var (
+			db = dao.GetDB()
+		)
+		invoice, err := dao.GetInvoiceInfo(db, params.OrderId)
+		if err != nil {
+			return retVal, errCode, err
+		}
+		invoice.InvoiceUrl = params.InvoiceUrl
+		invoice.InvoiceId = params.InvoiceId
+		dao.UpdateEntity(db, invoice, "InvoiceUrl", "InvoiceId")
+
+		err = mtwm.UploadInvoice(invoice)
+		return retVal, errCode, err
+	})
+}

controllers/mtwm_callback.go

@@ -144,13 +144,24 @@ func (c *MtwmController) DeliveryFeeChange() {
 func (c *MtwmController) Invoice() {
 	body, err := ioutil.ReadAll(c.Ctx.Request.Body)
 	if err != nil {
-		c.Data["json"] = mtwmapi.Err2CallbackResponse(err, "")
+		c.Data["json"] = map[string]interface{}{"result_code": -1}
 		c.ServeJSON()
 		return
 	}
 	globals.SugarLogger.Debugf("------body:= %s", string(body))
-	callbackResponse := mtwmapi.Err2CallbackResponse(nil, "")
-	c.Data["json"] = callbackResponse
+
+	data := &mtwmapi.InvoiceCallback{}
+	if err = json.Unmarshal(body, data); err != nil {
+		c.Data["json"] = map[string]interface{}{"result_code": -1}
+		c.ServeJSON()
+		return
+	}
+
+	// 消息通知
+	if err = mtwm.InvoiceCallback(data); err != nil {
+		globals.SugarLogger.Errorf("mtwm Invoice err := %v", err)
+	}
+	c.Data["json"] = map[string]interface{}{"result_code": 1}
 	c.ServeJSON()
 
 }