|
@@ -64,6 +64,7 @@ public class ConsumeController {
|
|
|
public Object consumeOriginalVirtualCard(@RequestBody Object record, @RequestParam(name = "mac", required = false) java.lang.String mac,
|
|
public Object consumeOriginalVirtualCard(@RequestBody Object record, @RequestParam(name = "mac", required = false) java.lang.String mac,
|
|
|
@RequestParam(name = "qrcode") java.lang.String qrcode,
|
|
@RequestParam(name = "qrcode") java.lang.String qrcode,
|
|
|
@RequestParam(name = "xfPwd", required = false) java.lang.String xfPwd) {
|
|
@RequestParam(name = "xfPwd", required = false) java.lang.String xfPwd) {
|
|
|
|
|
+ log.info("[二维码请求消费]-[{}]",JSONUtil.parseObj(record));
|
|
|
JSONObject yc = JSONUtil.parseObj(record);
|
|
JSONObject yc = JSONUtil.parseObj(record);
|
|
|
long userNo = ObjectUtil.isEmpty(yc.get("employeeID")) ? 0L : Long.parseLong(yc.get("employeeID").toString());
|
|
long userNo = ObjectUtil.isEmpty(yc.get("employeeID")) ? 0L : Long.parseLong(yc.get("employeeID").toString());
|
|
|
Object redisQrCode = RedisUtils.getCacheMapValue(CacheNames.SCHOOL_CODE, Long.toString(userNo));
|
|
Object redisQrCode = RedisUtils.getCacheMapValue(CacheNames.SCHOOL_CODE, Long.toString(userNo));
|
|
@@ -87,9 +88,8 @@ public class ConsumeController {
|
|
|
* @return 请求消费结果
|
|
* @return 请求消费结果
|
|
|
*/
|
|
*/
|
|
|
@PostMapping("/ConsumeOriginal")
|
|
@PostMapping("/ConsumeOriginal")
|
|
|
- public Object consumeOriginal(@RequestBody Object record, @RequestParam(name = "mac", required = false) java.lang.String mac,
|
|
|
|
|
- @RequestParam(name = "xfPwd", required = false) java.lang.String xfPwd) {
|
|
|
|
|
-
|
|
|
|
|
|
|
+ public Object consumeOriginal(@RequestBody Object record, @RequestParam(name = "mac", required = false) java.lang.String mac,@RequestParam(name = "xfPwd", required = false) java.lang.String xfPwd) {
|
|
|
|
|
+ log.info("[刷卡请求消费]-[{}]",JSONUtil.parseObj(record));
|
|
|
return doRecordData(record, "requestConsume", mac, xfPwd);
|
|
return doRecordData(record, "requestConsume", mac, xfPwd);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -102,7 +102,7 @@ public class ConsumeController {
|
|
|
*/
|
|
*/
|
|
|
@PostMapping("/Consume")
|
|
@PostMapping("/Consume")
|
|
|
public Object uploadRecord(@RequestBody Object record, @RequestParam(name = "mac", required = false) java.lang.String mac) {
|
|
public Object uploadRecord(@RequestBody Object record, @RequestParam(name = "mac", required = false) java.lang.String mac) {
|
|
|
- //return doRecordData(record, "uploadRecord", mac, "");
|
|
|
|
|
|
|
+ log.info("[上传交易记录]-[{}]",JSONUtil.parseObj(record));
|
|
|
Object object = doRecordData(record, "uploadRecord", mac, "");
|
|
Object object = doRecordData(record, "uploadRecord", mac, "");
|
|
|
JSONObject jsonObject = JSONUtil.parseObj(object);
|
|
JSONObject jsonObject = JSONUtil.parseObj(object);
|
|
|
|
|
|