解决冲突

framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java

@@ -119,10 +119,6 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
             default:
                 return;
         }
-<<<<<<< HEAD
-        log.info("短信验证码："+code);
-=======
-
         //如果是测试模式 默认验证码 6个1
         if (systemSetting.getIsTestModel()) {
             code = "111111";
@@ -130,7 +126,6 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
             //发送短信
             this.sendSmsCode(smsSetting.getSignName(), mobile, params, templateCode);
         }
->>>>>>> master
         //缓存中写入要验证的信息
         cache.put(cacheKey(verificationEnums, mobile, uuid), code, 300L);
     }

framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -185,18 +185,18 @@ public class Goods extends BaseEntity {
     @ApiModelProperty(value = "销售模式", required = true)
     private String salesModel;
 
-<<<<<<< HEAD
+
     /**
      * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum
      */
     @ApiModelProperty(value = "商品类型", required = true)
     private String goodsType;
-=======
+
     @ApiModelProperty(value = "商品参数json", hidden = true)
     @Column(columnDefinition = "TEXT")
     @JsonIgnore
     private String params;
->>>>>>> master
+
 
     public Goods() {
     }

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java

@@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -58,6 +59,9 @@ import java.util.Map;
 @Transactional
 public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMapper, MemberEvaluation> implements MemberEvaluationService {
 
+    //会员评价数据层
+    @Resource
+    private MemberEvaluationMapper memberEvaluationMapper;
     //订单
     @Autowired
     private OrderService orderService;
@@ -84,22 +88,10 @@ public class MemberEvaluationServiceImpl extends ServiceImpl<MemberEvaluationMap
     }
 
     @Override
-<<<<<<< HEAD
-    public IPage<MemberEvaluationListVO> queryByParams(StoreEvaluationQueryParams storeEvaluationQueryParams) {
-        return this.baseMapper.getMemberEvaluationList(PageUtil.initPage(storeEvaluationQueryParams), storeEvaluationQueryParams.queryWrapper());
-    }
-
-    @Override
-    public IPage<MemberEvaluationListVO> queryPage(EvaluationQueryParams evaluationQueryParams, PageVO page) {
-        return this.baseMapper.getMemberEvaluationList(PageUtil.initPage(page), evaluationQueryParams.queryWrapper());
-    }
-=======
     public IPage<MemberEvaluationListVO> queryPage(EvaluationQueryParams evaluationQueryParams) {
         return memberEvaluationMapper.getMemberEvaluationList(PageUtil.initPage(evaluationQueryParams), evaluationQueryParams.queryWrapper());
     }
 
->>>>>>> master
-
     @Override
     public MemberEvaluationDTO addMemberEvaluation(MemberEvaluationDTO memberEvaluationDTO) {
         //获取子订单信息

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -4,8 +4,6 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.base.BaseEntity;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.modules.base.entity.enums.ClientTypeEnum;
-<<<<<<< HEAD
-=======
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
 import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
@@ -15,7 +13,6 @@ import cn.lili.modules.order.order.entity.enums.OrderTypeEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum;
->>>>>>> master
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
 import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
@@ -33,6 +30,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * 订单
@@ -217,18 +215,16 @@ public class Order extends BaseEntity {
      * @param tradeDTO 交易DTO
      */
     public Order(CartVO cartVO, TradeDTO tradeDTO) {
-        String orderId = this.getId();
+        String oldId = this.getId();
         BeanUtil.copyProperties(tradeDTO, this);
         BeanUtil.copyProperties(cartVO.getPriceDetailDTO(), this);
         BeanUtil.copyProperties(cartVO, this);
-<<<<<<< HEAD
-
         //订单类型判断--普通订单，活动订单。
         if (tradeDTO.getCartTypeEnum().equals(CartTypeEnum.CART) || tradeDTO.getCartTypeEnum().equals(CartTypeEnum.BUY_NOW)) {
             this.setOrderType(OrderTypeEnum.NORMAL.name());
         }  else {
             this.setOrderType(tradeDTO.getCartTypeEnum().name());
-=======
+        }
         this.setId(oldId);
         this.setOrderType(OrderTypeEnum.NORMAL.name());
         //促销信息填充
@@ -241,7 +237,6 @@ public class Order extends BaseEntity {
                     this.setParentOrderSn("");
                 }
             }
->>>>>>> master
         }
 
         //设置默认支付状态
@@ -272,7 +267,12 @@ public class Order extends BaseEntity {
     }
 
     public PriceDetailDTO getPriceDetailDTO() {
-        return JSONUtil.toBean(priceDetail, PriceDetailDTO.class);
+
+        try {
+            return JSONUtil.toBean(priceDetail, PriceDetailDTO.class);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     public void setPriceDetailDTO(PriceDetailDTO priceDetail) {