更新价格

dev
袁野 3 days ago
parent e3483d0447
commit 1d5172d71f
  1. 276
      bweb/src/main/java/com/bweb/controller/TestController.java
  2. 37
      bweb/src/main/java/com/bweb/controller/goods/GoodsController.java
  3. 15
      schedule/src/main/java/com/schedule/controller/OrderGoodsSchedule.java
  4. 2
      service/src/main/java/com/hfkj/dao/GoodsMsgMapperExt.java
  5. 58
      service/src/main/java/com/hfkj/jd/Impl/JdServiceImpl.java
  6. 2
      service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java

@ -58,9 +58,6 @@ import java.util.stream.Collectors;
public class TestController {
private static Logger log = LoggerFactory.getLogger(TestController.class);
@Resource
private TradeService huiftTradeService;
@Resource
private BsOrderGoodsService orderGoodsService;
@ -73,24 +70,6 @@ public class TestController {
@Resource
private CmsContentService cmsContentService;
@Resource
private BsOrderRefundService orderRefundService;
@RequestMapping(value="/thirdPayResult",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询V家园订单交易状态")
public ResponseData thirdPayResult(@RequestParam(value = "preOrderNo" , required = true) String preOrderNo,
@RequestParam(value = "shopCode" , required = true) String shopCode,
@RequestParam(value = "signSecret" , required = true) String signSecret) {
try {
return ResponseMsgUtil.success(huiftTradeService.thirdPayResult(preOrderNo,shopCode,signSecret));
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/getLogisticsMsg",method = RequestMethod.GET)
@ -134,89 +113,7 @@ 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
@ApiOperation(value = "refundMovieOrder")
public ResponseData refundMovieOrder(@RequestParam(value = "orderNo" , required = true) String orderNo,
@RequestParam(value = "payRealPrice" , required = true) BigDecimal payRealPrice,
@RequestParam(value = "cardNo" , required = true) String cardNo) {
try {
// 工会卡支付
JSONObject consumption = HuiLianTongUnionCardService.consumption(orderNo, cardNo, payRealPrice, "HiSen_phg_goods", "11101667", "", "250122151032399686订单扣款");
if (!consumption.getString("respCode").equals("0000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage"));
}
// 响应参数
JSONObject consumptionResult = HuiLianTongUnionCardService.resolveResponse(consumption.getString("data"));
if (consumptionResult.getBoolean("success") != true) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message"));
}
return ResponseMsgUtil.success(consumptionResult);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryOrderDetailByJd",method = RequestMethod.GET)
@ -258,24 +155,7 @@ public class TestController {
}
}
@RequestMapping(value="/checkSkuSale",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "京东商品价格更新")
public ResponseData checkSkuSale() {
try {
List<GoodsMsg> list = goodsMsgService.getJdList();
for (GoodsMsg goods : list) {
jdService.checkSkuSale(goods);
}
return ResponseMsgUtil.success("");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryDeliveryInfoByjd",method = RequestMethod.GET)
@ResponseBody
@ -310,26 +190,7 @@ public class TestController {
}
}
@RequestMapping(value="/sign",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "sign")
public ResponseData sign(@RequestParam(value = "phone" , required = true) String phone,
@RequestParam(value = "appid" , required = true) String appid,
@RequestParam(value = "appSecret" , required = true) String appSecret) {
try {
Map<String , Object> map = new HashMap<>();
map.put("appid" , appid);
map.put("phone" , phone);
String sign = SignatureUtil.createSign(map , appSecret);
return ResponseMsgUtil.success(sign);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/automaticData",method = RequestMethod.GET)
@ -412,38 +273,6 @@ 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)
@ResponseBody
@ApiOperation(value = "确认订单")
public ResponseData confirmOrder() {
try {
JdPostService.confirmOrder(jdService.getToken() , 304301646288L, "945024316" , "确认订单");
return ResponseMsgUtil.success("");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryHltBalance",method = RequestMethod.GET)
@ResponseBody
@ -463,103 +292,12 @@ public class TestController {
}
}
@RequestMapping(value="/refundPk",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "退回优惠券包")
public ResponseData refundPk(
@RequestParam(value = "discountPkStockCode", required = false) String discountPkStockCode) {
try {
Map<String , Object> map = new HashMap<>();
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 = "discountPkStockCode", required = false) String discountPkStockCode) {
try {
Map<String , Object> map = new HashMap<>();
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);
}
}
@RequestMapping(value="/resolveResponse",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "resolveResponse")
public ResponseData resolveResponse(@RequestParam(value = "data", required = false) String data) {
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);
}
}
@RequestMapping(value="/getOrderCancelProcessDetail",method = RequestMethod.GET)
@ -575,18 +313,8 @@ 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);
}
}
}

@ -1,6 +1,7 @@
package com.bweb.controller.goods;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode;
@ -163,6 +164,42 @@ public class GoodsController {
}
@RequestMapping(value="/jdPriceUpdate",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "京东价格修改")
public ResponseData jdPriceUpdate(@RequestBody JSONObject body, HttpServletRequest request) {
try {
if (body == null
|| body.getInteger("automaticPrice") == null
|| body.getBigDecimal("salePrice") == null
|| StringUtils.isBlank(body.getString("thirdId"))
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
// 查询规格
GoodsSpecs specs = goodsSpecsService.queryDetailByThirdId(body.getString("thirdId"));
if (specs == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.CONTENT_NOT_FOUND);
}
specs.setAutomaticPrice(body.getInteger("automaticPrice"));
specs.setSalePrice(body.getBigDecimal("salePrice"));
goodsSpecsService.update(specs);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/editGoodsSpecs",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "编辑商品规格")

@ -198,19 +198,4 @@ public class OrderGoodsSchedule {
}
}
//每55分钟执行一次
@Scheduled(cron = "0 0/55 * * * ?")
public void orderGoodsJd() {
try {
List<BsOrderGoods> orderGoodsList = orderGoodsService.getListByJd();
for (BsOrderGoods goods : orderGoodsList) {
jdService.updateDeliveryInfo(goods);
}
} catch (Exception e) {
log.error("HighUserController --> orderGoodsJd() error!", e);
}
}
}

@ -112,7 +112,7 @@ public interface GoodsMsgMapperExt {
@Update({
"update goods_msg set automatic_code = null where automatic_code is not null",
"update goods_msg set automatic_code = null where automatic_code is not null and third_id is not null ",
})
void updateAutomatic();
}

@ -534,27 +534,33 @@ public class JdServiceImpl implements JdService {
// 查询规格
GoodsSpecs specs = goodsSpecsService.queryDetailByThirdId(goodsMsg.getThirdId());
// 根据skuId 查询商品详情
// 根据skuId 查询商品售价
OpenRpcResult priceResponse = JdPostService.getSellPrice(getToken(), String.valueOf(goodsMsg.getThirdId())).getOpenRpcResult();
if (priceResponse.getResultCode().equals("0000") && priceResponse.getSuccess() ) {
GetSellPriceGoodsResp price = priceResponse.getResult().get(0);
// 设置涨价
BigDecimal profitPrice = price.getSalePrice().multiply(productConfig.getDiscount().divide(new BigDecimal(100) , 2, RoundingMode.HALF_UP));
// 设置销售价格
specs.setSalePrice(profitPrice.add(price.getSalePrice()));
// 设置原价
specs.setOriginalPrice(price.getMarketPrice());
specs.setThirdPrice(price.getJdPrice());
specs.setName(goodsMsg.getTitle());
specs.setExt3(price.getSalePrice().toString());
} else {
specs.setStatus(0);
specs.setUpdateTime(new Date());
if (specs != null) {
if (specs.getAutomaticPrice() == 1) {
// 根据skuId 查询商品详情
// 根据skuId 查询商品售价
OpenRpcResult priceResponse = JdPostService.getSellPrice(getToken(), String.valueOf(goodsMsg.getThirdId())).getOpenRpcResult();
if (priceResponse.getResultCode().equals("0000") && priceResponse.getSuccess() ) {
GetSellPriceGoodsResp price = priceResponse.getResult().get(0);
// 设置涨价
BigDecimal profitPrice = price.getSalePrice().multiply(productConfig.getDiscount().divide(new BigDecimal(100) , 2, RoundingMode.HALF_UP));
// 设置销售价格
specs.setSalePrice(profitPrice.add(price.getSalePrice()));
// 设置原价
specs.setOriginalPrice(price.getMarketPrice());
specs.setThirdPrice(price.getJdPrice());
specs.setName(goodsMsg.getTitle());
specs.setExt3(price.getSalePrice().toString());
} else {
specs.setStatus(0);
specs.setUpdateTime(new Date());
}
// 设置展示图片
goodsSpecsService.update(specs);
}
}
// 设置展示图片
goodsSpecsService.update(specs);
}
@Override
@ -730,26 +736,26 @@ public class JdServiceImpl implements JdService {
// 查看订单是否已确认
// 订单状态为567为待揽收
if (stateOrderOpenResp.getConfirmState() == 1 || stateOrderOpenResp.getConfirmState() == 5 || stateOrderOpenResp.getConfirmState() == 6 || stateOrderOpenResp.getConfirmState() == 7) {
if (stateOrderOpenResp.getJdOrderState() == 1 || stateOrderOpenResp.getJdOrderState() == 5 || stateOrderOpenResp.getJdOrderState() == 6 || stateOrderOpenResp.getJdOrderState() == 7) {
jsonObject.put("logisticsStatus", "WAIT_ACCEPT");
jsonObject.put("logisticsStatusDesc", "待揽收");
}
// 订单状态为8,9,10为待发货
if (stateOrderOpenResp.getConfirmState() == 8 || stateOrderOpenResp.getConfirmState() == 9 || stateOrderOpenResp.getConfirmState() == 10) {
// 订单状态为8,9,10为
if (stateOrderOpenResp.getJdOrderState() == 8 || stateOrderOpenResp.getJdOrderState() == 9 || stateOrderOpenResp.getJdOrderState() == 10) {
jsonObject.put("logisticsStatus", "ACCEPT");
jsonObject.put("logisticsStatusDesc", "已揽件");
}
// 订单状态为11,12,13,14为运输中
if (stateOrderOpenResp.getConfirmState() == 11 || stateOrderOpenResp.getConfirmState() == 12 || stateOrderOpenResp.getConfirmState() == 13 || stateOrderOpenResp.getConfirmState() == 14) {
if (stateOrderOpenResp.getJdOrderState() == 11 || stateOrderOpenResp.getJdOrderState() == 12 || stateOrderOpenResp.getJdOrderState() == 13 || stateOrderOpenResp.getJdOrderState() == 14) {
jsonObject.put("logisticsStatus", "TRANSPORT");
jsonObject.put("logisticsStatusDesc", "运输中");
}
// 订单状态为16为派件中
if (stateOrderOpenResp.getConfirmState() == 16) {
if (stateOrderOpenResp.getJdOrderState() == 16) {
jsonObject.put("logisticsStatus", "DELIVERING");
jsonObject.put("logisticsStatusDesc", "派件中");
}
if (stateOrderOpenResp.getConfirmState() == 19) {
if (stateOrderOpenResp.getJdOrderState() == 19) {
jsonObject.put("logisticsStatus", "SIGN");
jsonObject.put("logisticsStatusDesc", "已签收");
}

@ -206,7 +206,7 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
public List<BsOrderGoods> getListByJd() {
BsOrderGoodsExample example = new BsOrderGoodsExample();
BsOrderGoodsExample.Criteria criteria = example.createCriteria();
criteria.andStatusEqualTo(2).andThirdOrderNoIsNotNull().andLogisticsNoIsNull();
criteria.andStatusEqualTo(2).andThirdOrderNoIsNotNull();
return bsOrderGoodsMapper.selectByExample(example);
}

Loading…
Cancel
Save