优化商品下单

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/WechatH5PayController.java

@@ -80,12 +80,13 @@ public class WechatH5PayController {
         //元转成分
         money = money.multiply(new BigDecimal(100));
         int i = money.intValue();
-        if ("test".equals(tradeType)) {
-            //测试环境一分钱
-            orderRequest.setTotalFee(1);
-        } else {
-            orderRequest.setTotalFee(i);
-        }
+//        if ("test".equals(tradeType)) {
+//            //测试环境一分钱
+//            orderRequest.setTotalFee(1);
+//        } else {
+//            orderRequest.setTotalFee(i);
+//        }
+        orderRequest.setTotalFee(i);
         //终端ip
         String ipAddress = getIpAddress(request);
         orderRequest.setSpbillCreateIp(ipAddress);

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsCartItemServiceImpl.java

@@ -129,11 +129,11 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
 
     @Override
     public int delete(Long memberId, List<Long> ids) {
-        OmsCartItem record = new OmsCartItem();
-        record.setDeleteStatus(1);
+//        OmsCartItem record = new OmsCartItem();
+//        record.setDeleteStatus(1);
         OmsCartItemExample example = new OmsCartItemExample();
         example.createCriteria().andIdIn(ids).andMemberIdEqualTo(memberId);
-        return cartItemMapper.updateByExampleSelective(record, example);
+        return  cartItemMapper.deleteByExample(example);
     }
 
     @Override

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -768,6 +768,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         order.setOrderType(0);
         //收货人信息：姓名、电话、邮编、地址
         UmsMemberReceiveAddress address = memberReceiveAddressService.getItem(orderParam.getMemberReceiveAddressId());
+        if(StringUtils.isEmpty(address)){
+            throw new RuntimeException("收货地址不存在!");
+        }
         order.setReceiverName(address.getName());
         order.setReceiverPhone(address.getPhoneNumber());
         order.setReceiverPostCode(address.getPostCode());