|
|
|
@ -8,6 +8,7 @@ import com.hfkj.common.utils.*; |
|
|
|
|
import com.hfkj.config.CommonSysConst; |
|
|
|
|
|
|
|
|
|
import com.hfkj.entity.*; |
|
|
|
|
import com.hfkj.haioil.HaiOilService; |
|
|
|
|
import com.hfkj.jd.JdPostService; |
|
|
|
|
import com.hfkj.jd.JdService; |
|
|
|
|
import com.hfkj.mer.BsMerPayConfigService; |
|
|
|
@ -26,6 +27,7 @@ import com.hfkj.service.order.BsOrderRefundService; |
|
|
|
|
import com.hfkj.service.order.BsOrderService; |
|
|
|
|
import com.hfkj.service.order.OrderPayService; |
|
|
|
|
import com.hfkj.service.pay.huift.TradeService; |
|
|
|
|
import com.hfkj.sysenum.order.OrderCouponNoStatusEnum; |
|
|
|
|
import com.hfkj.sysenum.order.OrderLogisticsStatusEnum; |
|
|
|
|
import com.jd.open.api.sdk.domain.vopsp.CategoryInfoGoodsProvider.response.getCategoryInfoList.GetCategoryInfoGoodsResp; |
|
|
|
|
import com.jd.open.api.sdk.domain.vopsp.SkuInfoGoodsProvider.response.getSkuDetailInfo.GetSkuPoolInfoGoodsResp; |
|
|
|
@ -129,6 +131,61 @@ public class TestController { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/confirmReceipt",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "订单完成") |
|
|
|
|
public ResponseData confirmReceipt() { |
|
|
|
|
try { |
|
|
|
|
Map<String , Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
map.put("logisticsStatus" , "SIGN"); |
|
|
|
|
map.put("status" , 2); |
|
|
|
|
|
|
|
|
|
List<BsOrderGoods> orderGoodsList = orderGoodsService.getList(map); |
|
|
|
|
|
|
|
|
|
for (BsOrderGoods goods : orderGoodsList) { |
|
|
|
|
|
|
|
|
|
// 判断时间是否是十天前
|
|
|
|
|
|
|
|
|
|
if (DateUtil.differentDays(goods.getCreateTime() , new Date()) > 10) { |
|
|
|
|
orderGoodsService.confirmReceipt(goods.getId()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return ResponseMsgUtil.success("成功"); |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("error!",e); |
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/orderGoodsConfirmReceiptAgent",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "订单完成") |
|
|
|
|
public ResponseData orderGoodsConfirmReceiptAgent() { |
|
|
|
|
try { |
|
|
|
|
Map<String , Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
map.put("logisticsStatus" , "SIGN"); |
|
|
|
|
map.put("status" , 2); |
|
|
|
|
|
|
|
|
|
List<BsOrderGoods> orderGoodsList = orderGoodsService.getList(map); |
|
|
|
|
|
|
|
|
|
for (BsOrderGoods goods : orderGoodsList) { |
|
|
|
|
|
|
|
|
|
// 判断时间是否是十天前
|
|
|
|
|
|
|
|
|
|
if (DateUtil.differentDays(goods.getCreateTime() , new Date()) > 10) { |
|
|
|
|
orderGoodsService.confirmReceipt(goods.getId()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return ResponseMsgUtil.success("成功"); |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("error!",e); |
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/refundMovieOrder",method = RequestMethod.POST) |
|
|
|
|
@ResponseBody |
|
|
|
@ -392,5 +449,71 @@ public class TestController { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/refundPk",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "退回优惠券包") |
|
|
|
|
public ResponseData refundPk(@RequestParam(value = "reqId", required = false) String reqId, |
|
|
|
|
@RequestParam(value = "discountPkStockCode", required = false) String discountPkStockCode) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
Map<String , Object> map = new HashMap<>(); |
|
|
|
|
map.put("reqId" ,reqId); |
|
|
|
|
map.put("discountPkStockCode" , discountPkStockCode); |
|
|
|
|
JSONObject returnParam = HaiOilService.refundPk(map); |
|
|
|
|
return ResponseMsgUtil.success(returnParam); |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("error!",e); |
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/queryPkDetailByStockCode",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "查询券包使用情况") |
|
|
|
|
public ResponseData queryPkDetailByStockCode(@RequestParam(value = "reqId", required = false) String reqId, |
|
|
|
|
@RequestParam(value = "discountPkStockCode", required = false) String discountPkStockCode) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
Map<String , Object> map = new HashMap<>(); |
|
|
|
|
map.put("reqId" ,reqId); |
|
|
|
|
map.put("discountPkStockCode" , discountPkStockCode); |
|
|
|
|
JSONObject returnParam = HaiOilService.queryPkDetailByStockCode(map); |
|
|
|
|
return ResponseMsgUtil.success(returnParam); |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("error!",e); |
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/pushPk",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "pushPk") |
|
|
|
|
public ResponseData pushPk() { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
// 推送给嗨加油
|
|
|
|
|
Map<String , Object> map = new HashMap<>(); |
|
|
|
|
map.put("discountPkNo" , "DPK10004"); |
|
|
|
|
map.put("number" , 1); |
|
|
|
|
map.put("phone" , "18090580471"); |
|
|
|
|
JSONObject returnParam = HaiOilService.pushPk(map); |
|
|
|
|
JSONArray dataArray = returnParam.getJSONObject("return_data").getJSONArray("list"); |
|
|
|
|
BsOrderCouponNo couponNo = new BsOrderCouponNo(); |
|
|
|
|
couponNo.setExpireTime(dataArray.getJSONObject(0).getJSONArray("codeList").getJSONObject(0).getDate("expirationDate")); |
|
|
|
|
couponNo.setDeliverTime(new Date()); |
|
|
|
|
couponNo.setChannelOrderNo(returnParam.getJSONObject("return_data").getString("reqId")); |
|
|
|
|
couponNo.setGoodsVpdSourceCouNo(dataArray.getJSONObject(0).getString("discountPkStockCode")); |
|
|
|
|
couponNo.setStatus(OrderCouponNoStatusEnum.status2.getCode()); |
|
|
|
|
return ResponseMsgUtil.success(couponNo); |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("error!",e); |
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|