订单详情页

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java

@@ -70,4 +70,9 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
      * 分销分享记录id
      */
     private String shareRecordId;
+
+    /**
+     * 是否是店家
+     */
+    private Integer isShop;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -47,6 +47,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     private final static String SECRET = "117eb48AX0864490fbe4d1ef081B9cc25";
 
+    private final static Long SYSTEM_ACCOUNT = 8888888888L;
+
     @Autowired
     DistributionOrderDao distributionOrderDao;
 
@@ -78,7 +80,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
     @Override
     public Result createDistributionOrder(DistributionOrderRequestDto dto) {
         try {
-            //调用微信接口，预支付下单，获取预付单号
             String shareRecordId = dto.getShareRecordId();
             //查询分享记录详细信息
             DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById(shareRecordId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -84,11 +84,15 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Override
     public Result findDetail(SupplierItemRequestDto dto) {
         try {
-            Long itemId = dto.getId();
+            String shareRecordId = dto.getShareRecordId();
+            DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById(shareRecordId);
+            if (distributorShareRecord == null || !distributorShareRecord.getEnabled()) {
+                return Result.failed("该商品已下架");
+            }
+            Long itemId = distributorShareRecord.getItemId();
             SupplierItemVo supplierItemVo = new SupplierItemVo();
-            //只有用户点击商品详情才会有分享id
-            if (StringUtils.hasLength(dto.getShareRecordId())) {
-                DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById(dto.getShareRecordId());
+            //用户点击链接进入详情页需要记录, isShop = 0,为普通用户
+            if (dto.getIsShop() == 0) {
                 supplierItemVo.setSalePrice(PriceUtil.convertPriceFenToYuan(distributorShareRecord.getPrice()));
                 itemId = distributorShareRecord.getItemId();
                 //如果用户绑定过分销商，则不做浏览记录