|
|
@ -200,7 +200,7 @@ public class TestController { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 工会卡支付
|
|
|
|
// 工会卡支付
|
|
|
|
JSONObject consumption = HuiLianTongUnionCardService.consumption(orderNo, cardNo, payRealPrice, "HiSen_phg_goods", "11101608", "", "241001130753599939订单扣款"); |
|
|
|
JSONObject consumption = HuiLianTongUnionCardService.consumption(orderNo, cardNo, payRealPrice, "HiSen_phg_goods", "11101667", "", "250122151032399686订单扣款"); |
|
|
|
if (!consumption.getString("respCode").equals("0000")) { |
|
|
|
if (!consumption.getString("respCode").equals("0000")) { |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage")); |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage")); |
|
|
|
} |
|
|
|
} |
|
|
@ -240,6 +240,7 @@ public class TestController { |
|
|
|
@ResponseBody |
|
|
|
@ResponseBody |
|
|
|
@ApiOperation(value = "更新京东物流信息") |
|
|
|
@ApiOperation(value = "更新京东物流信息") |
|
|
|
public ResponseData orderGoodsJd() { |
|
|
|
public ResponseData orderGoodsJd() { |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|
|
|
|
|
|
|
|
|
List<BsOrderGoods> orderGoodsList = orderGoodsService.getListByJd(); |
|
|
|
List<BsOrderGoods> orderGoodsList = orderGoodsService.getListByJd(); |
|
|
@ -397,13 +398,9 @@ public class TestController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/getGoodsJd",method = RequestMethod.GET) |
|
|
|
@RequestMapping(value="/getGoodsJd",method = RequestMethod.GET) |
|
|
|
@ResponseBody |
|
|
|
@ResponseBody |
|
|
|
@ApiOperation(value = "更新商品") |
|
|
|
@ApiOperation(value = "更新京东新增商品") |
|
|
|
public ResponseData getGoodsJd() { |
|
|
|
public ResponseData getGoodsJd() { |
|
|
|
try { |
|
|
|
try { |
|
|
|
jdService.getGoodsJd(); |
|
|
|
jdService.getGoodsJd(); |
|
|
@ -415,6 +412,20 @@ public class TestController { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/updateGoodsMsg",method = RequestMethod.GET) |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
|
|
@ApiOperation(value = "更新商品") |
|
|
|
|
|
|
|
public ResponseData updateGoodsMsg(@RequestParam(value = "skuId", required = false) Long skuId) { |
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
jdService.updateGoodsMsg(skuId); |
|
|
|
|
|
|
|
return ResponseMsgUtil.success(""); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
log.error("error!",e); |
|
|
|
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/confirmOrder",method = RequestMethod.GET) |
|
|
|
@RequestMapping(value="/confirmOrder",method = RequestMethod.GET) |
|
|
|
@ResponseBody |
|
|
|
@ResponseBody |
|
|
@ -515,19 +526,48 @@ public class TestController { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/meiTuanRefund",method = RequestMethod.GET) |
|
|
|
@RequestMapping(value="/resolveResponse",method = RequestMethod.GET) |
|
|
|
@ResponseBody |
|
|
|
@ResponseBody |
|
|
|
@ApiOperation(value = "meiTuanRefund") |
|
|
|
@ApiOperation(value = "resolveResponse") |
|
|
|
public ResponseData meiTuanRefund() { |
|
|
|
public ResponseData resolveResponse(@RequestParam(value = "data", required = false) String data) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
|
|
|
|
JSONObject consumptionResult = HuiLianTongUnionCardService.resolveResponse(data); |
|
|
|
|
|
|
|
// orderRefundService.meiTuanRefund(
|
|
|
|
|
|
|
|
// "R"+DateUtil.date2String(new Date(), "yyMMddHHmmss") + RandomUtils.number(3, false) ,
|
|
|
|
|
|
|
|
// "1895338934767706172" ,
|
|
|
|
|
|
|
|
// new BigDecimal("56.14") ,
|
|
|
|
|
|
|
|
// "美团退款"
|
|
|
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
return ResponseMsgUtil.success(consumptionResult); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
log.error("error!",e); |
|
|
|
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/cancelOrder",method = RequestMethod.GET) |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
|
|
@ApiOperation(value = "cancelOrder") |
|
|
|
|
|
|
|
public ResponseData cancelOrder(@RequestParam(value = "thirdOrderNo", required = false) String thirdOrderNo, |
|
|
|
|
|
|
|
@RequestParam(value = "childOrderNo", required = false) String childOrderNo) { |
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
JdPostService.cancelOrder(jdService.getToken(), Long.valueOf(thirdOrderNo), childOrderNo , "取消订单!"); |
|
|
|
|
|
|
|
return ResponseMsgUtil.success("取消"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
log.error("error!",e); |
|
|
|
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
orderRefundService.meiTuanRefund( |
|
|
|
|
|
|
|
"R"+DateUtil.date2String(new Date(), "yyMMddHHmmss") + RandomUtils.number(3, false) , |
|
|
|
@RequestMapping(value="/getOrderCancelProcessDetail",method = RequestMethod.GET) |
|
|
|
"1895338934767706172" , |
|
|
|
@ResponseBody |
|
|
|
new BigDecimal("56.14") , |
|
|
|
@ApiOperation(value = "getOrderCancelProcessDetail") |
|
|
|
"美团退款" |
|
|
|
public ResponseData getOrderCancelProcessDetail(@RequestParam(value = "thirdOrderNo", required = false) String thirdOrderNo) { |
|
|
|
); |
|
|
|
try { |
|
|
|
return ResponseMsgUtil.success("成功"); |
|
|
|
return ResponseMsgUtil.success(JdPostService.getOrderCancelProcessDetail(jdService.getToken(), Long.valueOf(thirdOrderNo))); |
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
log.error("error!",e); |
|
|
|
log.error("error!",e); |
|
|
@ -535,5 +575,18 @@ public class TestController { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/deleteMsg",method = RequestMethod.GET) |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
|
|
@ApiOperation(value = "deleteMsg") |
|
|
|
|
|
|
|
public ResponseData deleteMsg() { |
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
jdService.deleteMsg(); |
|
|
|
|
|
|
|
return ResponseMsgUtil.success("11"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
log.error("error!",e); |
|
|
|
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|