diff --git a/open-api/dou-api/libs/doudian-sdk-java-1.1.0-20240311114923.jar b/open-api/dou-api/libs/doudian-sdk-java-1.1.0-20240311114923.jar new file mode 100644 index 00000000..5cd54848 Binary files /dev/null and b/open-api/dou-api/libs/doudian-sdk-java-1.1.0-20240311114923.jar differ diff --git a/open-api/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java b/open-api/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java index f51cc94f..9a365ac9 100644 --- a/open-api/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java +++ b/open-api/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java @@ -40,12 +40,12 @@ public class HomeController { param.setTrackingNo("435435"); param.setPresellType(1L); param.setOrderType(1L); - param.setCreateTimeStart(1617355413L); - param.setCreateTimeEnd(1617355413L); +// param.setCreateTimeStart(1617355413L); +// param.setCreateTimeEnd(1617355413L); param.setAbnormalOrder(1L); param.setTradeType(1L); - param.setUpdateTimeStart(1617355413L); - param.setUpdateTimeEnd(1617355413L); + param.setUpdateTimeStart(1709222400L); + param.setUpdateTimeEnd(System.currentTimeMillis()/1000); param.setSize(20L); param.setPage(0L); param.setOrderBy("create_time"); diff --git a/open-api/wei-api/libs/wei-api-1.6.3.jar b/open-api/wei-api/libs/wei-api-1.6.3.jar new file mode 100644 index 00000000..315fd0f0 Binary files /dev/null and b/open-api/wei-api/libs/wei-api-1.6.3.jar differ diff --git a/open-api/wei-api/pom.xml b/open-api/wei-api/pom.xml index 57d800dc..722f1fbb 100644 --- a/open-api/wei-api/pom.xml +++ b/open-api/wei-api/pom.xml @@ -76,6 +76,13 @@ + + wei-api + wei-api + 1.6.3 + system + ${project.basedir}/libs/wei-api-1.6.3.jar + diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/controller/eWayBillController.java b/open-api/wei-api/src/main/java/com/qihang/wei/controller/eWayBillController.java new file mode 100644 index 00000000..effa3b20 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/controller/eWayBillController.java @@ -0,0 +1,58 @@ +package com.qihang.wei.controller; + +import cn.qihangerp.open.wei.EwaybillApiHelper; +import cn.qihangerp.open.wei.common.ApiResultVo; +import cn.qihangerp.open.wei.vo.ewaybill.DeliveryVo; +import com.alibaba.fastjson2.JSONObject; +import com.qihang.common.common.AjaxResult; +import com.qihang.common.common.ResultVoEnum; +import com.qihang.common.enums.HttpStatus; +import com.qihang.wei.domain.WeiGoods; +import com.qihang.wei.domain.WeiGoodsSku; +import com.qihang.wei.openApi.ApiCommon; +import com.qihang.wei.openApi.PullRequest; +import com.qihang.wei.openApi.bo.GoodsDetailApiBo; +import com.qihang.wei.openApi.bo.GoodsListApiBo; +import com.qihang.wei.openApi.service.GoodsApiService; +import com.qihang.wei.openApi.vo.GoodsDetailVo; +import com.qihang.wei.openApi.vo.GoodsListVo; +import com.qihang.wei.utils.RemoteUtil; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RequestMapping("/ewaybill") +@RestController +@AllArgsConstructor +public class eWayBillController { + private final ApiCommon apiCommon; + @RequestMapping(value = "/get_deliver_list", method = RequestMethod.POST) + public AjaxResult getDeliverList(@RequestBody PullRequest params) throws Exception { + if (params.getShopId() == null || params.getShopId() <= 0) { +// return ApiResul new ApiResult(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); + } + Date currDateTime = new Date(); + long startTime = System.currentTimeMillis(); + var checkResult = apiCommon.checkBefore(params.getShopId()); + if (checkResult.getCode() != ResultVoEnum.SUCCESS.getIndex()) { + return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData()); + } + String accessToken = checkResult.getData().getAccessToken(); + String serverUrl = checkResult.getData().getServerUrl(); + String appKey = checkResult.getData().getAppKey(); + String appSecret = checkResult.getData().getAppSecret(); + + ApiResultVo apiResultVo = EwaybillApiHelper.pullDeliveryList(appKey, appSecret, accessToken); + + + return AjaxResult.success(apiResultVo.getList()); + } +} diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java deleted file mode 100644 index 84446dfb..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.qihang.wei.domain; - -import java.io.Serializable; -import java.math.BigDecimal; -import lombok.Data; - -/** - * 商品规格库存管理 - * @TableName o_goods_sku - */ -@Data -public class OGoodsSku implements Serializable { - /** - * 主键id - */ - private Long id; - - /** - * 商品id - */ - private Long erpGoodsId; - - /** - * skuId(唯一) - */ - private Long erpSkuId; - - /** - * 规格名 - */ - private String skuName; - - /** - * 规格编码 - */ - private String skuNum; - - /** - * 颜色id - */ - private Integer colorId; - - /** - * 颜色值 - */ - private String colorValue; - - /** - * 颜色图片 - */ - private String colorImage; - - /** - * 尺码id - */ - private Integer sizeId; - - /** - * 尺码值 - */ - private String sizeValue; - - /** - * 款式id - */ - private Integer styleId; - - /** - * 款式值 - */ - private String styleValue; - - /** - * 库存条形码 - */ - private String barCode; - - /** - * 预计采购价 - */ - private BigDecimal purPrice; - - /** - * 建议批发价 - */ - private BigDecimal wholePrice; - - /** - * 建议零售价 - */ - private BigDecimal retailPrice; - - /** - * 单位成本 - */ - private BigDecimal unitCost; - - /** - * 备注 - */ - private String remark; - - /** - * 状态 - */ - private Integer status; - - /** - * 最低库存（预警） - */ - private Integer lowQty; - - /** - * 最高库存（预警） - */ - private Integer highQty; - - /** - * 0启用 1禁用 - */ - private Integer disable; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/domain/SShop.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SShop.java new file mode 100644 index 00000000..45441b90 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SShop.java @@ -0,0 +1,123 @@ +package com.qihang.wei.domain; + +import java.io.Serializable; +import lombok.Data; + +/** + * 数据中心-店铺 + * @TableName s_shop + */ +@Data +public class SShop implements Serializable { + /** + * 主键 + */ + private Integer id; + + /** + * 店铺名 + */ + private String name; + + /** + * 店铺别名 + */ + private String nickname; + + /** + * 标识 + */ + private String ename; + + /** + * 店铺主题 + */ + private String company; + + /** + * 对应第三方平台Id + */ + private Integer type; + + /** + * 店铺url + */ + private String url; + + /** + * 排序 + */ + private Integer ordernum; + + /** + * 是否删除0否1是 + */ + private Integer isdelete; + + /** + * 是否显示(0：是1否） + */ + private Integer isshow; + + /** + * 更新时间 + */ + private Long modifyOn; + + /** + * 描述 + */ + private String remark; + + /** + * 第三方平台店铺id，淘宝天猫开放平台使用 + */ + private Long selleruserid; + + /** + * 卖家userId + */ + private String selleruseridstr; + + /** + * 第三方平台sessionKey（access_token） + */ + private String sessionkey; + + /** + * Appkey + */ + private String appkey; + + /** + * Appsercet + */ + private String appsercet; + + /** + * 到期 + */ + private Long expiresIn; + + /** + * access_token开始时间 + */ + private Long accessTokenBegin; + + /** + * 刷新token + */ + private String refreshToken; + + /** + * 刷新token过期时间 + */ + private Long refreshTokenTimeout; + + /** + * 请求url + */ + private String apiRequestUrl; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/domain/SShopSetting.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SShopSetting.java new file mode 100644 index 00000000..bf2019d8 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SShopSetting.java @@ -0,0 +1,78 @@ +package com.qihang.wei.domain; + +import java.io.Serializable; +import lombok.Data; + +/** + * 第三方平台设置 + * @TableName s_shop_setting + */ +@Data +public class SShopSetting implements Serializable { + /** + * 主键 + */ + private Integer id; + + /** + * 配置名 + */ + private String name; + + /** + * appKey + */ + private String appKey; + + /** + * appSecret + */ + private String appSecret; + + /** + * 阿里access token + */ + private String accessToken; + + /** + * 到期 + */ + private Long expiresIn; + + /** + * access_token开始时间 + */ + private Long accessTokenBegin; + + /** + * 刷新token + */ + private String refreshToken; + + /** + * 刷新token过期时间 + */ + private Long refreshTokenTimeout; + + /** + * 更新时间 + */ + private Long modifyOn; + + /** + * 描述 + */ + private String remark; + + /** + * 请求url + */ + private String requestUrl; + + /** + * 第三方店铺id + */ + private String thirdId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java deleted file mode 100644 index 9640dd7b..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.qihang.wei.domain; - -import java.io.Serializable; -import lombok.Data; - -/** - * - * @TableName sys_platform - */ -@Data -public class SysPlatform implements Serializable { - /** - * - */ - private Integer id; - - /** - * 平台名 - */ - private String name; - - /** - * 平台编码 - */ - private String code; - - /** - * - */ - private String appKey; - - /** - * - */ - private String appSecret; - - /** - * 平台回调uri - */ - private String redirectUri; - - /** - * 接口访问地址 - */ - private String serverUrl; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysShop.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysShop.java deleted file mode 100644 index 38077ad2..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysShop.java +++ /dev/null @@ -1,417 +0,0 @@ -package com.qihang.wei.domain; - -import java.io.Serializable; - -/** - * 数据中心-店铺 - * @TableName sys_shop - */ -public class SysShop implements Serializable { - /** - * 主键 - */ - private Integer id; - - /** - * 店铺名 - */ - private String name; - - /** - * 对应第三方平台Id - */ - private Integer type; - - /** - * 店铺url - */ - private String url; - - /** - * 排序 - */ - private Integer sort; - - /** - * 状态（1正常2已删除） - */ - private Integer status; - - /** - * 更新时间 - */ - private Long modifyOn; - - /** - * 描述 - */ - private String remark; - - /** - * 第三方平台店铺id，淘宝天猫开放平台使用 - */ - private Long sellerId; - - /** - * Appkey - */ - private String appKey; - - /** - * Appsercet - */ - private String appSercet; - - /** - * 第三方平台sessionKey（access_token） - */ - private String accessToken; - - /** - * 到期 - */ - private Long expiresIn; - - /** - * access_token开始时间 - */ - private Long accessTokenBegin; - - /** - * 刷新token - */ - private String refreshToken; - - /** - * 刷新token过期时间 - */ - private Long refreshTokenTimeout; - - /** - * 请求url - */ - private String apiRequestUrl; - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - public Integer getId() { - return id; - } - - /** - * 主键 - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 店铺名 - */ - public String getName() { - return name; - } - - /** - * 店铺名 - */ - public void setName(String name) { - this.name = name; - } - - /** - * 对应第三方平台Id - */ - public Integer getType() { - return type; - } - - /** - * 对应第三方平台Id - */ - public void setType(Integer type) { - this.type = type; - } - - /** - * 店铺url - */ - public String getUrl() { - return url; - } - - /** - * 店铺url - */ - public void setUrl(String url) { - this.url = url; - } - - /** - * 排序 - */ - public Integer getSort() { - return sort; - } - - /** - * 排序 - */ - public void setSort(Integer sort) { - this.sort = sort; - } - - /** - * 状态（1正常2已删除） - */ - public Integer getStatus() { - return status; - } - - /** - * 状态（1正常2已删除） - */ - public void setStatus(Integer status) { - this.status = status; - } - - /** - * 更新时间 - */ - public Long getModifyOn() { - return modifyOn; - } - - /** - * 更新时间 - */ - public void setModifyOn(Long modifyOn) { - this.modifyOn = modifyOn; - } - - /** - * 描述 - */ - public String getRemark() { - return remark; - } - - /** - * 描述 - */ - public void setRemark(String remark) { - this.remark = remark; - } - - /** - * 第三方平台店铺id，淘宝天猫开放平台使用 - */ - public Long getSellerId() { - return sellerId; - } - - /** - * 第三方平台店铺id，淘宝天猫开放平台使用 - */ - public void setSellerId(Long sellerId) { - this.sellerId = sellerId; - } - - /** - * Appkey - */ - public String getAppKey() { - return appKey; - } - - /** - * Appkey - */ - public void setAppKey(String appKey) { - this.appKey = appKey; - } - - /** - * Appsercet - */ - public String getAppSercet() { - return appSercet; - } - - /** - * Appsercet - */ - public void setAppSercet(String appSercet) { - this.appSercet = appSercet; - } - - /** - * 第三方平台sessionKey（access_token） - */ - public String getAccessToken() { - return accessToken; - } - - /** - * 第三方平台sessionKey（access_token） - */ - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - - /** - * 到期 - */ - public Long getExpiresIn() { - return expiresIn; - } - - /** - * 到期 - */ - public void setExpiresIn(Long expiresIn) { - this.expiresIn = expiresIn; - } - - /** - * access_token开始时间 - */ - public Long getAccessTokenBegin() { - return accessTokenBegin; - } - - /** - * access_token开始时间 - */ - public void setAccessTokenBegin(Long accessTokenBegin) { - this.accessTokenBegin = accessTokenBegin; - } - - /** - * 刷新token - */ - public String getRefreshToken() { - return refreshToken; - } - - /** - * 刷新token - */ - public void setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - } - - /** - * 刷新token过期时间 - */ - public Long getRefreshTokenTimeout() { - return refreshTokenTimeout; - } - - /** - * 刷新token过期时间 - */ - public void setRefreshTokenTimeout(Long refreshTokenTimeout) { - this.refreshTokenTimeout = refreshTokenTimeout; - } - - /** - * 请求url - */ - public String getApiRequestUrl() { - return apiRequestUrl; - } - - /** - * 请求url - */ - public void setApiRequestUrl(String apiRequestUrl) { - this.apiRequestUrl = apiRequestUrl; - } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - SysShop other = (SysShop) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) - && (this.getUrl() == null ? other.getUrl() == null : this.getUrl().equals(other.getUrl())) - && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getModifyOn() == null ? other.getModifyOn() == null : this.getModifyOn().equals(other.getModifyOn())) - && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) - && (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId())) - && (this.getAppKey() == null ? other.getAppKey() == null : this.getAppKey().equals(other.getAppKey())) - && (this.getAppSercet() == null ? other.getAppSercet() == null : this.getAppSercet().equals(other.getAppSercet())) - && (this.getAccessToken() == null ? other.getAccessToken() == null : this.getAccessToken().equals(other.getAccessToken())) - && (this.getExpiresIn() == null ? other.getExpiresIn() == null : this.getExpiresIn().equals(other.getExpiresIn())) - && (this.getAccessTokenBegin() == null ? other.getAccessTokenBegin() == null : this.getAccessTokenBegin().equals(other.getAccessTokenBegin())) - && (this.getRefreshToken() == null ? other.getRefreshToken() == null : this.getRefreshToken().equals(other.getRefreshToken())) - && (this.getRefreshTokenTimeout() == null ? other.getRefreshTokenTimeout() == null : this.getRefreshTokenTimeout().equals(other.getRefreshTokenTimeout())) - && (this.getApiRequestUrl() == null ? other.getApiRequestUrl() == null : this.getApiRequestUrl().equals(other.getApiRequestUrl())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); - result = prime * result + ((getUrl() == null) ? 0 : getUrl().hashCode()); - result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getModifyOn() == null) ? 0 : getModifyOn().hashCode()); - result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); - result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode()); - result = prime * result + ((getAppKey() == null) ? 0 : getAppKey().hashCode()); - result = prime * result + ((getAppSercet() == null) ? 0 : getAppSercet().hashCode()); - result = prime * result + ((getAccessToken() == null) ? 0 : getAccessToken().hashCode()); - result = prime * result + ((getExpiresIn() == null) ? 0 : getExpiresIn().hashCode()); - result = prime * result + ((getAccessTokenBegin() == null) ? 0 : getAccessTokenBegin().hashCode()); - result = prime * result + ((getRefreshToken() == null) ? 0 : getRefreshToken().hashCode()); - result = prime * result + ((getRefreshTokenTimeout() == null) ? 0 : getRefreshTokenTimeout().hashCode()); - result = prime * result + ((getApiRequestUrl() == null) ? 0 : getApiRequestUrl().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", name=").append(name); - sb.append(", type=").append(type); - sb.append(", url=").append(url); - sb.append(", sort=").append(sort); - sb.append(", status=").append(status); - sb.append(", modifyOn=").append(modifyOn); - sb.append(", remark=").append(remark); - sb.append(", sellerId=").append(sellerId); - sb.append(", appKey=").append(appKey); - sb.append(", appSercet=").append(appSercet); - sb.append(", accessToken=").append(accessToken); - sb.append(", expiresIn=").append(expiresIn); - sb.append(", accessTokenBegin=").append(accessTokenBegin); - sb.append(", refreshToken=").append(refreshToken); - sb.append(", refreshTokenTimeout=").append(refreshTokenTimeout); - sb.append(", apiRequestUrl=").append(apiRequestUrl); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java deleted file mode 100644 index 46d942cc..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.qihang.wei.mapper; - -import com.qihang.wei.domain.OGoodsSku; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Mapper -* @createDate 2024-03-29 11:41:24 -* @Entity com.qihang.wei.domain.OGoodsSku -*/ -public interface OGoodsSkuMapper extends BaseMapper { - -} - - - - diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SShopMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SShopMapper.java new file mode 100644 index 00000000..a46f26c7 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SShopMapper.java @@ -0,0 +1,18 @@ +package com.qihang.wei.mapper; + +import com.qihang.wei.domain.SShop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【s_shop(数据中心-店铺)】的数据库操作Mapper +* @createDate 2024-06-03 14:14:56 +* @Entity com.qihang.wei.domain.SShop +*/ +public interface SShopMapper extends BaseMapper { + +} + + + + diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SShopSettingMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SShopSettingMapper.java new file mode 100644 index 00000000..7d3625f1 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SShopSettingMapper.java @@ -0,0 +1,18 @@ +package com.qihang.wei.mapper; + +import com.qihang.wei.domain.SShopSetting; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【s_shop_setting(第三方平台设置)】的数据库操作Mapper +* @createDate 2024-06-03 14:14:56 +* @Entity com.qihang.wei.domain.SShopSetting +*/ +public interface SShopSettingMapper extends BaseMapper { + +} + + + + diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java deleted file mode 100644 index 68a6153f..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.qihang.wei.mapper; - -import com.qihang.wei.domain.SysPlatform; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author qilip -* @description 针对表【sys_platform】的数据库操作Mapper -* @createDate 2024-03-24 18:04:27 -* @Entity com.qihang.wei.domain.SysPlatform -*/ -public interface SysPlatformMapper extends BaseMapper { - -} - - - - diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java deleted file mode 100644 index 85a426d1..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.qihang.wei.mapper; - -import com.qihang.wei.domain.SysShop; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author TW -* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Mapper -* @createDate 2024-03-20 13:33:19 -* @Entity com.qihang.wei.domain.SysShop -*/ -public interface SysShopMapper extends BaseMapper { - -} - - - - diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java index b95b991a..40f4b8fc 100644 --- a/open-api/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java +++ b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java @@ -9,8 +9,8 @@ import com.qihang.wei.openApi.service.ShopInfoApiService; import com.qihang.wei.openApi.service.TokenApiService; import com.qihang.wei.openApi.vo.ShopApiResultVo; import com.qihang.wei.openApi.vo.Token; -import com.qihang.wei.service.SysPlatformService; -import com.qihang.wei.service.SysShopService; +import com.qihang.wei.service.SShopService; +import com.qihang.wei.service.SShopSettingService; import com.qihang.wei.utils.RemoteUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -19,8 +19,8 @@ import org.springframework.util.StringUtils; @AllArgsConstructor @Component public class ApiCommon { - private final SysShopService shopService; - private final SysPlatformService platformService; + private final SShopService shopService; + private final SShopSettingService platformService; /** * 更新前的检查 * @@ -34,27 +34,27 @@ public class ApiCommon { return ResultVo.error(HttpStatus.PARAMS_ERROR,"参数错误，没有找到店铺"); } if (shop.getType() != EnumShopType.WEI.getIndex()) { - return ResultVo.error(HttpStatus.PARAMS_ERROR, "参数错误，店铺不是JD店铺"); + return ResultVo.error(HttpStatus.PARAMS_ERROR, "参数错误，店铺不是视频号店铺"); } - if(!StringUtils.hasText(shop.getAppKey())) { + if(!StringUtils.hasText(shop.getAppkey())) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "平台配置错误，没有找到AppKey"); } - if(!StringUtils.hasText(shop.getAppSercet())) { + if(!StringUtils.hasText(shop.getAppsercet())) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到AppSercet"); } var platform =platformService.getById(EnumShopType.WEI.getIndex()); - if(!StringUtils.hasText(platform.getServerUrl())) { + if(!StringUtils.hasText(platform.getRequestUrl())) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "第三方平台配置错误，没有找到ServerUrl"); } ShopApiParams params = new ShopApiParams(); - params.setAppKey(shop.getAppKey()); - params.setAppSecret(shop.getAppSercet()); - params.setAccessToken(shop.getAccessToken()); + params.setAppKey(shop.getAppkey()); + params.setAppSecret(shop.getAppsercet()); + params.setAccessToken(shop.getSessionkey()); params.setApiRequestUrl(shop.getApiRequestUrl()); - params.setServerUrl(platform.getServerUrl()); - params.setSellerId(shop.getSellerId().toString()); - if (!StringUtils.hasText(shop.getAccessToken())) { + params.setServerUrl(platform.getRequestUrl()); + params.setSellerId(shop.getSelleruserid().toString()); + if (!StringUtils.hasText(shop.getSessionkey())) { // String s = "/token?grant_type=client_credential&appid="+params.getAppKey()+"&secret="+params.getAppSecret(); TokenApiService remoting = RemoteUtil.Remoting(params.getServerUrl(), TokenApiService.class); Token token = remoting.getToken("client_credential",params.getAppKey(),params.getAppSecret()); diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java deleted file mode 100644 index cdf7a73c..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.qihang.wei.service; - -import com.qihang.wei.domain.OGoodsSku; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Service -* @createDate 2024-03-29 11:41:24 -*/ -public interface OGoodsSkuService extends IService { - -} diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/SShopService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SShopService.java new file mode 100644 index 00000000..196246a1 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/service/SShopService.java @@ -0,0 +1,15 @@ +package com.qihang.wei.service; + +import com.qihang.wei.domain.SShop; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author TW +* @description 针对表【s_shop(数据中心-店铺)】的数据库操作Service +* @createDate 2024-06-03 14:14:56 +*/ +public interface SShopService extends IService { + SShop selectShopById(Integer shopId); + + void updateSessionKey(Integer shopId,String sessionKey); +} diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/SShopSettingService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SShopSettingService.java new file mode 100644 index 00000000..d9bdae09 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/service/SShopSettingService.java @@ -0,0 +1,13 @@ +package com.qihang.wei.service; + +import com.qihang.wei.domain.SShopSetting; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author TW +* @description 针对表【s_shop_setting(第三方平台设置)】的数据库操作Service +* @createDate 2024-06-03 14:14:56 +*/ +public interface SShopSettingService extends IService { + +} diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java deleted file mode 100644 index bc329174..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.qihang.wei.service; - -import com.qihang.wei.domain.SysPlatform; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author qilip -* @description 针对表【sys_platform】的数据库操作Service -* @createDate 2024-03-24 18:04:27 -*/ -public interface SysPlatformService extends IService { - -} diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/SysShopService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SysShopService.java deleted file mode 100644 index c3ad968e..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/SysShopService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.qihang.wei.service; - -import com.qihang.wei.domain.SysShop; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author TW -* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service -* @createDate 2024-03-20 13:33:19 -*/ -public interface SysShopService extends IService { - SysShop selectShopById(Integer shopId); - - void updateSessionKey(Integer shopId,String sessionKey); -} diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java deleted file mode 100644 index 95caaf37..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.qihang.wei.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.wei.domain.OGoodsSku; -import com.qihang.wei.service.OGoodsSkuService; -import com.qihang.wei.mapper.OGoodsSkuMapper; -import org.springframework.stereotype.Service; - -/** -* @author TW -* @description 针对表【o_goods_sku(商品规格库存管理)】的数据库操作Service实现 -* @createDate 2024-03-29 11:41:24 -*/ -@Service -public class OGoodsSkuServiceImpl extends ServiceImpl - implements OGoodsSkuService{ - -} - - - - diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SShopServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SShopServiceImpl.java new file mode 100644 index 00000000..1d060510 --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SShopServiceImpl.java @@ -0,0 +1,36 @@ +package com.qihang.wei.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.wei.domain.SShop; +import com.qihang.wei.service.SShopService; +import com.qihang.wei.mapper.SShopMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author TW +* @description 针对表【s_shop(数据中心-店铺)】的数据库操作Service实现 +* @createDate 2024-06-03 14:14:56 +*/ +@AllArgsConstructor +@Service +public class SShopServiceImpl extends ServiceImpl + implements SShopService{ + private final SShopMapper mapper; + @Override + public SShop selectShopById(Integer shopId) { + return mapper.selectById(shopId); + } + + @Override + public void updateSessionKey(Integer shopId, String sessionKey) { + SShop shop = new SShop(); + shop.setId(shopId); + shop.setSessionkey(sessionKey); + mapper.updateById(shop); + } +} + + + + diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SShopSettingServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SShopSettingServiceImpl.java new file mode 100644 index 00000000..332b992b --- /dev/null +++ b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SShopSettingServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.wei.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.wei.domain.SShopSetting; +import com.qihang.wei.service.SShopSettingService; +import com.qihang.wei.mapper.SShopSettingMapper; +import org.springframework.stereotype.Service; + +/** +* @author TW +* @description 针对表【s_shop_setting(第三方平台设置)】的数据库操作Service实现 +* @createDate 2024-06-03 14:14:56 +*/ +@Service +public class SShopSettingServiceImpl extends ServiceImpl + implements SShopSettingService{ + +} + + + + diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java deleted file mode 100644 index 9d69cf38..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.qihang.wei.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.wei.domain.SysPlatform; -import com.qihang.wei.service.SysPlatformService; -import com.qihang.wei.mapper.SysPlatformMapper; -import org.springframework.stereotype.Service; - -/** -* @author qilip -* @description 针对表【sys_platform】的数据库操作Service实现 -* @createDate 2024-03-24 18:04:27 -*/ -@Service -public class SysPlatformServiceImpl extends ServiceImpl - implements SysPlatformService{ - -} - - - - diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java deleted file mode 100644 index 3300c506..00000000 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.qihang.wei.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qihang.wei.domain.SysShop; -import com.qihang.wei.service.SysShopService; -import com.qihang.wei.mapper.SysShopMapper; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; - -/** -* @author TW -* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service实现 -* @createDate 2024-03-20 13:33:19 -*/ -@AllArgsConstructor -@Service -public class SysShopServiceImpl extends ServiceImpl - implements SysShopService{ - private SysShopMapper mapper; - @Override - public SysShop selectShopById(Integer shopId) { - return mapper.selectById(shopId); - } - - @Override - public void updateSessionKey(Integer shopId, String sessionKey) { - SysShop shop = new SysShop(); - shop.setId(shopId); - shop.setAccessToken(sessionKey); - mapper.updateById(shop); - } -} - - - - diff --git a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java index 40b46708..96789145 100644 --- a/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java +++ b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java @@ -4,17 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qihang.common.common.ResultVoEnum; import com.qihang.common.utils.StringUtils; -import com.qihang.wei.domain.OGoodsSku; import com.qihang.wei.domain.WeiGoods; import com.qihang.wei.domain.WeiGoodsSku; -import com.qihang.wei.mapper.OGoodsSkuMapper; import com.qihang.wei.mapper.WeiGoodsSkuMapper; import com.qihang.wei.service.WeiGoodsService; import com.qihang.wei.mapper.WeiGoodsMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -28,7 +25,7 @@ public class WeiGoodsServiceImpl extends ServiceImpl implements WeiGoodsService{ private final WeiGoodsMapper mapper; private final WeiGoodsSkuMapper skuMapper; - private final OGoodsSkuMapper goodsSkuMapper; +// private final OGoodsSkuMapper goodsSkuMapper; @Override public int saveAndUpdateGoods(Integer shopId, WeiGoods goods) { @@ -47,13 +44,13 @@ public class WeiGoodsServiceImpl extends ServiceImpl for (var sku : goods.getSkus()) { sku.setWeiGoodsId(goods.getId()); // 根据OuterId查找ERP系统中的skuid - if(StringUtils.isNotEmpty(sku.getSkuCode())) { - List oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getSkuCode())); - if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ - sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); - sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); - } - } +// if(StringUtils.isNotEmpty(sku.getSkuCode())) { +// List oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getSkuCode())); +// if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ +// sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); +// sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); +// } +// } skuMapper.insert(sku); } } @@ -69,13 +66,13 @@ public class WeiGoodsServiceImpl extends ServiceImpl for (var sku : goods.getSkus()) { sku.setWeiGoodsId(goods.getId()); // 根据OuterId查找ERP系统中的skuid - if(StringUtils.isNotEmpty(sku.getSkuCode())) { - List oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getSkuCode())); - if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ - sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); - sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); - } - } +// if(StringUtils.isNotEmpty(sku.getSkuCode())) { +// List oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getSkuCode())); +// if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ +// sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); +// sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); +// } +// } skuMapper.insert(sku); } diff --git a/open-api/wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml b/open-api/wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml deleted file mode 100644 index 19201d63..00000000 --- a/open-api/wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,erp_goods_id,erp_sku_id, - sku_name,sku_num,color_id, - color_value,color_image,size_id, - size_value,style_id,style_value, - bar_code,pur_price,whole_price, - retail_price,unit_cost,remark, - status,low_qty,high_qty, - disable - - diff --git a/open-api/wei-api/src/main/resources/mapper/SShopMapper.xml b/open-api/wei-api/src/main/resources/mapper/SShopMapper.xml new file mode 100644 index 00000000..d3a697d1 --- /dev/null +++ b/open-api/wei-api/src/main/resources/mapper/SShopMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,name,nickName, + ename,company,type, + url,orderNum,isDelete, + isShow,modify_on,remark, + sellerUserId,sellerUserIdStr,sessionKey, + appkey,appSercet,expires_in, + access_token_begin,refresh_token,refresh_token_timeout, + api_request_url + + diff --git a/open-api/wei-api/src/main/resources/mapper/SysShopMapper.xml b/open-api/wei-api/src/main/resources/mapper/SShopSettingMapper.xml similarity index 55% rename from open-api/wei-api/src/main/resources/mapper/SysShopMapper.xml rename to open-api/wei-api/src/main/resources/mapper/SShopSettingMapper.xml index ae2aa664..4aa90860 100644 --- a/open-api/wei-api/src/main/resources/mapper/SysShopMapper.xml +++ b/open-api/wei-api/src/main/resources/mapper/SShopSettingMapper.xml @@ -2,34 +2,29 @@ - + - + - - - - - - - - + - + + + + - id,name,type, - url,sort,status, - modify_on,remark,seller_id, - app_key,app_sercet,access_token, - expires_in,access_token_begin,refresh_token, - refresh_token_timeout,api_request_url + id,name,app_key, + app_secret,access_token,expires_in, + access_token_begin,refresh_token,refresh_token_timeout, + modify_on,remark,request_url, + third_id diff --git a/open-api/wei-api/src/main/resources/mapper/SysPlatformMapper.xml b/open-api/wei-api/src/main/resources/mapper/SysPlatformMapper.xml deleted file mode 100644 index 556d2470..00000000 --- a/open-api/wei-api/src/main/resources/mapper/SysPlatformMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - id,name,code, - app_key,app_secret,redirect_uri, - server_url - - diff --git a/sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java b/sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java index 3a977ad1..5589f462 100644 --- a/sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java +++ b/sys-api/src/main/java/com/qihang/sys/api/controller/SysLoginController.java @@ -44,12 +44,16 @@ public class SysLoginController @PostMapping("/login") public AjaxResult login(@RequestBody LoginBody loginBody) { - AjaxResult ajax = AjaxResult.success(); - // 生成令牌 - String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), - loginBody.getUuid()); - ajax.put(Constants.TOKEN, token); - return ajax; + try { + AjaxResult ajax = AjaxResult.success(); + // 生成令牌 + String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), + loginBody.getUuid()); + ajax.put(Constants.TOKEN, token); + return ajax; + }catch (Exception e){ + return AjaxResult.error(e.getMessage()); + } } /** diff --git a/sys-api/src/main/resources/application.yaml b/sys-api/src/main/resources/application.yaml index f7a36015..18d06fb1 100644 --- a/sys-api/src/main/resources/application.yaml +++ b/sys-api/src/main/resources/application.yaml @@ -7,6 +7,9 @@ mybatis-plus: # mapper-locations: classpath*:mappers/user/*.xml spring: + messages: + # 国际化资源文件路径 + basename: i18n/messages cloud: loadbalancer: nacos: diff --git a/vue/src/api/wei/ewaybill.js b/vue/src/api/wei/ewaybill.js new file mode 100644 index 00000000..c1b3fe54 --- /dev/null +++ b/vue/src/api/wei/ewaybill.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 列表 +export function getDeliverList(data) { + return request({ + url: '/api/wei-api/ewaybill/get_deliver_list', + method: 'post', + data: data + }) +} diff --git a/vue/src/views/shipping/ewaybillPrint/index.vue b/vue/src/views/shipping/ewaybillPrint/index.vue new file mode 100644 index 00000000..dc0e4025 --- /dev/null +++ b/vue/src/views/shipping/ewaybillPrint/index.vue @@ -0,0 +1,40 @@ + + + diff --git a/vue/src/views/shop/refund/index.vue b/vue/src/views/shop/refund/index.vue index 3332f5b3..d765ffb8 100644 --- a/vue/src/views/shop/refund/index.vue +++ b/vue/src/views/shop/refund/index.vue @@ -24,7 +24,7 @@ diff --git a/vue/src/views/shop/wei/ewaybill/index.vue b/vue/src/views/shop/wei/ewaybill/index.vue new file mode 100644 index 00000000..cc9ef235 --- /dev/null +++ b/vue/src/views/shop/wei/ewaybill/index.vue @@ -0,0 +1,254 @@ + + + diff --git a/vue/src/views/wei/goods/index.vue b/vue/src/views/shop/wei/goods/index_old.vue similarity index 100% rename from vue/src/views/wei/goods/index.vue rename to vue/src/views/shop/wei/goods/index_old.vue diff --git a/vue/src/views/wei/refund/index.vue b/vue/src/views/shop/wei/refund/index.vue similarity index 100% rename from vue/src/views/wei/refund/index.vue rename to vue/src/views/shop/wei/refund/index.vue