zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
@@ -10,7 +10,6 @@ import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; import com.matrix.system.common.interceptor.HostInterceptor; import com.matrix.system.hive.bean.MoneyCardUse; import com.matrix.system.hive.bean.MoneyCardUseFlow; import com.matrix.system.hive.bean.SysVipInfo; @@ -160,12 +159,12 @@ //设置支付状态为支付成功 modifyMap.put("payStatus", ShopOrder.ORDER_PAY_STATUS_SUCCESS); //设置订单状态 if (ShopOrder.ORDER_TYPE_GOODS == order.getOrderType()) { if (ShopOrder.SHIPPING_METHOD_WL == order.getShippingMethod()) { //如果是商品订单则进入待发货 modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_SEND); } else { //如果是服务订单则进入待评价 modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_REMARK); } else if (ShopOrder.SHIPPING_METHOD_MDZT == order.getShippingMethod()) { //如果是门店自提则进入待收款 modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_RECEIVE); } shopOrderDao.updateByMap(modifyMap);
@@ -369,8 +369,7 @@ @ResponseBody public AjaxResult findServiceOrderList(@RequestBody @Validated ErpServiceOrderListDto orderListDto) { SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class); SysVipInfo vipInfo= vipInfoDao.selectByPhone(sysVipInfo.getPhone(),HostInterceptor.getCompanyId()); orderListDto.setVipId(vipInfo.getId()); orderListDto.setVipId(sysVipInfo.getId()); List<ErpServiceOrderListVo> apiServiceOrderListInPage = projServicesDao.findWxServiceOrderList(orderListDto); return AjaxResult.buildSuccessInstance(apiServiceOrderListInPage,"查询成功"); } zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java
@@ -22,7 +22,7 @@ /** * 配送方式（1=物流，2=门店自取） */ private String deliverySelect; private Integer deliverySelect; /** * 配送门店ID zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java
@@ -216,14 +216,19 @@ /** * 新增发货信息 */ public int insertSendPackageInfo(ShopOrder shopOrder, String shippingMethod, ShopReceiveAddress receiveAddress) { public int insertSendPackageInfo(ShopOrder shopOrder, Integer shippingMethod, ShopReceiveAddress receiveAddress) { ShopDeliveryInfo shopDeliveryInfo = new ShopDeliveryInfo(); shopDeliveryInfo.setCreateBy(AppConstance.SYSTEM_USER); shopDeliveryInfo.setUpdateBy(AppConstance.SYSTEM_USER); shopDeliveryInfo.setOrderId(shopOrder.getId()); shopDeliveryInfo.setOrderNo(shopOrder.getOrderNo()); shopDeliveryInfo.setUserId(shopOrder.getUserId()); shopDeliveryInfo.setDeliveryWay(shippingMethod); if(ShopOrder.SHIPPING_METHOD_WL==shippingMethod){ shopDeliveryInfo.setDeliveryWay("物流配送"); }else{ shopDeliveryInfo.setDeliveryWay("门店自提"); } shopDeliveryInfo.setShopId(shopOrder.getStoreId().longValue()); shopDeliveryInfo.setCompanyId(shopOrder.getCompanyId()); StringBuffer receiveAddrStr = new StringBuffer(); zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java
@@ -3,6 +3,7 @@ import com.matrix.core.pojo.EntityDTO; import com.matrix.core.anotations.Extend; import com.matrix.core.tools.DateUtil; import io.swagger.models.auth.In; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -126,6 +127,18 @@ public static final int ACTIVITY_TYPE_SECKILL = 3; /** * 物流配送 */ public static final int SHIPPING_METHOD_WL = 1; /** * 门店自提 */ public static final int SHIPPING_METHOD_MDZT = 2; /** * 主键 */ private Integer id; @@ -225,7 +238,7 @@ /** * 配送方式（1=物流，2=门店自取） */ private String shippingMethod; private Integer shippingMethod; /** * 配送门店ID @@ -467,11 +480,11 @@ this.remarks = remarks; } public String getShippingMethod() { public Integer getShippingMethod() { return shippingMethod; } public void setShippingMethod(String shippingMethod) { public void setShippingMethod(Integer shippingMethod) { this.shippingMethod = shippingMethod; }
@@ -40,7 +40,7 @@ /** * 配送方式 */ private String shippingMethod; private Integer shippingMethod; /** * 拼团ID zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateSecKillDTO.java
@@ -1,11 +1,14 @@ package com.matrix.system.shopXcx.dto; import lombok.Data; import java.math.BigDecimal; /** * @author wzy * @date 2020-04-09 15:49 **/ @Data public class CreateSecKillDTO { /** @@ -31,7 +34,7 @@ /** * 配送方式 */ private String shippingMethod; private Integer shippingMethod; private BigDecimal price; @@ -39,67 +42,4 @@ private String openId; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Integer getAddressId() { return addressId; } public void setAddressId(Integer addressId) { this.addressId = addressId; } public Integer getCount() { return count; } public void setCount(Integer count) { this.count = count; } public Long getShopId() { return shopId; } public void setShopId(Long shopId) { this.shopId = shopId; } public String getShippingMethod() { return shippingMethod; } public void setShippingMethod(String shippingMethod) { this.shippingMethod = shippingMethod; } public BigDecimal getPrice() { return price; } public void setPrice(BigDecimal price) { this.price = price; } public Integer getGoodsId() { return goodsId; } public void setGoodsId(Integer goodsId) { this.goodsId = goodsId; } public String getOpenId() { return openId; } public void setOpenId(String openId) { this.openId = openId; } } zq-erp/src/main/resources/config/db/increment/2021-04-20bug.sql
New file @@ -0,0 +1,5 @@ update shop_order set shipping_method='1' where shipping_method='物流配送'; update shop_order set shipping_method='2' where shipping_method='立即配送'; ALTER TABLE `shop_order` MODIFY COLUMN `shipping_method` int(2) NULL DEFAULT NULL AFTER `remarks`;
