szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop

This commit is contained in:
Owen 2025-03-03 15:51:15 +08:00
parent 365798d145 46d23820cf
commit 7c6a016ff7
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/ordersource/vo/OrderSourceSaveReqVO.java
View File

@ -19,5 +19,8 @@ public class OrderSourceSaveReqVO {
@Schema(description = "渠道ID", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "渠道ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "渠道ID不能为空") @NotNull(message = "渠道ID不能为空")
private Long channel; private Long channel;
@Schema(description = "店铺ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "店铺ID不能为空")
private Long shopId;
} }

32
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
View File

@ -381,7 +381,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
ordersSaveReqVO.setSellerMemo("《已抓单》"); ordersSaveReqVO.setSellerMemo("《已抓单》");
ordersService.createOrders(ordersSaveReqVO); ordersService.createOrders(ordersSaveReqVO);
OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam(); OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam();
param.setOrderId(ordersDO.getUpstreamOrderId()); param.setOrderId(ordersDO.getRealSourceId());
param.setRemark("《已抓单》"); param.setRemark("《已抓单》");
addOrderRemark(param); addOrderRemark(param);
} }
@ -581,7 +581,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
ordersSaveReqVO.setSellerMemo("《已抓单》"); ordersSaveReqVO.setSellerMemo("《已抓单》");
ordersService.createOrders(ordersSaveReqVO); ordersService.createOrders(ordersSaveReqVO);
OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam(); OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam();
param.setOrderId(ordersDO.getUpstreamOrderId()); param.setOrderId(ordersDO.getRealSourceId());
param.setRemark("《已抓单》"); param.setRemark("《已抓单》");
addOrderRemark(param); addOrderRemark(param);
} }
@ -759,24 +759,28 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
* 给订单返回备注 * 给订单返回备注
*/ */
public void addOrderRemark(OrderAddOrderRemarkParam param){ public void addOrderRemark(OrderAddOrderRemarkParam param){
OrderAddOrderRemarkRequest request = new OrderAddOrderRemarkRequest(); try {
OrderAddOrderRemarkRequest request = new OrderAddOrderRemarkRequest();
// OrderAddOrderRemarkParam param = request.getParam(); // OrderAddOrderRemarkParam param = request.getParam();
// param.setOrderId("6496679971677798670"); // param.setOrderId("6496679971677798670");
// param.setRemark("这是具体的备注内容"); // param.setRemark("这是具体的备注内容");
// param.setIsAddStar("true"); // param.setIsAddStar("true");
// param.setStar("2"); // param.setStar("2");
request.setParam(param); request.setParam(param);
GlobalConfig.initAppKey(SYNC_APP_KEY); GlobalConfig.initAppKey(SYNC_APP_KEY);
GlobalConfig.initAppSecret(SYNC_APP_SECRET); GlobalConfig.initAppSecret(SYNC_APP_SECRET);
//入参为code //入参为code
AccessToken accessToken= AccessTokenBuilder.build(SYNC_SHOP_ID); AccessToken accessToken= AccessTokenBuilder.build(SYNC_SHOP_ID);
OrderAddOrderRemarkResponse response = request.execute(accessToken); OrderAddOrderRemarkResponse response = request.execute(accessToken);
if("10000".equals(response.getCode())){ if("10000".equals(response.getCode())){
// 加入备注成功 // 加入备注成功
log.error("加入备注成功,{}",response.getMsg()); log.error("加入备注成功,{}",response.getMsg());
}else { }else {
// 加入备注失败 // 加入备注失败
log.error("加入备注失败,{}",response.getMsg()); log.error("加入备注失败,{}",response.getMsg());
}
} catch (Exception e) {
log.error("执行加入备注失败,{}",e.getMessage());
} }
} }

2
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orders/OrdersServiceImpl.java
View File

@ -370,7 +370,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, OrdersDO> imple
String sellerMemo1 = updateObj.getSellerMemo(); String sellerMemo1 = updateObj.getSellerMemo();
if(StringUtils.isNotBlank(sellerMemo) && StringUtils.isNotBlank(sellerMemo1) && !sellerMemo.equals(sellerMemo1)){ if(StringUtils.isNotBlank(sellerMemo) && StringUtils.isNotBlank(sellerMemo1) && !sellerMemo.equals(sellerMemo1)){
OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam(); OrderAddOrderRemarkParam param = new OrderAddOrderRemarkParam();
param.setOrderId(oldOrderDo.getUpstreamOrderId()); param.setOrderId(oldOrderDo.getRealSourceId());
param.setRemark(sellerMemo1); param.setRemark(sellerMemo1);
Long flag = updateObj.getFlag(); Long flag = updateObj.getFlag();
if(null != flag){ if(null != flag){