clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

PC下单接口

This commit is contained in:
kuang.yife 2023-05-21 22:14:44 +08:00
parent d78b636d6b
commit eb8a213cc4
6 changed files with 65 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -171,6 +171,8 @@ public class OrderController extends BaseController {
customerAddress.setCountryId(request.getDistrictId());
customerAddress.setAddress(request.getFullAddress());
customerAddress.setIsDefault(0);
customerAddress.setPhone(request.getCustomerPhone());
customerAddress.setName(request.getCustomerName());
customerAddressService.insertCustomerAddress(customerAddress);
}
@ -205,12 +207,11 @@ public class OrderController extends BaseController {
standard.setGoodsPrice(goodsPrice);
standard.setGoodsId(goods.getGoodsId());
standard.setExtMoney(BigDecimal.ZERO);
standard.setGoodsNum(999);
standard.setGoodsNum(list.getGoodsStandardNum());
standard.setSaleNum(0);
goodsStandardService.insertGoodsStandard(standard);
goodsStandards.add(standard);
});
goodsStandardService.batchInsert(goodsStandards);
// 生成主单
OrderMaster orderMaster = new OrderMaster();
@ -223,6 +224,14 @@ public class OrderController extends BaseController {
orderMaster.setCreateTime(new Date());
orderMaster.setCustomerId(customer.getCustomerId());
orderMaster.setGoodsId(goods.getGoodsId());
// 服务时间
String[] split = request.getServTime().split("-");
try {
orderMaster.setExpectTimeStart(DateUtils.parseDate(request.getServDate()+" "+split[0], "yyyy-MM-dd hh:mm"));
orderMaster.setExpectTimeEnd(DateUtils.parseDate(request.getServDate()+" "+split[1], "yyyy-MM-dd hh:mm"));
}catch (Exception e){
}
orderMasterService.insertOrderMaster(orderMaster);
Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");

7
ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsStandardMapper.java
View File

@ -1,5 +1,6 @@
package com.ghy.goods.mapper;
import com.ghy.goods.domain.Goods;
import com.ghy.goods.domain.GoodsStandard;
import com.ghy.goods.request.AppGoodsRequest;
import org.apache.ibatis.annotations.Param;
@ -14,6 +15,12 @@ import java.util.List;
*/
public interface GoodsStandardMapper {
/**
* @param goodsStandard 规格属性
* @return 成功条数
*/
int insertGoodsStandard(GoodsStandard goodsStandard);
/**
* @param goodsStandardId 规格id
* @return 规格实体

1
ghy-goods/src/main/java/com/ghy/goods/service/GoodsStandardService.java
View File

@ -40,6 +40,7 @@ public interface GoodsStandardService {
*/
int batchInsert(List<GoodsStandard> goodsStandardList);
int insertGoodsStandard(GoodsStandard goodsStandard);
void deleteByGoodsId(Long goodsId);

5
ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsStandardServiceImpl.java
View File

@ -52,6 +52,11 @@ public class GoodsStandardServiceImpl implements GoodsStandardService {
return goodsStandardMapper.batchInsert(goodsStandardList);
}
@Override
public int insertGoodsStandard(GoodsStandard goodsStandard) {
return goodsStandardMapper.insertGoodsStandard(goodsStandard);
}
@Override
public void deleteByGoodsId(Long goodsId) {
goodsStandardMapper.deleteByGoodsId(goodsId);

32
ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
View File

@ -79,6 +79,38 @@
</where>
</select>
<insert id="insertGoodsStandard" parameterType="com.ghy.goods.domain.GoodsStandard" useGeneratedKeys="true" keyProperty="goodsStandardId">
insert into goods_standard (
<if test="goodsStandardName != null and goodsStandardName != ''">goods_standard_name,</if>
<if test="goodsId != null and goodsId != ''">goods_id,</if>
<if test="deptGoodsCategoryId != null and deptGoodsCategoryId != ''">dept_goods_category_id,</if>
<if test="goodsPrice != null and goodsPrice != ''">goods_price,</if>
<if test="extMoney != null and extMoney != ''">ext_money,</if>
<if test="discountPrice != null and discountPrice != ''">discount_price,</if>
<if test="groupPrice != null and groupPrice != ''">group_price,</if>
<if test="goodsUnit != null and goodsUnit != ''">goods_unit,</if>
<if test="goodsNum != null and goodsNum != ''">goods_num,</if>
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
<if test="goodsStandardName != null and goodsStandardName != ''">#{goodsStandardName},</if>
<if test="goodsId != null and goodsId != ''">#{goodsId},</if>
<if test="deptGoodsCategoryId != null and deptGoodsCategoryId != ''">#{deptGoodsCategoryId},</if>
<if test="goodsPrice != null and goodsPrice != ''">#{goodsPrice},</if>
<if test="extMoney != null and extMoney != ''">#{extMoney},</if>
<if test="discountPrice != null and discountPrice != ''">#{discountPrice},</if>
<if test="groupPrice != null and groupPrice != ''">#{groupPrice},</if>
<if test="goodsUnit != null and goodsUnit != ''">#{goodsUnit},</if>
<if test="goodsNum != null and goodsNum != ''">#{goodsNum},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
<insert id="batchInsert" parameterType="list">
INSERT INTO goods_standard (
goods_standard_name, goods_id, dept_goods_category_id, goods_price, ext_money, discount_price, group_price, goods_unit, goods_num,

8
ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java
View File

@ -39,4 +39,12 @@ public class SysOrderAssignRequest {
// 详细地址
private String fullAddress;
private String customerPhone;
private String customerName;
private String servDate;
private String servTime;
}