修正订单详情

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/model/OprationFunction.java

@@ -55,7 +55,4 @@ public class OprationFunction implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
-    private String param;
-
-
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/model/vo/GoodsVo.java

 package com.fzm.mall.server.front.goods.model.vo;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fzm.mall.server.front.goods.model.MarketingCoupon;
 import com.fzm.mall.server.front.goods.model.Nft;
-import com.fzm.mall.server.front.goods.model.Sku;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -80,4 +76,7 @@ public class GoodsVo {
     private String nftFile;
 
     private String hash;
+
+    @ApiModelProperty(value = "（销售方式）1.普通 4.盲盒")
+    private Integer salesType;
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/IGoodSkuPropService.java

@@ -21,4 +21,6 @@ public interface IGoodSkuPropService extends IService<GoodSkuProp> {
     List<Map<String, Object>> getSkuPropListBySkuId (String skuId);
 
     List<GoodSkuProp> getList(String string);
+
+    void delSkuProCachByOid(String oid);
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/impl/GoodSkuPropServiceImpl.java

@@ -7,10 +7,13 @@ import com.fzm.mall.server.front.goods.model.GoodSkuProp;
 import com.fzm.mall.server.front.goods.mapper.GoodSkuPropMapper;
 import com.fzm.mall.server.front.goods.service.IGoodSkuPropService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fzm.mall.server.front.order.mapper.OrderDetailMapper;
+import com.fzm.mall.server.front.order.model.OrderDetail;
 import com.fzm.mall.server.front.redis.GoodRedis;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,6 +32,7 @@ import java.util.Map;
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class GoodSkuPropServiceImpl extends ServiceImpl<GoodSkuPropMapper, GoodSkuProp> implements IGoodSkuPropService {
     private final GoodRedis goodRedis;
+    private final OrderDetailMapper orderDetailMapper;
 
     public static void main(String[] args) {
         List<Map<String, Object>> skuProp = new ArrayList<>();
@@ -82,4 +86,16 @@ public class GoodSkuPropServiceImpl extends ServiceImpl<GoodSkuPropMapper, GoodS
         queryWrapper.eq("sku_id", string);
         return list(queryWrapper);
     }
+
+    @Override
+    public void delSkuProCachByOid(String oid) {
+        QueryWrapper<OrderDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("oid", oid);
+        List<OrderDetail> detailList = orderDetailMapper.selectList(queryWrapper);
+        if(!CollectionUtils.isEmpty(detailList)){
+            detailList.forEach(orderDetail -> {
+                goodRedis.delSkuProp(orderDetail.getSkuId());
+            });
+        }
+    }
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java

@@ -738,7 +738,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                         TranDto tranDto = new TranDto();
                         tranDto.setId(userAssetRecord.getId());
                         tranDto.setAmount(new BigDecimal(orderDetail.getNumber()));
-                        //tranDto.setCoin(aLong.toString());
+                        tranDto.setCoin(coinName);
                         tranDto.setFromAddr(m.getNftAddr());
                         tranDto.setHash(hash);
                         tranDto.setToAddr(user.getAddress());

mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/PayServiceImpl.java

@@ -11,6 +11,7 @@ import com.fzm.mall.server.front.goods.model.MarketingCouponSku;
 import com.fzm.mall.server.front.goods.model.vo.CouponVo;
 import com.fzm.mall.server.front.goods.model.vo.SkuVo;
 import com.fzm.mall.server.front.goods.service.IDistributionTemplateService;
+import com.fzm.mall.server.front.goods.service.IGoodSkuPropService;
 import com.fzm.mall.server.front.goods.service.IGoodSkuService;
 import com.fzm.mall.server.front.goods.service.IMarketingCouponService;
 import com.fzm.mall.server.front.order.mapper.OrderMapper;
@@ -20,6 +21,7 @@ import com.fzm.mall.server.front.order.model.po.PayRestVO;
 import com.fzm.mall.server.front.order.model.vo.OrderSkuVo;
 import com.fzm.mall.server.front.order.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fzm.mall.server.front.redis.GoodRedis;
 import com.fzm.mall.server.front.redis.OrderRedis;
 import com.fzm.mall.server.front.user.service.ICouponService;
 import io.netty.util.internal.StringUtil;
@@ -73,6 +75,9 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements IPayS
     @Autowired
     private IGoodsCouponService goodsCouponService;
 
+    @Autowired
+    private IGoodSkuPropService goodSkuPropService;
+
     //平台-商户号
     public static final String PLATFORM_MERCHANT_ID = "e3ac4b4a4e65460dbd9f1ec6cbd7a900";
 
@@ -99,6 +104,7 @@ public class PayServiceImpl extends ServiceImpl<PayMapper, Pay> implements IPayS
                 for (Object oid : array) {
                     Order order = orderMapper.getByOid(oid.toString());
                     orderMapper.paySuccess(oid.toString(), System.currentTimeMillis());
+                    goodSkuPropService.delSkuProCachByOid(order.getOid());
                     orderRedis.delOrder(oid.toString());
                     /*//支付记录
                     PayRecord payRecord = new PayRecord();

mall-server-front/src/main/resources/application-dev.yml

@@ -54,14 +54,14 @@ chain:
 
 #乐映测试平行链：
   para:
-    rpc-url: http://172.22.20.100:8901
-    withhold: 1Ae6FfgdYJn6LLaqDoRjwga3j4TTmMq3t7
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    token-manager: 1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
-    token-manager-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
-    title: user.p.nftChain.
-    cName: user.evm.0x72b80fbf7312e4ddefbfb235754f11915d10b88cefd0e0e96b4d7f66b99cce05
-    cAddr: 1BzfFBFf99DRhqfunEXhPsZRDgPwUWjab6
+    rpc-url: http://139.9.231.117:12021
+    withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
+    withhold-key: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
+    token-manager: 1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
+    token-manager-key: 5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
+    title: user.p.mall.
+    cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
+    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
   type: para
 
 mybatis-plus:

mall-server-front/src/main/resources/mapper/goods/GoodSkuMapper.xml

@@ -9,7 +9,7 @@
     </select>
 
     <select id="listAvailableSku" resultType="com.fzm.mall.server.front.goods.model.vo.SkuVo">
-        select sk.*, sp.difficulty, sp.merchant_id, sp.blind_box_price as blindBoxprice
+        select sk.*, sp.difficulty, sp.merchant_id, sp.blind_box_price as blindBoxprice, sp.name
         from goods_sku sk
         left join goods_spu sp on sk.goods_id = sp.goods_id
         where sk.goods_id = #{goodsId} and sk.status = '1' and sk.stock > 0