huanglizhi 1 år sedan
förälder
incheckning
36f02ef9d8

+ 81 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/PayTypeController.java

@@ -0,0 +1,81 @@
+package com.hys.app.controller.erp.use;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hys.app.framework.database.BaseQueryParam;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.model.erp.dos.GoodsDO;
+import com.hys.app.model.erp.dos.PayTypeDO;
+import com.hys.app.model.erp.dto.GoodsDTO;
+import com.hys.app.model.erp.dto.GoodsQueryParams;
+import com.hys.app.model.erp.dto.GoodsSortDto;
+import com.hys.app.model.erp.dto.GoodsUpdateDTO;
+import com.hys.app.model.erp.vo.GoodsVO;
+import com.hys.app.model.erp.vo.ProductStockVO;
+import com.hys.app.model.support.LogClient;
+import com.hys.app.model.support.validator.annotation.Log;
+import com.hys.app.service.erp.GoodsManager;
+import com.hys.app.service.erp.PayTypeManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 商品档案API
+ *
+ * @author 张崧
+ * 2023-12-26 15:56:58
+ */
+@RestController
+@RequestMapping("/admin/erp/payType")
+@Api(tags = "支付方式")
+@Validated
+public class PayTypeController {
+
+    @Autowired
+    private PayTypeManager payTypeManager;
+
+    @ApiOperation(value = "分页列表")
+    @GetMapping
+    public List<PayTypeDO> list() {
+        return payTypeManager.list();
+    }
+
+    @ApiOperation(value = "添加")
+    @PostMapping
+    @Log(client = LogClient.admin, detail = "新增支付方式")
+    public void add(@RequestBody @Valid PayTypeDO payTypeDO) {
+        payTypeManager.save(payTypeDO);
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update/{id}")
+    @Log(client = LogClient.admin, detail = "修改id为[${id}]的支付方式")
+    public void update(@RequestBody @Valid PayTypeDO payTypeDO,@PathVariable Long id) {
+        PayTypeDO byId = payTypeManager.getById(id);
+        BeanUtil.copyProperties(payTypeDO,byId);
+        payTypeManager.updateById(byId);
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    @Log(client = LogClient.admin, detail = "删除")
+    public void delete(@PathVariable Long id) {
+        PayTypeDO byId = payTypeManager.getById(id);
+        byId.setDeleted(false);
+        payTypeManager.updateById(byId);
+    }
+
+    @ApiOperation(value = "详情")
+    @GetMapping("/{id}")
+    public PayTypeDO getById(@PathVariable Long id) {
+        return payTypeManager.getById(id);
+    }
+
+}
+

+ 21 - 0
module-erp/src/main/java/com/hys/app/mapper/goods/PayTypeMapper.java

@@ -0,0 +1,21 @@
+package com.hys.app.mapper.goods;
+
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
+import com.hys.app.framework.util.StringUtil;
+import com.hys.app.model.erp.dos.GoodsDO;
+import com.hys.app.model.erp.dos.PayTypeDO;
+import com.hys.app.model.erp.dto.GoodsQueryParams;
+
+/**
+ * 商品的Mapper
+ *
+ * @author 张崧
+ * 2023-12-26 15:56:58
+ */
+public interface PayTypeMapper extends BaseMapperX<PayTypeDO> {
+
+
+
+}
+

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/dos/GoodsDO.java

@@ -45,7 +45,7 @@ public class GoodsDO extends BaseDO {
     private String name;
 
     @ApiModelProperty(name = "enName", value = "商品英文名称")
-    private String en_name;
+    private String enName;
 
     @ApiModelProperty(name = "sn", value = "商品编号")
     private String sn;

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderDO.java

@@ -185,4 +185,7 @@ public class OrderDO extends BaseDO {
     private Integer extension;
     //是否已支付到账
     private Boolean hasPayReturn = false;
+
+    @ApiModelProperty(name = "subtract_stock", value = "渠道id")
+    private Long  saleChannelId;
 }

+ 55 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/PayTypeDO.java

@@ -0,0 +1,55 @@
+package com.hys.app.model.erp.dos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.hys.app.framework.database.mybatisplus.base.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+
+
+/**
+ * 商品实体类
+ *
+ * @author 张崧
+ * 2023-12-26 15:56:58
+ */
+@TableName("erp_pay_type")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PayTypeDO extends BaseDO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(hidden = true)
+    private Long id;
+
+    @ApiModelProperty("name")
+    @NotBlank()
+    private String name;
+
+    @ApiModelProperty("code")
+    private String code;
+
+    @ApiModelProperty("店铺id")
+    private String merchantId;
+
+    @ApiModelProperty("appid")
+    private String appid;
+
+    @ApiModelProperty("公钥")
+    private String publicKey;
+
+    @ApiModelProperty("私钥")
+    private String privateKey;
+
+    @ApiModelProperty("私钥")
+    private Boolean deleted;
+}

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/dto/GoodsDTO.java

@@ -39,7 +39,7 @@ public class GoodsDTO {
     private String name;
 
     @ApiModelProperty(name = "enName", value = "商品英文名称")
-    private String en_name;
+    private String enName;
 
     @ApiModelProperty(name = "sn", value = "商品编号")
     @NotBlank(message = "商品编号不能为空")

+ 4 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/OrderDTO.java

@@ -123,5 +123,9 @@ public class OrderDTO {
     private Boolean subtractStock;
 
 
+    @ApiModelProperty(name = "subtract_stock", value = "渠道id")
+    private Long  saleChannelId;
+
+
 }
 

+ 0 - 2
module-erp/src/main/java/com/hys/app/model/erp/dto/ProductDTO.java

@@ -38,12 +38,10 @@ public class ProductDTO {
     private String sku;
 
     @ApiModelProperty(name = "price", value = "售价")
-    @NotNull(message = "销售价格不能为空")
     @Min(value = 0, message = "销售价格不能小于0")
     private Double price;
 
     @ApiModelProperty(name = "weight", value = "重量")
-    @NotNull(message = "重量不能为空")
     @Min(value = 0, message = "重量不能小于0")
     private Double weight;
 

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/dto/ProductStockQueryParams.java

@@ -27,7 +27,7 @@ public class ProductStockQueryParams extends BaseQueryParam {
     private Long goodsId;
 
     @ApiModelProperty(name = "keyword", value = "搜索关键字")
-    private Long keyword;
+    private String keyword;
 
 //
     @ApiModelProperty(name = "num", value = "库存数量")

+ 6 - 0
module-erp/src/main/java/com/hys/app/model/erp/vo/ProductStockV1.java

@@ -3,11 +3,14 @@ package com.hys.app.model.erp.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.hys.app.model.erp.dos.ProductDO;
 import com.hys.app.model.erp.dos.ProductStockDO;
+import com.hys.app.model.goods.dos.GoodsGalleryDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.List;
+
 /**
  * 商品库存详情
  *
@@ -84,6 +87,9 @@ public class ProductStockV1  {
     private String lockedStock;
 
 
+    List<GoodsGalleryDO> galleryList;
+
+
 
 
 

+ 2 - 2
module-erp/src/main/java/com/hys/app/service/base/plugin/upload/OSSPlugin.java

@@ -123,9 +123,9 @@ public class OSSPlugin implements Uploader {
 	@Override
 	public String getThumbnailUrl(String url, Integer width, Integer height) {
 		// 缩略图全路径
-		String thumbnailPah = url + "_" + width + "x" + height;
+//		String thumbnailPah = url + "_" + width + "x" + height;
 		// 返回缩略图全路径
-		return thumbnailPah;
+		return url;
 	}
 
 	@Override

+ 24 - 0
module-erp/src/main/java/com/hys/app/service/erp/PayTypeManager.java

@@ -0,0 +1,24 @@
+package com.hys.app.service.erp;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hys.app.framework.database.BaseQueryParam;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseService;
+import com.hys.app.model.erp.dos.GoodsDO;
+import com.hys.app.model.erp.dos.PayTypeDO;
+import com.hys.app.model.erp.dto.GoodsDTO;
+import com.hys.app.model.erp.dto.GoodsQueryParams;
+import com.hys.app.model.erp.dto.GoodsSortDto;
+import com.hys.app.model.erp.vo.GoodsVO;
+import com.hys.app.model.erp.vo.ProductStockVO;
+
+/**
+ * 商品业务层接口
+ *
+ * @author 张崧
+ * 2023-12-26 15:56:58
+ */
+public interface PayTypeManager extends BaseService<PayTypeDO> {
+
+}
+

+ 53 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/PayTypeManagerImpl.java

@@ -0,0 +1,53 @@
+package com.hys.app.service.erp.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hys.app.converter.erp.GoodsConverter;
+import com.hys.app.converter.erp.ProductStockConverter;
+import com.hys.app.framework.database.BaseQueryParam;
+import com.hys.app.framework.database.WebPage;
+import com.hys.app.framework.database.mybatisplus.base.BaseServiceImpl;
+import com.hys.app.framework.exception.ServiceException;
+import com.hys.app.framework.util.BeanUtils;
+import com.hys.app.mapper.goods.GoodsMapper;
+import com.hys.app.mapper.goods.PayTypeMapper;
+import com.hys.app.model.erp.dos.GoodsDO;
+import com.hys.app.model.erp.dos.PayTypeDO;
+import com.hys.app.model.erp.dos.ProductDO;
+import com.hys.app.model.erp.dos.ProductStockDO;
+import com.hys.app.model.erp.dto.*;
+import com.hys.app.model.erp.vo.GoodsVO;
+import com.hys.app.model.erp.vo.ProductStockVO;
+import com.hys.app.model.erp.vo.ProductVO;
+import com.hys.app.model.goods.dos.GoodsGalleryDO;
+import com.hys.app.service.erp.GoodsManager;
+import com.hys.app.service.erp.PayTypeManager;
+import com.hys.app.service.erp.ProductManager;
+import com.hys.app.service.erp.ProductStockManager;
+import com.hys.app.service.goods.GoodsGalleryManager;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * 商品业务层实现
+ *
+ * @author 张崧
+ * 2023-12-26 15:56:58
+ */
+@Service
+@AllArgsConstructor
+public class PayTypeManagerImpl extends BaseServiceImpl<PayTypeMapper, PayTypeDO> implements PayTypeManager {
+
+}
+

+ 4 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/ProductManagerImpl.java

@@ -61,7 +61,10 @@ public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO
         WebPage<ProductDO> webPage = baseMapper.selectPage(queryParams);
         WebPage<ProductVO> convert = converter.convert(webPage);
         for (ProductVO datum : convert.getData()) {
-            datum.setGoodsVo(BeanUtil.copyProperties(goodsMapper.selectById(datum.getGoodsId()), GoodsVO.class));
+            GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(datum.getGoodsId()), GoodsVO.class);
+            // 商品相册
+//            goodsVO.setImageList(goodsGalleryManager.list(goodsVO.getId()));
+            datum.setGoodsVo(goodsVO);
         }
         return convert;
     }

+ 3 - 3
module-erp/src/main/resources/mapper/ProductStockMapper.xml

@@ -36,9 +36,9 @@
             </if>
             <if test="request.keyword != null and request.keyword != ''">
                 and (
-                    g.name like concat("%",#{request.keyword },"%")
-                    or g.bar_code like concat("%",#{request.keyword },"%")
-                    or g.name like concat("%",#{request.keyword },"%")
+                    p.bar_code like concat("%",#{request.keyword },"%")
+                    or g.sn like concat("%",#{request.keyword },"%")
+                    or p.sku like concat("%",#{request.keyword },"%")
                 )
             </if>
         </where>

+ 11 - 0
server/src/main/resources/application-local.yml

@@ -49,3 +49,14 @@ xxl:
       logretentiondays: -1
     accessToken:
 
+
+
+kuaidianiao:
+  id: 1663339
+  key: 0b15b75c-94b4-482b-a462-fd21e45a50f5
+  apiUrl: http://183.62.170.46:38092/tcpapi/orderdist
+  kuaidi:
+    id: 1844388
+    key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
+    apiUrl: https://api.kdniao.com/api/dist
+

+ 10 - 1
server/src/main/resources/application-test.yml

@@ -48,4 +48,13 @@ xxl:
       port: 6998
       logpath:  /opt/erp/xxl-serverlogs
       logretentiondays: -1
-    accessToken:
+    accessToken:
+
+kuaidianiao:
+  id: 1844388
+  key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
+  apiUrl: https://api.kdniao.com/tcpapi/orderdist
+  kuaidi:
+    id: 1844388
+    key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
+    apiUrl: https://api.kdniao.com/api/dist

+ 1 - 9
server/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: erp-server
   profiles:
-    active: test
+    active: local
   jackson:
     property-naming-strategy: SNAKE_CASE
   servlet:
@@ -50,14 +50,6 @@ shop-tnt:
   http-address: https://q26970737o.yicp.fun
   sign-secret: AT5W8XCsvGnxMY1RVguB
 
-kuaidianiao:
-  id: 1663339
-  key: 0b15b75c-94b4-482b-a462-fd21e45a50f5
-  apiUrl: http://183.62.170.46:38092/tcpapi/orderdist
-  kuaidi:
-    id: 1844388
-    key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
-    apiUrl: https://api.kdniao.com/api/dist
 
 alipay:
   #APPID