完善格式化功能

shiyj1101

2021-08-05 e57e32fc43da31917912eebb4e47d4e50df1a9e9

 service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java

old mode 100644
new mode 100755
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.storeCart.StoreCartDto;
import com.java110.dto.storeOrder.StoreOrderDto;
import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
import com.java110.dto.storeOrderCart.StoreOrderCartDto;
import com.java110.dto.storeOrderCartEvent.StoreOrderCartEventDto;
import com.java110.goods.bmo.storeCart.IDeleteStoreCartBMO;
import com.java110.goods.bmo.storeCart.IGetStoreCartBMO;
import com.java110.goods.bmo.storeCart.ISaveStoreCartBMO;
@@ -12,20 +14,34 @@
import com.java110.goods.bmo.storeOrder.IGetStoreOrderBMO;
import com.java110.goods.bmo.storeOrder.ISaveStoreOrderBMO;
import com.java110.goods.bmo.storeOrder.IUpdateStoreOrderBMO;
import com.java110.goods.bmo.storeOrderAddress.IDeleteStoreOrderAddressBMO;
import com.java110.goods.bmo.storeOrderAddress.IGetStoreOrderAddressBMO;
import com.java110.goods.bmo.storeOrderAddress.ISaveStoreOrderAddressBMO;
import com.java110.goods.bmo.storeOrderAddress.IUpdateStoreOrderAddressBMO;
import com.java110.goods.bmo.storeOrderCart.IDeleteStoreOrderCartBMO;
import com.java110.goods.bmo.storeOrderCart.IGetStoreOrderCartBMO;
import com.java110.goods.bmo.storeOrderCart.ISaveStoreOrderCartBMO;
import com.java110.goods.bmo.storeOrderCart.IUpdateStoreOrderCartBMO;
import com.java110.goods.bmo.storeOrderCartEvent.IGetStoreOrderCartEventBMO;
import com.java110.po.storeCart.StoreCartPo;
import com.java110.po.storeOrder.StoreOrderPo;
import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
import com.java110.po.storeOrderCart.StoreOrderCartPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;


/**
 * 商户订单
 * add by wuxw 2020-11-15
 */
@RestController
@RequestMapping(value = "/storeOrder")
public class StoreOrderApi {
@@ -62,6 +78,20 @@
    @Autowired
    private IGetStoreOrderCartBMO getStoreOrderCartBMOImpl;


    @Autowired
    private ISaveStoreOrderAddressBMO saveStoreOrderAddressBMOImpl;
    @Autowired
    private IUpdateStoreOrderAddressBMO updateStoreOrderAddressBMOImpl;
    @Autowired
    private IDeleteStoreOrderAddressBMO deleteStoreOrderAddressBMOImpl;

    @Autowired
    private IGetStoreOrderAddressBMO getStoreOrderAddressBMOImpl;

    @Autowired
    private IGetStoreOrderCartEventBMO getStoreOrderCartEventBMOImpl;

    /**
     * 微信保存消息模板
     *
@@ -75,12 +105,12 @@

        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
        Assert.hasKeyAndValue(reqJson, "totalPrice", "请求报文中未包含totalPrice");
        Assert.hasKeyAndValue(reqJson, "payPrice", "请求报文中未包含payPrice");

        Assert.hasKeyAndValue(reqJson, "addressId", "请求报文中未包含收货人信息");
        Assert.hasKey(reqJson, "goodsList", "未包含商品信息");

        StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
        return saveStoreOrderBMOImpl.save(storeOrderPo);
        return saveStoreOrderBMOImpl.save(storeOrderPo, reqJson.getJSONArray("goodsList"),
                reqJson.getString("addressId"));
    }

    /**
@@ -94,12 +124,7 @@
    @RequestMapping(value = "/updateStoreOrder", method = RequestMethod.POST)
    public ResponseEntity<String> updateStoreOrder(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
        Assert.hasKeyAndValue(reqJson, "totalPrice", "请求报文中未包含totalPrice");
        Assert.hasKeyAndValue(reqJson, "payPrice", "请求报文中未包含payPrice");
        Assert.hasKeyAndValue(reqJson, "orderId", "orderId不能为空");

        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");

        StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
        return updateStoreOrderBMOImpl.update(storeOrderPo);
@@ -207,19 +232,18 @@
    /**
     * 微信删除消息模板
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /storeOrder/queryStoreCart
     * @path /app/storeOrder/queryStoreCart
     */
    @RequestMapping(value = "/queryStoreCart", method = RequestMethod.GET)
    public ResponseEntity<String> queryStoreCart(@RequestParam(value = "communityId") String communityId,
    public ResponseEntity<String> queryStoreCart(@RequestParam(value = "personId", required = false) String personId,
                                                 @RequestParam(value = "page") int page,
                                                 @RequestParam(value = "row") int row) {
        StoreCartDto storeCartDto = new StoreCartDto();
        storeCartDto.setPage(page);
        storeCartDto.setRow(row);
        //storeCartDto.setCommunityId(communityId);
        storeCartDto.setPersonId(personId);
        return getStoreCartBMOImpl.get(storeCartDto);
    }

@@ -268,6 +292,27 @@
    }

    /**
     * 发货接口
     *
     * @param reqJson
     * @return
     * @serviceCode /storeOrder/sendStoreOrderCart
     * @path /app/storeOrder/sendStoreOrderCart
     */
    @RequestMapping(value = "/sendStoreOrderCart", method = RequestMethod.POST)
    public ResponseEntity<String> sendStoreOrderCart(
            @RequestHeader(value = "user-id",required = false) String userId,
            @RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");


        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
        return updateStoreOrderCartBMOImpl.sendOrderCart(storeOrderCartPo,userId);
    }

    /**
     * 微信删除消息模板
     *
     * @param reqJson
@@ -295,11 +340,124 @@
     */
    @RequestMapping(value = "/queryStoreOrderCart", method = RequestMethod.GET)
    public ResponseEntity<String> queryStoreOrderCart(
            @RequestHeader(value = "store-id", required = false) String storeId,
            @RequestParam(value = "personId", required = false) String personId,
            @RequestParam(value = "state", required = false) String state,
            @RequestParam(value = "cartId", required = false) String cartId,
            @RequestParam(value = "page") int page,
            @RequestParam(value = "row") int row) {
        StoreOrderCartDto storeOrderCartDto = new StoreOrderCartDto();
        storeOrderCartDto.setPage(page);
        storeOrderCartDto.setRow(row);
        storeOrderCartDto.setStoreId(storeId);
        storeOrderCartDto.setPersonId(personId);
        storeOrderCartDto.setState(state);
        storeOrderCartDto.setCartId(cartId);
        return getStoreOrderCartBMOImpl.get(storeOrderCartDto);
    }


    /**
     * 微信保存消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /storeOrder/saveStoreOrderAddress
     * @path /app/storeOrder/saveStoreOrderAddress
     */
    @RequestMapping(value = "/saveStoreOrderAddress", method = RequestMethod.POST)
    public ResponseEntity<String> saveStoreOrderAddress(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含username");


        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
        return saveStoreOrderAddressBMOImpl.save(storeOrderAddressPo);
    }

    /**
     * 微信修改消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /storeOrder/updateStoreOrderAddress
     * @path /app/storeOrder/updateStoreOrderAddress
     */
    @RequestMapping(value = "/updateStoreOrderAddress", method = RequestMethod.POST)
    public ResponseEntity<String> updateStoreOrderAddress(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含username");
        Assert.hasKeyAndValue(reqJson, "oaId", "oaId不能为空");


        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
        return updateStoreOrderAddressBMOImpl.update(storeOrderAddressPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /storeOrder/deleteStoreOrderAddress
     * @path /app/storeOrder/deleteStoreOrderAddress
     */
    @RequestMapping(value = "/deleteStoreOrderAddress", method = RequestMethod.POST)
    public ResponseEntity<String> deleteStoreOrderAddress(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "oaId", "oaId不能为空");


        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
        return deleteStoreOrderAddressBMOImpl.delete(storeOrderAddressPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param orderId 订单ID
     * @return
     * @serviceCode /storeOrder/queryStoreOrderAddress
     * @path /app/storeOrder/queryStoreOrderAddress
     */
    @RequestMapping(value = "/queryStoreOrderAddress", method = RequestMethod.GET)
    public ResponseEntity<String> queryStoreOrderAddress(@RequestParam(value = "orderId") String orderId,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
        StoreOrderAddressDto storeOrderAddressDto = new StoreOrderAddressDto();
        storeOrderAddressDto.setPage(page);
        storeOrderAddressDto.setRow(row);
        storeOrderAddressDto.setOrderId(orderId);
        return getStoreOrderAddressBMOImpl.get(storeOrderAddressDto);
    }

    /**
     * 微信删除消息模板
     *
     * @param cartId 购物车ID
     * @return
     * @serviceCode /storeOrder/queryStoreOrderCartEvent
     * @path /app/storeOrder/queryStoreOrderCartEvent
     */
    @RequestMapping(value = "/queryStoreOrderCartEvent", method = RequestMethod.GET)
    public ResponseEntity<String> queryStoreOrderCartEvent(@RequestParam(value = "cartId") String cartId,
                                                           @RequestParam(value = "orderId") String orderId,
                                                           @RequestParam(value = "page") int page,
                                                           @RequestParam(value = "row") int row) {
        StoreOrderCartEventDto storeOrderCartEventDto = new StoreOrderCartEventDto();
        storeOrderCartEventDto.setPage(page);
        storeOrderCartEventDto.setRow(row);
        storeOrderCartEventDto.setCartId(cartId);
        storeOrderCartEventDto.setOrderId(orderId);
        return getStoreOrderCartEventBMOImpl.get(storeOrderCartEventDto);
    }
}