修改物流已发货接口，修复价格为空加入购物车问题

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfItemDetailServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -98,50 +99,55 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
     public Result addToCart(TbCfItemDetailVo tbCfItemDetailVo) throws InterruptedException, ExecutionException, TimeoutException {
         String token = jwtTokenProvider.resolveToken(request);
         TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token);
-        //填充新商品必要信息
-        TbCfCartRecordREntity tbCfCartRecord = tbCfCartRecordRDao.querySkuAndUrl(tbCfItemDetailVo.getItemSku(),tbCfItemDetailVo.getSourceItemId());
-        if (tbCfCartRecord!=null) {
-            tbCfItemDetailVo.setItemId(tbCfCartRecord.getItemId());
-            tbCfItemDetailVo.setItemNum(tbCfCartRecord.getItemNum() + tbCfItemDetailVo.getItemNum());
-            tbCfItemDetailVo.setCreateTime(new Date());
+        int i = tbCfItemDetailVo.getItemPrice().compareTo(BigDecimal.ZERO);
+        if(i!=0) {
+            //填充新商品必要信息
+            TbCfCartRecordREntity tbCfCartRecord = tbCfCartRecordRDao.querySkuAndUrl(tbCfItemDetailVo.getItemSku(), tbCfItemDetailVo.getSourceItemId());
+            if (tbCfCartRecord != null) {
+                tbCfItemDetailVo.setItemId(tbCfCartRecord.getItemId());
+                tbCfItemDetailVo.setItemNum(tbCfCartRecord.getItemNum() + tbCfItemDetailVo.getItemNum());
+                tbCfItemDetailVo.setCreateTime(new Date());
+            } else {
+                tbCfItemDetailVo.setItemId(IdUtil.createIdbyUUID());
+                tbCfItemDetailVo.setCreateTime(new Date());
+            }
+            //为商品分类,后面计算运费
+            TbCfExpressTemplateEntity expressTemplate = recognizeItemCategory(tbCfItemDetailVo.getItemTitle());
+            tbCfItemDetailVo.setItemCategory(expressTemplate.getTemplateId());
+            //加入商品详情
+            TbCfItemDetailEntity tbCfItemDetail = new TbCfItemDetailEntity();
+            BeanUtils.copyProperties(tbCfItemDetailVo, tbCfItemDetail);
+            //将商品加入购物车表
+            TbCfCartRecordREntity tbCfCartRecordREntity1 = tbCfCartRecordRDao.queryByItemId(tbCfItemDetailVo.getItemId());
+            if (tbCfCartRecordREntity1 == null) {
+                tbCfItemDetailDao.save(tbCfItemDetail);
+                TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
+                tbCfCartRecordREntity.setCartRecordId(IdUtil.createIdbyUUID());
+                tbCfCartRecordREntity.setCheckFlag(StateConstant.VALID);
+                tbCfCartRecordREntity.setEnableFlag(StateConstant.VALID);
+                tbCfCartRecordREntity.setItemId(tbCfItemDetailVo.getItemId());
+                tbCfCartRecordREntity.setUserId(tbCfUserInfoVo.getUserId());
+                tbCfCartRecordREntity.setCreateTime(new Date());
+                tbCfCartRecordREntity.setItemNum(tbCfItemDetailVo.getItemNum());
+                tbCfCartRecordREntity.setItemSku(tbCfItemDetailVo.getItemSku());
+                tbCfCartRecordREntity.setSourceItemId(tbCfItemDetailVo.getSourceItemId());
+                tbCfCartRecordRDao.save(tbCfCartRecordREntity);
+            } else {
+                tbCfItemDetailDao.update(tbCfItemDetail);
+                TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
+                tbCfCartRecordREntity.setCartRecordId(tbCfCartRecordREntity1.getCartRecordId());
+                tbCfCartRecordREntity.setItemId(tbCfItemDetailVo.getItemId());
+                tbCfCartRecordREntity.setCheckFlag(StateConstant.VALID);
+                tbCfCartRecordREntity.setEnableFlag(StateConstant.VALID);
+                tbCfCartRecordREntity.setUserId(tbCfUserInfoVo.getUserId());
+                tbCfCartRecordREntity.setCreateTime(new Date());
+                tbCfCartRecordREntity.setItemNum(tbCfItemDetailVo.getItemNum());
+                tbCfCartRecordRDao.update(tbCfCartRecordREntity);
+            }
+            return new Result(ResultCodeEnum.SUCCESS.getDesc());
         }else{
-            tbCfItemDetailVo.setItemId(IdUtil.createIdbyUUID());
-            tbCfItemDetailVo.setCreateTime(new Date());
-        }
-        //为商品分类,后面计算运费
-        TbCfExpressTemplateEntity expressTemplate = recognizeItemCategory(tbCfItemDetailVo.getItemTitle());
-        tbCfItemDetailVo.setItemCategory(expressTemplate.getTemplateId());
-        //加入商品详情
-        TbCfItemDetailEntity tbCfItemDetail= new TbCfItemDetailEntity();
-        BeanUtils.copyProperties(tbCfItemDetailVo,tbCfItemDetail);
-        //将商品加入购物车表
-        TbCfCartRecordREntity tbCfCartRecordREntity1 = tbCfCartRecordRDao.queryByItemId(tbCfItemDetailVo.getItemId());
-        if(tbCfCartRecordREntity1 == null ){
-            tbCfItemDetailDao.save(tbCfItemDetail);
-            TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
-            tbCfCartRecordREntity.setCartRecordId(IdUtil.createIdbyUUID());
-            tbCfCartRecordREntity.setCheckFlag(StateConstant.VALID);
-            tbCfCartRecordREntity.setEnableFlag(StateConstant.VALID);
-            tbCfCartRecordREntity.setItemId(tbCfItemDetailVo.getItemId());
-            tbCfCartRecordREntity.setUserId(tbCfUserInfoVo.getUserId());
-            tbCfCartRecordREntity.setCreateTime(new Date());
-            tbCfCartRecordREntity.setItemNum(tbCfItemDetailVo.getItemNum());
-            tbCfCartRecordREntity.setItemSku(tbCfItemDetailVo.getItemSku());
-            tbCfCartRecordREntity.setSourceItemId(tbCfItemDetailVo.getSourceItemId());
-            tbCfCartRecordRDao.save(tbCfCartRecordREntity);
-        } else{
-            tbCfItemDetailDao.update(tbCfItemDetail);
-            TbCfCartRecordREntity tbCfCartRecordREntity = new TbCfCartRecordREntity();
-            tbCfCartRecordREntity.setCartRecordId(tbCfCartRecordREntity1.getCartRecordId());
-            tbCfCartRecordREntity.setItemId(tbCfItemDetailVo.getItemId());
-            tbCfCartRecordREntity.setCheckFlag(StateConstant.VALID);
-            tbCfCartRecordREntity.setEnableFlag(StateConstant.VALID);
-            tbCfCartRecordREntity.setUserId(tbCfUserInfoVo.getUserId());
-            tbCfCartRecordREntity.setCreateTime(new Date());
-            tbCfCartRecordREntity.setItemNum(tbCfItemDetailVo.getItemNum());
-            tbCfCartRecordRDao.update(tbCfCartRecordREntity);
+            return new Result(ResultCodeEnum.ERROR.getCode()).setMessage("Cannot add to cart");
         }
-        return new Result(ResultCodeEnum.SUCCESS.getDesc());
     }
 
     @Override

src/main/resources/mapper/TbCfOrderDao.xml

@@ -337,7 +337,7 @@
 
 	<!--获取某段时间已发货订单数据-->
 	<select id="getDeliveryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
-				select
+		select
 		DISTINCT
 		r.order_item_id orderId,
 		p.p_express_number expressId,