|
|
@@ -23,7 +23,6 @@ import java.util.*; |
|
|
|
|
|
|
|
|
@RestController |
|
|
@RestController |
|
|
@AllArgsConstructor |
|
|
@AllArgsConstructor |
|
|
//@RequestMapping(value = "/p") |
|
|
|
|
|
@Api(description = "POS相关接口") |
|
|
@Api(description = "POS相关接口") |
|
|
public class PosController extends BaseController { |
|
|
public class PosController extends BaseController { |
|
|
|
|
|
|
|
|
@@ -36,7 +35,7 @@ public class PosController extends BaseController { |
|
|
"\"dev_id\":\"string(必填)\"," + |
|
|
"\"dev_id\":\"string(必填)\"," + |
|
|
"\"tenant_id\":\"string(必填)\"," + |
|
|
"\"tenant_id\":\"string(必填)\"," + |
|
|
"\"nonce_str\":\"string(必填)\"}") |
|
|
"\"nonce_str\":\"string(必填)\"}") |
|
|
@PostMapping("/getPosMemConfigStatus") |
|
|
|
|
|
|
|
|
@PostMapping("/getPosMemConfig") |
|
|
@SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") |
|
|
@SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") |
|
|
public Map<String, String> getMemStatus(@RequestBody Map<String, String> params) { |
|
|
public Map<String, String> getMemStatus(@RequestBody Map<String, String> params) { |
|
|
JSONObject payContent = new JSONObject(); |
|
|
JSONObject payContent = new JSONObject(); |
|
|
@@ -51,7 +50,7 @@ public class PosController extends BaseController { |
|
|
logger.info("resKey: " + resKey); |
|
|
logger.info("resKey: " + resKey); |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
retMap = posService.getMemConfigStatus(params); |
|
|
|
|
|
|
|
|
retMap = posService.getPosMemConfig(params); |
|
|
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_SUCCESS, null); |
|
|
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_SUCCESS, null); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_FAIL, |
|
|
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "", WxPayConstant.RET_FAIL, |
|
|
@@ -69,6 +68,7 @@ public class PosController extends BaseController { |
|
|
"\"tenant_id\":\"string(必填)\"," + |
|
|
"\"tenant_id\":\"string(必填)\"," + |
|
|
"\"nonce_str\":\"string(必填)\"}") |
|
|
"\"nonce_str\":\"string(必填)\"}") |
|
|
@PostMapping("/getQrCode") |
|
|
@PostMapping("/getQrCode") |
|
|
|
|
|
@SystemControllerLog(description = "获取注册二维码及小票二维码规则") |
|
|
public Map<String, String> getQrCode(@RequestBody Map<String, String> params) { |
|
|
public Map<String, String> getQrCode(@RequestBody Map<String, String> params) { |
|
|
JSONObject payContent = new JSONObject(); |
|
|
JSONObject payContent = new JSONObject(); |
|
|
|
|
|
|
|
|
@@ -106,6 +106,7 @@ public class PosController extends BaseController { |
|
|
"\"pos_amount\":\"string(单位:分)(必填)\"," + |
|
|
"\"pos_amount\":\"string(单位:分)(必填)\"," + |
|
|
"\"nonce_str\":\"string(必填)\"}") |
|
|
"\"nonce_str\":\"string(必填)\"}") |
|
|
@PostMapping("/checkMem") |
|
|
@PostMapping("/checkMem") |
|
|
|
|
|
@SystemControllerLog(description = "获取会员折扣/优惠券/消费卡是否启用") |
|
|
public Map<String, String> checkMem(@RequestBody Map<String, String> params) { |
|
|
public Map<String, String> checkMem(@RequestBody Map<String, String> params) { |
|
|
JSONObject payContent = new JSONObject(); |
|
|
JSONObject payContent = new JSONObject(); |
|
|
|
|
|
|
|
|
|