1

platformapi/lakala/lakala_callback_model.go

@@ -18,14 +18,16 @@ type ApplyContractCallBack struct {
 
 // SeparateCallback 商户分账创建/修改回调
 type SeparateCallback struct {
-	ApplyId         string `json:"applyId"`
+	ApplyId          int64  `json:"applyId"`
-	MerInnerNo      string `json:"merInnerNo"`
+	MerInnerNo       string `json:"merInnerNo"`
-	MerCupNo        string `json:"merCupNo"`
+	MerCupNo         string `json:"merCupNo"`
-	EntrustFileName string `json:"entrustFileName"`
+	EntrustFileName  string `json:"entrustFileName"`
-	AuditStatus     string `json:"auditStatus"`
+	AuditStatus      string `json:"auditStatus"`
-	Remark          string `json:"remark"`
+	Remark           string `json:"remark"`
-	AuditStatusText string `json:"auditStatusText"`
+	AuditStatusText  string `json:"auditStatusText"`
-	EntrustFilePath string `json:"entrustFilePath"`
+	EntrustFilePath  string `json:"entrustFilePath"`
+	RetUrl           string `json:"retUrl"`
+	UploadAttachType string `json:"uploadAttachType"`
 }
 
 // SeparateBindCallback 分账关系绑定回调

platformapi/lakala/lakala_order.go

@@ -175,6 +175,26 @@ func (a *API) ApplyElectronicContract(param *ApplyContractParam) (*ApplyContract
 	return resp, nil
 }
 
+// ApplyElectronicContractByPeople 申请人工审核
+func (a *API) ApplyElectronicContractByPeople(param *ApplyContractByPeople) error {
+	reqParameter := map[string]interface{}{
+		"req_data":  utils.Struct2Map(param, "", false),
+		"ver":       Version,
+		"timestamp": utils.Time2TimeStrByFormat(time.Now(), TimeFormat),
+		"req_id":    utils.GetUUID(),
+	}
+	result, err := a.AccessAPISign(OrderProdUrl, OrderEcApplyByPeopleActive, http.MethodPost, "", reqParameter)
+	if err != nil {
+		return err
+	}
+
+	if result["code"].(string) != Success {
+		return fmt.Errorf("%s", result["msg"].(string))
+	}
+
+	return err
+}
+
 // QueryElectronicContract 电子合同签约审核结果查询
 func (a *API) QueryElectronicContract(orderNo string, orgId int, ecApplyId string) (*ElectronicContractStatus, error) {
 	reqParameter := map[string]interface{}{

platformapi/lakala/lakala_order_model.go

@@ -4,13 +4,15 @@ const (
 	OrderTestUrl = "https://test.wsmsd.cn/sit/api/v3/" // 收银订单创建测试地址
 	OrderProdUrl = "https://s2.lakala.com/api/v3"      // 收银订单创建正式地址
 
-	CrateOrderActive         = "ccss/counter/order/special_create" // 创建订单
+	CrateOrderActive           = "ccss/counter/order/special_create" // 创建订单
-	CloseOrderActive         = "ccss/counter/order/close"          // 订单关单
+	CloseOrderActive           = "ccss/counter/order/close"          // 订单关单
-	QueryOrderActive         = "ccss/counter/order/query"          // 订单查询
+	QueryOrderActive           = "ccss/counter/order/query"          // 订单查询
-	OrderRefundActive        = "lams/trade/trade_refund"           // 订单统一退货
+	OrderRefundActive          = "lams/trade/trade_refund"           // 订单统一退货
-	OrderRefundQueryActive   = "lams/trade/trade_refund_query"     // 订单统一退货查询
+	OrderRefundQueryActive     = "lams/trade/trade_refund_query"     // 订单统一退货查询
-	OrderEcApplyActive       = "mms/open_api/ec/apply"             // 电子合同申请
+	OrderEcApplyActive         = "mms/open_api/ec/apply"             // 电子合同申请
-	OrderEcApplyStatusActive = "mms/open_api/ec/qma_status"        // 电子合同状态查询
+	OrderEcApplyStatusActive   = "mms/open_api/ec/qma_status"        // 电子合同状态查询
+	OrderEcApplyByPeopleActive = "mms/open_api/ec/apply_manual"      // 申请人工审核
+
 )
 
 const (
@@ -263,3 +265,18 @@ type ApplyContractResp struct {
 	EcApplyId int64  `json:"ec_apply_id"`
 	ResultUrl string `json:"result_url"`
 }
+
+// ApplyContractByPeople 电子合同申请人工复合
+type ApplyContractByPeople struct {
+	OrderNo   string                  `json:"order_no"`    // 建议：平台编号+14位年月日时（24小时制）分秒+8位的随机数（同一接入机构不重复）
+	OrgId     int                     `json:"org_id"`      // 签约方所属拉卡拉机构
+	EcApplyId int64                   `json:"ec_apply_id"` // 申请接口反馈编号
+	FileData  []ApplyContractFileType `json:"file_data"`   // 附件信息集合
+	RetUrl    string                  `json:"ret_url"`     // 回调接口
+}
+
+type ApplyContractFileType struct {
+	AttachType      string `json:"attach_type"`
+	AttachExtName   string `json:"attach_ext_name"`
+	AttachStorePath string `json:"attach_store_path"`
+}

platformapi/lakala/lakala_token_model.go

@@ -94,10 +94,11 @@ const (
 	ApplyContractCallback         = "http://callback.jxc4.com/lakalaCallback/applyContract"     // 合同申请回到
 
 	//CallbackLaKaLaShopUrl         = "http://callback.test.jxc4.com/lakalaCallback/separateMsg"       // 消息通知地址(商户开通)
+	//ApplyContractCallback         = "http://callback.test.jxc4.com/lakalaCallback/applyContract"     // 合同申请回到
+
 	//CallbackLaKaLaSeparateBindUrl = "http://callback.test.jxc4.com/lakalaCallback/separateBind"      // 消息通知地址(分账关系绑定回调,解绑回调)
 	//CallbackLaKaLaSeparateUrl     = "http://callback.test.jxc4.com/lakalaCallback/separate"          // 消息通知地址(分账申请/撤回/退回 回调)
 	//BillProdCallbackUrl           = "http://callback.test.jxc4.com/lakalaCallback/ewalletWithdrawD1" // 账户D1提现回调
 	//OrderStatusCallback           = "http://callback.test.jxc4.com/lakalaCallback/orderStatus"       // 收银台订单通知(订单状态)
 	//PayStatusCallback             = "http://callback.test.jxc4.com/lakalaCallback/payStatus"         // 主扫支付状态通知
-	//ApplyContractCallback         = "http://callback.test.jxc4.com/lakalaCallback/applyContract"     // 合同申请回到
 )

platformapi/lakala/lakala_token_test.go

@@ -78,8 +78,8 @@ func TestGetCustomAndCategoryList(t *testing.T) {
 }
 
 func TestUploadImg(t *testing.T) {
-	filePath := "https://image.jxc4.com/image/3559d4696be3bf241ee6b89ca3713cf7.pdf"
+	filePath := "https://image.jxc4.com/image/2776ca405f6d4bb70a5afa421792e5c6.jpg"
-	data, err := api.FileUpload(filePath, "SPLIT_ENTRUST_FILE", "0", "false")
+	data, err := api.FileUpload(filePath, "SHOP_INSIDE_IMG", "0", "false")
 	if err != nil {
 		fmt.Printf("Error: %v\n", err)
 	} else {