| @@ -122,7 +122,6 @@ public class WxCouponSendController extends BaseController { | |||||
| wxCouponSend.setUpdateDate(new Date()); | wxCouponSend.setUpdateDate(new Date()); | ||||
| try { | try { | ||||
| wxCouponSend.setOperatorId(getUserId()); | |||||
| wxCouponSendService.saveOrUpdate(wxCouponSend); | wxCouponSendService.saveOrUpdate(wxCouponSend); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| return new ResultData(e.getErrorCode(), e.getMessage()); | return new ResultData(e.getErrorCode(), e.getMessage()); | ||||
| @@ -112,14 +112,6 @@ public class WxCouponSend extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效,全部时不传",name="status") | @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效,全部时不传",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| @JsonIgnore | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") | |||||
| private Long operatorId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作人",name="operator") | |||||
| @TableField(exist = false) | |||||
| private String operator; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| @@ -107,10 +107,8 @@ | |||||
| <select id="findListVoByValidType" parameterType="com.iformall.domain.vo.WxCouponSendVo" resultMap="BaseResultMap"> | <select id="findListVoByValidType" parameterType="com.iformall.domain.vo.WxCouponSendVo" resultMap="BaseResultMap"> | ||||
| select tt.* from (select | select tt.* from (select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| , mui.name as operator | |||||
| from wx_coupon_send cs | from wx_coupon_send cs | ||||
| left join wx_coupon c on c.id = cs.coupon_id | left join wx_coupon c on c.id = cs.coupon_id | ||||
| left join mall_user_info mui on mui.id = cs.operator_id | |||||
| <include refid="dynamicWhereConditions"/>) as tt | <include refid="dynamicWhereConditions"/>) as tt | ||||
| where 1=1 | where 1=1 | ||||
| and ((tt.valid_type=1 | and ((tt.valid_type=1 | ||||